From f5752b30eaeb6c5d4eaec725ef7b0710ab9c6f64 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 00:42:50 -0800
Subject: [PATCH 001/562] opencollada: 1.6.67 -> 1.6.68

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

diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index d3e1482feb4..cd3da4a7960 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "opencollada-${version}";
 
-  version = "1.6.67";
+  version = "1.6.68";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
     rev = "v${version}";
-    sha256 = "0x1h2ns0y05bdvn3i5s600jz6nb8qw8qqgg54njz7833bcy913mj";
+    sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 813c6d46641976befcfdfdb1bdaaf7a84bb34d03 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 6 Jan 2019 14:41:22 +0300
Subject: [PATCH 002/562] git, gitweb: Fix git-instaweb

* Make the build system embed the correct path to gitweb into git-instaweb
* Move gitweb fixups to the git expression, to make sure that gitweb
used by git-instaweb is functional
* This will increase the closure size of git, but only with perlSupport
---
 .../git-and-tools/git/default.nix               | 17 ++++++++++++++---
 .../git-and-tools/gitweb/default.nix            | 13 +------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 46e88b1e0fc..9c405d0aba8 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -14,6 +14,7 @@
 , darwin
 , withLibsecret ? false
 , pkgconfig, glib, libsecret
+, gzip # needed at runtime by gitweb.cgi
 }:
 
 assert sendEmailSupport -> perlSupport;
@@ -22,6 +23,8 @@ assert svnSupport -> perlSupport;
 let
   version = "2.19.2";
   svn = subversionClient.override { perlBindings = perlSupport; };
+
+  gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
 in
 
 stdenv.mkDerivation {
@@ -84,6 +87,7 @@ stdenv.mkDerivation {
 
   makeFlags = [
     "prefix=\${out}"
+    "gitwebdir=\${gitweb}"  # put in separate package for simpler maintenance
     "SHELL_PATH=${stdenv.shell}"
   ]
   ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
@@ -169,9 +173,6 @@ stdenv.mkDerivation {
       # HTTP(s) transports for pushing
       ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
     '' + stdenv.lib.optionalString perlSupport ''
-      # put in separate package for simpler maintenance
-      mv $out/share/gitweb $gitweb/
-
       # wrap perl commands
       makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \
                   --set PERL5LIB   "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
@@ -185,6 +186,16 @@ stdenv.mkDerivation {
                   --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
       wrapProgram $out/libexec/git-core/git-cvsexportcommit \
                   --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
+
+      # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
+      # gitweb.cgi, need to patch so that it's found
+      sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
+          $gitweb/gitweb.cgi
+      # Give access to CGI.pm and friends (was removed from perl core in 5.22)
+      for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do
+          sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
+              "$gitweb/gitweb.cgi"
+      done
     ''
 
    + (if svnSupport then ''
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index a98dd5bc586..f165fa6b05c 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, git, gzip, perlPackages, fetchFromGitHub
+{ stdenv, git, fetchFromGitHub
 , gitwebTheme ? false }:
 
 let
-  gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
   gitwebThemeSrc = fetchFromGitHub {
     owner = "kogakure";
     repo = "gitweb-theme";
@@ -18,16 +17,6 @@ in stdenv.mkDerivation {
       mkdir $out
       mv * $out
 
-      # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
-      # gitweb.cgi, need to patch so that it's found
-      sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
-          $out/gitweb.cgi
-      # Give access to CGI.pm and friends (was removed from perl core in 5.22)
-      for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do
-          sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
-              "$out/gitweb.cgi"
-      done
-
       ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"}
   '';
 

From 047def418ee726a43b46bce6d93f26e2dd705cb4 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 6 Jan 2019 16:09:20 +0300
Subject: [PATCH 003/562] git: Do not split gitweb output

This partially reverts 9029ed933c69287c64a30d40b6b4f9f1ace7dd94 as
`git-instaweb`, which comes with git, needs on gitweb and having them in
separate outputs results in a cycle.
---
 .../git-and-tools/git/default.nix             |  7 +++---
 .../git-and-tools/gitweb/default.nix          | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 9c405d0aba8..8be4dcc95c8 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
   };
 
-  outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
+  outputs = [ "out" ];
 
   hardeningDisable = [ "format" ];
 
@@ -87,7 +87,6 @@ stdenv.mkDerivation {
 
   makeFlags = [
     "prefix=\${out}"
-    "gitwebdir=\${gitweb}"  # put in separate package for simpler maintenance
     "SHELL_PATH=${stdenv.shell}"
   ]
   ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
@@ -190,11 +189,11 @@ stdenv.mkDerivation {
       # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
       # gitweb.cgi, need to patch so that it's found
       sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
-          $gitweb/gitweb.cgi
+          $out/share/gitweb/gitweb.cgi
       # Give access to CGI.pm and friends (was removed from perl core in 5.22)
       for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do
           sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \
-              "$gitweb/gitweb.cgi"
+              "$out/share/gitweb/gitweb.cgi"
       done
     ''
 
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index f165fa6b05c..afd90ba4969 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, fetchFromGitHub
+{ stdenv, buildEnv, git, fetchFromGitHub
 , gitwebTheme ? false }:
 
 let
@@ -6,19 +6,20 @@ let
     owner = "kogakure";
     repo = "gitweb-theme";
     rev = "049b88e664a359f8ec25dc6f531b7e2aa60dd1a2";
-    sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p";
+    extraPostFetch = ''
+      mkdir -p "$TMPDIR/gitwebTheme"
+      mv "$out"/* "$TMPDIR/gitwebTheme/"
+      mkdir "$out/static"
+      mv "$TMPDIR/gitwebTheme"/* "$out/static/"
+    '';
+    sha256 = "17hypq6jvhy6zhh26lp3nyi52npfd5wy5752k6sq0shk4na2acqi";
   };
-in stdenv.mkDerivation {
+in buildEnv {
   name = "gitweb-${stdenv.lib.getVersion git}";
 
-  src = git.gitweb;
-
-  installPhase = ''
-      mkdir $out
-      mv * $out
-
-      ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"}
-  '';
+  ignoreCollisions = true;
+  paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}"
+       ++ [ "${git}/share/gitweb" ];
 
   meta = git.meta // {
     maintainers = with stdenv.lib.maintainers; [ gnidorah ];

From 9934f533f46e00e5568408bb89aaef4fead4fa97 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 14 Mar 2019 17:01:39 +0100
Subject: [PATCH 004/562] buildkit: init at v0.4.0

compile `builtkitd` only on Linux, `buildkitctl` on all envs.

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

diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
new file mode 100644
index 00000000000..29b07fbfd0f
--- /dev/null
+++ b/pkgs/development/tools/buildkit/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  pname = "buildkit";
+  version = "0.4.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/moby/buildkit";
+  subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "moby";
+    repo = "buildkit";
+    sha256 = "0gkwcjqbcskn63y79jwa26hxkps452z4bgz8lrryaskzbdpvhh3d";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit";
+    homepage = https://github.com/moby/buildkit;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ vdemeester ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 161450de4da..4a500472feb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1071,6 +1071,8 @@ in
 
   buildah = callPackage ../development/tools/buildah { };
 
+  buildkit = callPackage ../development/tools/buildkit { };
+
   bukubrow = callPackage ../tools/networking/bukubrow { };
 
   burpsuite = callPackage ../tools/networking/burpsuite {};

From f95dbbce028a40fcfd37d937c6e3fe25a37e7b5b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 8 May 2019 13:08:11 +0000
Subject: [PATCH 005/562] perl-packages: Set perlPackages attr in perlPackages
 scope

Adopt python's change from https://github.com/NixOS/nixpkgs/pull/61139
There is currently no bug to fix, it just makes the things more consistent and prevents hitting the bug in the future
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8d3e01c8e9c..05530a866ca 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16,6 +16,7 @@ let
   _self = with self; {
 
   inherit perl;
+  perlPackages = self;
 
   callPackage = pkgs.newScope self;
 

From d35441699ea6d76c2420b73356303f3a934506df Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 9 Jun 2019 11:51:41 +0200
Subject: [PATCH 006/562] exim: Fix build with MariaDB
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 10.2 → 10.3 upgrade (#44343) broke it
---
 pkgs/servers/mail/exim/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 60ff9cab2d3..71df355babb 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ coreutils db openssl perl pcre ]
     ++ stdenv.lib.optional enableLDAP openldap
-    ++ stdenv.lib.optionals enableMySQL [ mysql zlib ]
+    ++ stdenv.lib.optionals enableMySQL [ mysql.connector-c zlib ]
     ++ stdenv.lib.optional enableAuthDovecot dovecot
     ++ stdenv.lib.optional enablePAM pam;
 
   preBuild = ''
-    ${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"}
     sed '
       s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin:
       s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf:
@@ -52,10 +51,10 @@ stdenv.mkDerivation rec {
       ''}
       ${stdenv.lib.optionalString enableMySQL ''
         s:^# \(LOOKUP_MYSQL=yes\)$:\1:
-        s:^# \(LOOKUP_MYSQL_PC=mariadb\)$:\1:
-        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient:
-        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient:
-        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql}/include/mysql/:
+        s:^# \(LOOKUP_MYSQL_PC=mysql.connector-c\)$:\1:
+        s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${mysql.connector-c}/lib/mysql -lssl -ldl -lm -lpthread -lz:
+        s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql.connector-c}/include/mysql/:
       ''}
       ${stdenv.lib.optionalString enableAuthDovecot ''
         s:^# \(AUTH_DOVECOT\)=.*:\1=yes:

From 19946b0ab150a1afd372860bbb87c637792f0e16 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 17 Jun 2019 19:06:13 +0200
Subject: [PATCH 007/562] skopeo: 0.1.36 -> 0.1.37

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

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 6dfda2bbfe6..d8899de205f 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.36";
+  version = "0.1.37";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    sha256 = "0q0d6dzx9q57fim0drxs7l45500f3228wq50vzj232x5qx5h00sj";
+    sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";

From 7b6ef636abe4bec258caacfdda1e40dbf3de1edc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 19 Jun 2019 17:44:24 -0700
Subject: [PATCH 008/562] pythonPackages.docker: 3.7.2 -> 4.0.1

---
 .../python-modules/docker/default.nix         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index fc6169f1b13..74274bea988 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -1,33 +1,38 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, six, requests, websocket_client
-, ipaddress, backports_ssl_match_hostname, docker_pycreds
+{ stdenv, buildPythonPackage, fetchPypi, isPy27
+, six, requests, websocket_client, mock, pytest
+, paramiko, backports_ssl_match_hostname
 }:
+
 buildPythonPackage rec {
-  version = "3.7.2";
+  version = "4.0.1";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c456ded5420af5860441219ff8e51cdec531d65f4a9e948ccd4133e063b72f50";
+    sha256 = "1284sqy3r6nxyz43vrpzqf25hsidpr0v4cgnbvavg2dl47bkf77n";
   };
 
   propagatedBuildInputs = [
     six
     requests
     websocket_client
-    ipaddress
-    backports_ssl_match_hostname
-    docker_pycreds
+    paramiko
+  ] ++ stdenv.lib.optional isPy27 backports_ssl_match_hostname;
+
+  checkInputs = [
+    mock
+    pytest
   ];
 
-  # Flake8 version conflict
-  doCheck = false;
+  # Other tests touch network
+  checkPhase = ''
+    ${pytest}/bin/pytest tests/unit/
+  '';
 
   meta = with stdenv.lib; {
     description = "An API client for docker written in Python";
     homepage = https://github.com/docker/docker-py;
     license = licenses.asl20;
-    maintainers = with maintainers; [
-    ];
+    maintainers = with maintainers; [ jonringer ];
   };
 }

From 00e914cb83295a28c8d4f50c3b070a27a14ad597 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 03:14:00 -0700
Subject: [PATCH 009/562] cutelyst: 2.7.0 -> 2.8.0

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

diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index 784a282f6b2..fb1c1199dd0 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "cutelyst-${version}";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "cutelyst";
     repo = "cutelyst";
     rev = "v${version}";
-    sha256 = "09cgfpr2k1jp98h1ahxqm5lmv3qbk0bcxpqpill6n5wmq2c8kl8b";
+    sha256 = "02jys32qkyksa2dmanyg4x0y5lh4ra0xbn2mfr2k84slrxbgjs1g";
   };
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];

From c095ab7cc5189a55121bbf7af58e3790998676b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 09:21:51 -0700
Subject: [PATCH 010/562] gnuapl: 1.7 -> 1.8

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

diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index f60e5d28614..cd7dacf6527 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnu-apl-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchurl {
     url = "mirror://gnu/apl/apl-${version}.tar.gz";
-    sha256 = "07xq8ddlmz8psvsmwr23gar108ri0lwmw0n6kpxcv8ypas1f5xlg";
+    sha256 = "1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql";
   };
 
   buildInputs = [ readline gettext ncurses ];

From caf77ac57cb87a2ea69273cf36488fd41a7bc09c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Jul 2019 18:23:53 -0700
Subject: [PATCH 011/562] mopidy: 2.2.2 -> 2.2.3

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

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 9015a8c749a..c1379c57fe5 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy";
     rev = "v${version}";
-    sha256 = "01vl162c7ssf69b0m65ys9fxnsqnfa1whwbprnc063lkcnrnlkr1";
+    sha256 = "0i9rpnlmgrnkgmr9hyx9sky9gzj2cjhay84a0yaijwcb9nmr8nnc";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 63445c00d415f6b87a37e03928d98253e965076b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jul 2019 13:38:09 -0700
Subject: [PATCH 012/562] rednotebook: 2.8 -> 2.11.1

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

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index de9a089ec8c..1b53bb7e7f0 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.8";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
     rev = "v${version}";
-    sha256 = "0k75lw3p6jx30ngvn8iipk1763gazkbrsad3fpl3sqppaqaggryj";
+    sha256 = "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1";
   };
 
   # We have not packaged tests.

From ddb073ad383afe7f932869430b4ab29829f06d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 4 Jul 2019 10:16:38 +0200
Subject: [PATCH 013/562] haskellPacakges.inline-c-cpp: fix build on darwin

---
 .../haskell-modules/configuration-common.nix      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 233438b963e..eeef8a02b7a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -159,16 +159,11 @@ self: super: {
     then super.double-conversion
     else addExtraLibrary super.double-conversion pkgs.libcxx;
 
-  inline-c-cpp = if !pkgs.stdenv.isDarwin
-    then super.inline-c-cpp
-    else
-      let drv = addExtraLibrary (overrideCabal super.inline-c-cpp (drv: {
-          postPatch = ''
-            substituteInPlace inline-c-cpp.cabal --replace  stdc++ c++
-          '';
-        })) pkgs.libcxx;
-      in # https://github.com/fpco/inline-c/issues/75
-         dontCheck drv;
+  inline-c-cpp = overrideCabal super.inline-c-cpp (drv: {
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
+    '';
+  });
 
   inline-java = addBuildDepend super.inline-java pkgs.jdk;
 

From 7b3ecfb6a51b95f64264c53c0e79526971dec9ae Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 4 Jul 2019 17:16:10 +0200
Subject: [PATCH 014/562] monero-gui: only exclude darwin in meta.platforms

---
 pkgs/applications/altcoins/monero-gui/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index d67ac0a7055..4e7eb3a1451 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -102,10 +102,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Private, secure, untraceable currency";
-    homepage    = https://getmonero.org/;
-    license     = licenses.bsd3;
-    platforms   = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ rnhmjoj ];
+    description  = "Private, secure, untraceable currency";
+    homepage     = https://getmonero.org/;
+    license      = licenses.bsd3;
+    platforms    = platforms.all;
+    badPlatforms = platforms.darwin;
+    maintainers  = with maintainers; [ rnhmjoj ];
   };
 }

From 032b0e6c121cb00cc3d1fb797188e22f994a68da Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 7 Jul 2019 01:28:23 +0200
Subject: [PATCH 015/562] monero-gui: remove unecessary patches

---
 pkgs/applications/altcoins/monero-gui/default.nix |  5 -----
 .../altcoins/monero-gui/move-log-file.patch       | 15 ---------------
 .../monero-gui/move-translations-dir.patch        | 13 -------------
 3 files changed, 33 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/monero-gui/move-translations-dir.patch

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 4e7eb3a1451..f4bdce4117e 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./move-log-file.patch
-    ./move-translations-dir.patch
   ];
 
   postPatch = ''
@@ -83,10 +82,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
 
-    # install translations
-    mkdir -p $out/share/translations
-    cp translations/*.qm $out/share/translations/
-
     # install icons
     for n in 16 24 32 48 64 96 128 256; do
       size=$n"x"$n
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
index 260c6d9d00f..e540f1960d6 100644
--- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch
+++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
@@ -13,18 +13,3 @@ index a51568d..5a9f683 100644
      parser.addOption(logPathOption);
      parser.addHelpOption();
      parser.process(app);
-diff --git a/Logger.cpp b/Logger.cpp
-index 6b1daba..c357762 100644
---- a/Logger.cpp
-+++ b/Logger.cpp
-@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log";
-     static const QString appFolder = "Library/Logs";
- #else // linux + bsd
-     //HomeLocation = "~"
--    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
--    static const QString appFolder = ".bitmonero";
-+    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
-+    static const QString appFolder = "bitmonero";
- #endif
-
- 
diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
deleted file mode 100644
index ff17ce5da1c..00000000000
--- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/TranslationManager.cpp b/TranslationManager.cpp
-index e7fc52a..83534cc 100644
---- a/TranslationManager.cpp
-+++ b/TranslationManager.cpp
-@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language)
-         return true;
-     }
- 
--    QString dir = qApp->applicationDirPath() + "/translations";
-+    QString dir = qApp->applicationDirPath() + "/../share/translations";
-     QString filename = "monero-core_" + language;
- 
-     qDebug("%s: loading translation file '%s' from '%s'",

From 2a86ffa8e2096cc015534f58f3b01e35472ade07 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 15 Jul 2019 20:44:55 -0500
Subject: [PATCH 016/562] mirrors: update apache mirrors

+ Add backup mirrors
+ Remove unreachable mirror wwwftp.ciril.fr
+ Use https on apache mirrors
---
 pkgs/build-support/fetchurl/mirrors.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index f2336db8852..d09b775d42c 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -268,13 +268,14 @@ rec {
 
   # Apache mirrors (see http://www.apache.org/mirrors/).
   apache = [
+    https://www-eu.apache.org/dist/
+    https://www-us.apache.org/dist/
     http://www.eu.apache.org/dist/
-    http://wwwftp.ciril.fr/pub/apache/
     ftp://ftp.fu-berlin.de/unix/www/apache/
     http://ftp.tudelft.nl/apache/
     http://mirror.cc.columbia.edu/pub/software/apache/
-    http://www.apache.org/dist/
-    http://archive.apache.org/dist/ # fallback for old releases
+    https://www.apache.org/dist/
+    https://archive.apache.org/dist/ # fallback for old releases
     ftp://ftp.funet.fi/pub/mirrors/apache.org/
     http://apache.cs.uu.nl/
     http://apache.cs.utah.edu/

From e45cea0c769f3fddf5d00e9fcab604e5c17d4089 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jul 2019 09:19:44 -0700
Subject: [PATCH 017/562] qjackctl: 0.5.8 -> 0.5.9

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

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index fbb2f498c0b..15901915201 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.8";
+  version = "0.5.9";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "1r5hf3hcr20n93jrrm7xk2zf6yx264pcr4d10cpybhrancxh602n";
+    sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk";
   };
 
   buildInputs = [

From f91d69307c6aac6e6c6dee549317a0c6c9a77252 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jul 2019 10:25:47 -0700
Subject: [PATCH 018/562] qsampler: 0.5.5 -> 0.5.6

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

diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index b09aa835c9f..4e6df82a32a 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "qsampler-${version}";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsampler/${name}.tar.gz";
-    sha256 = "1li2p8zknrdr62wlaassfvgski0rlbr3lvrzywbh32dq8j50w8zf";
+    sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];

From 2c7b84e5b0aa7d979f9fcb7d85119074803967a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jul 2019 11:12:49 -0700
Subject: [PATCH 019/562] qmidinet: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index b596e74a264..16e76bb631c 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.4";
+  version = "0.5.5";
   name = "qmidinet-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
-    sha256 = "1il4b8v3azb33yg4fy78npi56xlkz4n60f17sgvckyxb2yj57jwq";
+    sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y";
   };
 
   hardeningDisable = [ "format" ];

From a9b4927dce5719b45b7b30acaa728381c7b3e454 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 02:55:04 -0700
Subject: [PATCH 020/562] esptool: 2.6 -> 2.7

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

diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index 50ee066d96a..8793685069a 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,13 +2,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "esptool";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    sha256 = "1hxgzqh5z81dq1k2xd6329h8idk9y8q29izrwm1vhn0m9v1pxa22";
+    sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31";
   };
 
   checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ];

From 9b9434f507631d919f1e1cbfc4a33e74f64ffd09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 06:07:43 -0700
Subject: [PATCH 021/562] freecad: 0.18.2 -> 0.18.3

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

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index 8fc39ded638..8f0fe00a85e 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -9,11 +9,11 @@ let
   pythonPackages = python3Packages;
 in stdenv.mkDerivation rec {
   name = "freecad-${version}";
-  version = "0.18.2";
+  version = "0.18.3";
 
   src = fetchurl {
     url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
-    sha256 = "1r5rhaiq22yhrfpmcmzx6bflqj6q9asbyjyfja4x4rzfy9yh0a4v";
+    sha256 = "07j7azgnicmd8cqnyskp15y44ykgj5qqz5y3w1jdynrv3yrvk1kz";
   };
 
   nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];

From 29d44d51288abb95f917e8a67006cf03a178457c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2019 06:45:54 -0700
Subject: [PATCH 022/562] pyznap: 1.1.2 -> 1.2.1

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

diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix
index e37327c429d..eb714b64a97 100644
--- a/pkgs/tools/backup/pyznap/default.nix
+++ b/pkgs/tools/backup/pyznap/default.nix
@@ -1,21 +1,17 @@
 { lib
 , buildPythonApplication
 , fetchPypi
-, paramiko
-, configparser
 }:
 
 buildPythonApplication rec {
   pname = "pyznap";
-  version = "1.1.2";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9ac0da5d7f6461d1d6f128362786e297144b415f9e3a2f1835642ab3dda82d55";
+    sha256 = "0pnngr4zdxkf6b570ikzvkrm3a8fr47w6crjaw7ln094qkniywvj";
   };
 
-  propagatedBuildInputs = [ configparser paramiko ];
-
   # tests aren't included in the PyPI packages
   doCheck = false;
 

From 735199a2104bc52b09f0193bdce7b1d95e4c7288 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 21 Jul 2019 22:53:18 -0400
Subject: [PATCH 023/562] deepin: use qt5.mkDerivation where needed, cleanup
 wrappers

This switches a majority of the applications to using qt5.mkDerivation
which automatically adds wrapQtAppsHook.

In certain places, where GLib and gtk intersect with Qt, we
also needed to use wrapGAppsHook. In these cases there will
be multiple wrappers.
---
 pkgs/desktops/deepin/dde-calendar/default.nix          |  4 ++--
 pkgs/desktops/deepin/dde-control-center/default.nix    |  6 +++---
 pkgs/desktops/deepin/dde-dock/default.nix              | 10 +++++-----
 pkgs/desktops/deepin/dde-file-manager/default.nix      |  4 ++--
 pkgs/desktops/deepin/dde-launcher/default.nix          |  4 ++--
 pkgs/desktops/deepin/dde-network-utils/default.nix     |  4 ++--
 pkgs/desktops/deepin/dde-polkit-agent/default.nix      |  4 ++--
 pkgs/desktops/deepin/dde-session-ui/default.nix        |  6 +++---
 pkgs/desktops/deepin/deepin-anything/default.nix       |  4 ++--
 pkgs/desktops/deepin/deepin-calculator/default.nix     |  6 +++---
 pkgs/desktops/deepin/deepin-image-viewer/default.nix   |  4 ++--
 pkgs/desktops/deepin/deepin-menu/default.nix           |  4 ++--
 pkgs/desktops/deepin/deepin-metacity/default.nix       |  3 ++-
 pkgs/desktops/deepin/deepin-movie-reborn/default.nix   |  4 ++--
 pkgs/desktops/deepin/deepin-screenshot/default.nix     |  4 ++--
 .../desktops/deepin/deepin-shortcut-viewer/default.nix |  4 ++--
 pkgs/desktops/deepin/deepin-terminal/default.nix       |  3 ++-
 pkgs/desktops/deepin/deepin-turbo/default.nix          |  4 ++--
 pkgs/desktops/deepin/dtkcore/default.nix               |  4 ++--
 pkgs/desktops/deepin/dtkwidget/default.nix             |  4 ++--
 pkgs/desktops/deepin/dtkwm/default.nix                 |  4 ++--
 pkgs/desktops/deepin/qcef/default.nix                  |  4 ++--
 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix        |  4 ++--
 pkgs/desktops/deepin/qt5integration/default.nix        |  6 +++---
 pkgs/desktops/deepin/udisks2-qt5/default.nix           |  4 ++--
 25 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 16c8002b8e4..0d25d9083eb 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, qttools,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools,
   deepin-gettext-tools, dtkcore, dtkwidget, deepin
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-calendar";
   version = "1.2.10";
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
index 906812cf98b..88c3639ff2e 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative,
  networkmanager, qtsvg, qtx11extras,  dtkcore, dtkwidget, geoip, gsettings-qt,
  dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api,
  dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus,
  systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which,
- substituteAll, wrapGAppsHook, tzdata
+ substituteAll, tzdata, wrapGAppsHook
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-control-center";
   version = "4.10.11";
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index e143f783a5a..21c8221bd13 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
-  qtsvg, libsForQt5, polkit, gsettings-qt, dtkcore, dtkwidget,
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
+  qtsvg, polkit, gsettings-qt, dtkcore, dtkwidget,
   dde-qt-dbus-factory, dde-network-utils, dde-daemon,
   deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin,
-  plugins ? [], symlinkJoin, makeWrapper }:
+  plugins ? [], symlinkJoin, makeWrapper, libdbusmenu }:
 
 let
-unwrapped = stdenv.mkDerivation rec {
+unwrapped = mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-dock";
   version = "4.10.3";
@@ -34,7 +34,7 @@ unwrapped = stdenv.mkDerivation rec {
     dtkwidget
     glib.bin
     gsettings-qt
-    libsForQt5.libdbusmenu
+    libdbusmenu
     polkit
     qtsvg
     qtx11extras
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
index c203ccae6fb..3580eeb4304 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock,
   dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything,
   deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn,
   deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget,
@@ -8,7 +8,7 @@
   qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5,
   xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-file-manager";
   version = "4.8.6.4";
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
index 2710393a257..f8a05b86980 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
   dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,
   dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,
   which, xdg_utils, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-launcher";
   version = "4.6.13";
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index 84c7c9207ec..4fd08749ee4 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools,
+{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools,
   dde-qt-dbus-factory, proxychains, which, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-network-utils";
   version = "0.1.4";
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index 8e58ae2f684..d1f1bed2775 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt,
   dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-polkit-agent";
   version = "0.2.10";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index 0c00627cd4f..8302e8e97bc 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon,
   dde-qt-dbus-factory, deepin, deepin-desktop-schemas,
   deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore,
   dtkwidget, gnugrep, gsettings-qt, hicolor-icon-theme, lightdm_qt,
   onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which,
   xkeyboard_config, xorg, xrandr, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dde-session-ui";
   version = "4.9.12";
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
     for binary in $out/lib/deepin-daemon/*; do
-      wrapProgram $binary "''${gappsWrapperArgs[@]}"
+      wrapProgram $binary "''${qtWrapperArgs[@]}"
     done
 
     searchHardCodedPaths $out  # debugging
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index a8cce9ba392..c768fa60ce7 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux,
   dtkcore, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-anything";
   version = "0.1.0";
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
index 5b7ca756607..51f0b666cb1 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore,
   dtkwidget, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-calculator";
   version = "1.0.11";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     searchHardCodedPaths $out  # debugging
   '';
-  
+
   passthru.updateScript = deepin.updateScript { inherit name; };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index 5957478aa48..89ef6247504 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg,
   qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw,
   libexif, deepin
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-image-viewer";
   version = "1.3.17";
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 43a124c0719..4292fb2d212 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
   qt5integration, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-menu";
   version = "3.4.8";
diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix
index fdf2c240e2c..a4aede5857c 100644
--- a/pkgs/desktops/deepin/deepin-metacity/default.nix
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib,
   gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon,
   libstartup_notification, deepin-wallpapers, deepin-desktop-schemas,
-  deepin }:
+  deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     libtool
     glib.dev
     gnome3.gnome-common
+    wrapGAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index cdf3019e5fe..6e14f0fd804 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
   dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio,
   libdvdnav, libdvdread, xorg, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-movie-reborn";
   version = "3.2.24";
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index 4096df66190..256744828db 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras,
+{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras,
   dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer,
   deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-screenshot";
   version = "4.2.1";
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index 737c99261f9..8c482d53405 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
   qt5integration, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-shortcut-viewer";
   version = "1.3.5";
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 937c1f0d218..51156554f99 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -2,7 +2,7 @@
   gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
   libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
   libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
-  libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }:
+  libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     gettext
     libselinux libsepol utillinux # required by gio
     deepin.setupHook
+    wrapGAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index d5702a55d90..1fe930ea490 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }:
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-turbo";
   version = "0.0.3";
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index a0ed5c04e18..2a527e3cc19 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dtkcore";
   version = "2.0.14";
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 4992519f832..667d418276b 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia,
   qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt,
   dde-qt-dbus-factory, dtkcore, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dtkwidget";
   version = "2.0.14";
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index c0834ace8f8..bc51c3dd7b4 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore,
   deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dtkwm";
   version = "2.0.11";
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index 8e75917907a..9f37a9bbeae 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools,
   qtwebchannel, qtx11extras,
   gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus,
   expat, fontconfig, gdk_pixbuf, glib, gtk2,
@@ -38,7 +38,7 @@ let
   libPath = stdenv.lib.makeLibraryPath rpahtLibraries;
 in
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qcef";
   version = "1.1.6";
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index 2e6ddfcdb2d..8c176ea2ecb 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM,
   mtdev, cairo, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qt5dxcb-plugin";
   version = "1.2.2";
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 7df1fdf3165..8302e701b38 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev ,
-  lxqt, qtx11extras, qtmultimedia, qtsvg ,
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, mtdev,
+  lxqt, qtx11extras, qtmultimedia, qtsvg,
   qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qt5integration";
   version = "0.3.12";
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index b0f5aaee97c..e7f735a4256 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, deepin }:
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
   pname = "udisks2-qt5";
   version = "0.0.1";

From 0f73418f432d728382ab03941f8b5b71b2b43653 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 21 Jul 2019 23:23:25 -0400
Subject: [PATCH 024/562] deepin.qt5dxcb-plugin: use qmakeFlags

---
 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index 8c176ea2ecb..f2e6eb0d123 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM,
-  mtdev, cairo, deepin }:
+  mtdev, cairo, deepin, qtbase }:
 
 mkDerivation rec {
   name = "${pname}-${version}";
@@ -25,9 +25,9 @@ mkDerivation rec {
     cairo
   ];
 
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags INSTALL_PATH=$out/$qtPluginPrefix/platforms"
-  '';
+  qmakeFlags = [
+    "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms"
+  ];
 
   enableParallelBuilding = true;
 

From 98656c95d8bd70afbfba726dbbd6b9831d874070 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 21 Jul 2019 23:26:05 -0400
Subject: [PATCH 025/562] deepin.dtkwm: use qmakeFlags

---
 pkgs/desktops/deepin/dtkwm/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index bc51c3dd7b4..c05eedd8857 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -23,12 +23,13 @@ mkDerivation rec {
     qtx11extras
   ];
 
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags \
-      QT_HOST_DATA=$out \
-      INCLUDE_INSTALL_DIR=$out/include \
-      LIB_INSTALL_DIR=$out/lib"
-  '';
+  outRef = placeholder "out";
+
+  qmakeFlags = [
+    "QT_HOST_DATA=${outRef}"
+    "INCLUDE_INSTALL_DIR=${outRef}/include"
+    "LIB_INSTALL_DIR=${outRef}/lib"
+  ];
 
   passthru.updateScript = deepin.updateScript { inherit name; };
 

From d01d0c1a8175c99b3322bd0c34d981900443eb37 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 21 Jul 2019 23:30:24 -0400
Subject: [PATCH 026/562] deepin.dtkwidget: use qmakeFlags

---
 pkgs/desktops/deepin/dtkwidget/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 667d418276b..8487509e73b 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -31,12 +31,13 @@ mkDerivation rec {
     dtkcore
   ];
 
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags \
-      INCLUDE_INSTALL_DIR=$out/include \
-      LIB_INSTALL_DIR=$out/lib \
-      QT_HOST_DATA=$out"
-  '';
+  outRef = placeholder "out";
+
+  qmakeFlags = [
+    "INCLUDE_INSTALL_DIR=${outRef}/include"
+    "LIB_INSTALL_DIR=${outRef}/lib"
+    "QT_HOST_DATA=${outRef}"
+  ];
 
   enableParallelBuilding = true;
 

From ee0cb1855ca8a804ac0db80c88891684f9fd8fce Mon Sep 17 00:00:00 2001
From: Lana Black <lanablack@amok.cc>
Date: Wed, 24 Jul 2019 15:04:37 +0000
Subject: [PATCH 027/562] mongodb-compass: 1.13.1 -> 1.17.0

---
 pkgs/tools/misc/mongodb-compass/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index f03b536c615..16762d243db 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:
+, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg }:
 
 let
 
-  version = "1.13.1";
+  version = "1.17.0";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -19,7 +19,7 @@ let
     glib
     gnome2.GConf
     gnome2.gdk_pixbuf
-    gnome2.gtk
+    gnome3.gtk
     gnome2.pango
     libnotify
     libxcb
@@ -46,7 +46,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
-        sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p";
+        sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv";
       }
     else
       throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

From 0f4da4a501dda1dd2c873baefe327fd548d16a7d Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Tue, 4 Jun 2019 14:36:25 +0200
Subject: [PATCH 028/562] bloop: 1.2.5 -> 1.3.2

---
 .../development/tools/build-managers/bloop/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index c20985f31dc..6ed6fe77405 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.2.5";
+  version = "1.3.2";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,14 +16,14 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "19373fyb0g7irrdzb1vsjmyv5xj84qwbcfb6lm076px7wfyn0w1c";
+    outputHash     = "1npq02npk6qiwghgr3bqd1ala1kv8hwq1qkmyffvigcq7frkz4r8";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
 
   # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
-  nailgunCommit = "0c325237";
+  nailgunCommit = "9327a60a";
 
   buildInputs = [ jdk makeWrapper deps ];
 
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
 
   client = fetchurl {
     url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py";
-    sha256 = "0qjw4nsyb4cxg96jj1yv5c0ivcxvmscxxqfzll5w9p1pjb30bq0n";
+    sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4";
   };
 
   zshCompletion = fetchurl {
     url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop";
-    sha256 = "1id6f1fgy2rk0q5aad6ffivhbxa94fallzsc04l9n0y1s2xdhqpm";
+    sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp";
   };
 
   installPhase = ''

From 3bdd3b158ad15e1750e139660ec1fc24cb5c89f5 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Sat, 15 Jun 2019 12:11:40 +0200
Subject: [PATCH 029/562] bloop: refactor derivation to use subderivations

This change prevents accidentally using cached version of dependencies
when updating the version
---
 .../tools/build-managers/bloop/default.nix    | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 6ed6fe77405..69f3dc7e033 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -3,6 +3,8 @@
 let
   baseName = "bloop";
   version = "1.3.2";
+  nailgunCommit = "9327a60a"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
+
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -18,39 +20,53 @@ let
     outputHashAlgo = "sha256";
     outputHash     = "1npq02npk6qiwghgr3bqd1ala1kv8hwq1qkmyffvigcq7frkz4r8";
   };
+
+  client = stdenv.mkDerivation {
+    name = "${baseName}-client-${nailgunCommit}";
+
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py";
+      sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4";
+    };
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''
+      cp $src $out
+      chmod +x $out
+    '';
+  };
+
+  zsh = stdenv.mkDerivation {
+    name = "${baseName}-zshcompletion-${version}";
+
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop";
+      sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp";
+    };
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''cp $src $out'';
+  };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
 
-  # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
-  nailgunCommit = "9327a60a";
-
   buildInputs = [ jdk makeWrapper deps ];
 
   phases = [ "installPhase" ];
 
-  client = fetchurl {
-    url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py";
-    sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4";
-  };
-
-  zshCompletion = fetchurl {
-    url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop";
-    sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp";
-  };
-
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share/zsh/site-functions
 
-    cp ${client} $out/bin/blp-client
-    cp ${zshCompletion} $out/share/zsh/site-functions/_bloop
-    chmod +x $out/bin/blp-client
+    ln -s ${zsh} $out/share/zsh/site-functions/_bloop
 
     makeWrapper ${jre}/bin/java $out/bin/blp-server \
       --prefix PATH : ${lib.makeBinPath [ jdk ]} \
       --add-flags "-cp $CLASSPATH bloop.Server"
-    makeWrapper $out/bin/blp-client $out/bin/bloop \
+    makeWrapper ${client} $out/bin/bloop \
       --prefix PATH : ${lib.makeBinPath [ python ]}
   '';
 

From d6b6015d3474590a6e1ea238255f904c866679ff Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Wed, 24 Jul 2019 15:39:08 +0200
Subject: [PATCH 030/562] bloop: get closer to standard bloop packaging

---
 nixos/modules/services/development/bloop.nix  |  9 ++--
 .../tools/build-managers/bloop/default.nix    | 51 +++++++++----------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix
index 56904b7c40e..5cb88cc49a1 100644
--- a/nixos/modules/services/development/bloop.nix
+++ b/nixos/modules/services/development/bloop.nix
@@ -25,10 +25,13 @@ in {
     systemd.user.services.bloop = {
       description = "Bloop Scala build server";
 
+      environment = {
+        PATH = mkForce "${makeBinPath [ config.programs.java.package ]}";
+      };
       serviceConfig = {
-        Type      = "simple";
-        ExecStart = ''${pkgs.bloop}/bin/blp-server'';
-        Restart   = "always";
+        Type        = "simple";
+        ExecStart   = ''${pkgs.bloop}/bin/bloop server'';
+        Restart     = "always";
       };
     };
 
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 69f3dc7e033..ba842289dba 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -1,28 +1,12 @@
-{ stdenv, lib, fetchurl, coursier, jdk, jre, python, makeWrapper }:
+{ stdenv, lib, fetchurl, coursier, python, makeWrapper }:
 
 let
   baseName = "bloop";
   version = "1.3.2";
   nailgunCommit = "9327a60a"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
 
-  deps = stdenv.mkDerivation {
-    name = "${baseName}-deps-${version}";
-    buildCommand = ''
-      export COURSIER_CACHE=$(pwd)
-      ${coursier}/bin/coursier fetch ch.epfl.scala:bloop-frontend_2.12:${version} \
-        -r "bintray:scalameta/maven" \
-        -r "bintray:scalacenter/releases" \
-        -r "https://oss.sonatype.org/content/repositories/staging" > deps
-      mkdir -p $out/share/java
-      cp $(< deps) $out/share/java/
-    '';
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
-    outputHash     = "1npq02npk6qiwghgr3bqd1ala1kv8hwq1qkmyffvigcq7frkz4r8";
-  };
-
   client = stdenv.mkDerivation {
-    name = "${baseName}-client-${nailgunCommit}";
+    name = "${baseName}-client-${version}";
 
     src = fetchurl {
       url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py";
@@ -31,10 +15,25 @@ let
 
     phases = [ "installPhase" ];
 
-    installPhase = ''
-      cp $src $out
-      chmod +x $out
+    installPhase = ''cp $src $out'';
+  };
+
+  server = stdenv.mkDerivation {
+    name = "${baseName}-server-${version}";
+    buildCommand = ''
+      mkdir -p $out/bin
+
+      export COURSIER_CACHE=$(pwd)
+      ${coursier}/bin/coursier bootstrap ch.epfl.scala:bloop-frontend_2.12:${version} \
+        -r "bintray:scalameta/maven" \
+        -r "bintray:scalacenter/releases" \
+        -r "https://oss.sonatype.org/content/repositories/staging" \
+        --deterministic \
+        -f --main bloop.Server -o $out/bin/blp-server
     '';
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+    outputHash     = "0k9zc9q793fkfwcssbkmzb0nxmgb99rwi0pjkqhvf719vmgvhc2a";
   };
 
   zsh = stdenv.mkDerivation {
@@ -53,7 +52,7 @@ in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
 
-  buildInputs = [ jdk makeWrapper deps ];
+  buildInputs = [ makeWrapper ];
 
   phases = [ "installPhase" ];
 
@@ -61,12 +60,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     mkdir -p $out/share/zsh/site-functions
 
+    ln -s ${server}/bin/blp-server $out/blp-server
     ln -s ${zsh} $out/share/zsh/site-functions/_bloop
 
-    makeWrapper ${jre}/bin/java $out/bin/blp-server \
-      --prefix PATH : ${lib.makeBinPath [ jdk ]} \
-      --add-flags "-cp $CLASSPATH bloop.Server"
-    makeWrapper ${client} $out/bin/bloop \
+    cp ${client} $out/bloop
+    chmod +x $out/bloop
+    makeWrapper $out/bloop $out/bin/bloop \
       --prefix PATH : ${lib.makeBinPath [ python ]}
   '';
 

From 17c2f79e39ecfd7ef7e995a2c8397447f1f75d14 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Thu, 25 Jul 2019 09:24:25 +0200
Subject: [PATCH 031/562] bloop: allow specifying extra cli options

---
 nixos/modules/services/development/bloop.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix
index 5cb88cc49a1..226718a9e80 100644
--- a/nixos/modules/services/development/bloop.nix
+++ b/nixos/modules/services/development/bloop.nix
@@ -9,6 +9,20 @@ let
 in {
 
   options.services.bloop = {
+    extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      example = [
+        "-J-Xmx2G"
+        "-J-XX:MaxInlineLevel=20"
+        "-J-XX:+UseParallelGC"
+      ];
+      description = ''
+        Specifies additional command line argument to pass to bloop
+        java process.
+      '';
+    };
+
     install = mkOption {
       type = types.bool;
       default = false;

From f403684eee39400d78158e713b56360eb4f0d884 Mon Sep 17 00:00:00 2001
From: PsyanticY <iuns@outlook.fr>
Date: Wed, 24 Jul 2019 11:02:10 +0100
Subject: [PATCH 032/562] vault-bin: init at 1.1.3

This binray contain the UI part of HashiCorp Vault that we were not able to build it due to the need to generate a very big yarn file. #49082
---
 pkgs/tools/security/vault/vault-bin.nix | 57 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/security/vault/vault-bin.nix

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
new file mode 100644
index 00000000000..7befface3b5
--- /dev/null
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, unzip }:
+
+let
+
+  version = "1.1.3";
+  sources = let
+
+    base = "https://releases.hashicorp.com/vault/${version}";
+
+  in {
+    "x86_64-linux" = fetchurl {
+      url = "${base}/vault_${version}_linux_amd64.zip";
+      sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0";
+    };
+    "i686-linux" = fetchurl {
+      url = "${base}/vault_${version}_linux_386.zip";
+      sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867";
+    };
+    "x86_64-darwin" = fetchurl {
+      url = "${base}/vault_${version}_darwin_amd64.zip";
+      sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea";
+    };
+    "i686-darwin" = fetchurl {
+      url = "${base}/vault_${version}_darwin_386.zip";
+      sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be";
+    };
+    "aarch64-linux" = fetchurl {
+      url = "${base}/vault_${version}_linux_arm64.zip";
+      sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f";
+    };
+  };
+
+in
+  stdenv.mkDerivation {
+
+    src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+
+    name = "vault-bin-${version}";
+
+    nativeBuildInputs = [ unzip ];
+
+    unpackPhase = "unzip $src -d vault";
+
+    installPhase = ''
+      mkdir -p $out/bin $out/share/bash-completion/completions
+      mv vault/vault $out/bin
+      echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = https://www.vaultproject.io;
+      description = "A tool for managing secrets, this binary includes the UI";
+      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ];
+      license = licenses.mpl20;
+      maintainers = with maintainers; [ offline psyanticy ];
+    };
+  }
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79388cefe84..dedb6f870d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24077,6 +24077,8 @@ in
 
   vault = callPackage ../tools/security/vault { };
 
+  vault-bin = callPackage ../tools/security/vault/vault-bin.nix { };
+
   vaultenv = haskellPackages.vaultenv;
 
   vazir-fonts = callPackage ../data/fonts/vazir-fonts { };

From 72db434e6a3acd98b726e80aa82c486f094049b8 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Thu, 25 Jul 2019 18:45:44 +0200
Subject: [PATCH 033/562] plex: 1.16.2.1321 -> 1.16.3.1402

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index d5aea241484..84d4d04cac7 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,14 +8,14 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.16.2.1321-ad17d5f9e";
+  version = "1.16.3.1402-22929c8a2";
   pname = "plexmediaserver";
   name = "${pname}-${version}";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "0h3qw563fa296crbcnarykk3lq7qp1v4znzzylbmy87li1rd77a9";
+    sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5";
   };
 
   outputs = [ "out" "basedb" ];

From 0d9e84289012a1fcf4aa324caf6049f960c715f3 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 24 Jul 2019 13:10:05 -0400
Subject: [PATCH 034/562] openjdk11: build fixes

* increase heap size for building javadoc (this is only needed for the
  32-bit build)

* filter out some non-maven jars that crop up in the openjfx build
---
 pkgs/development/compilers/openjdk/11.nix            |  1 +
 .../compilers/openjdk/increase-javadoc-heap.patch    | 12 ++++++++++++
 pkgs/development/compilers/openjdk/openjfx/11.nix    |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/openjdk/increase-javadoc-heap.patch

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 3f593dbcd6d..7ccbfb6351d 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -44,6 +44,7 @@ let
       ./fix-java-home-jdk10.patch
       ./read-truststore-from-env-jdk10.patch
       ./currency-date-range-jdk10.patch
+      ./increase-javadoc-heap.patch
     ] ++ lib.optionals (!minimal && enableGnome2) [
       ./swing-use-gtk-jdk10.patch
     ];
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
new file mode 100644
index 00000000000..6a1b253f913
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch
@@ -0,0 +1,12 @@
+--- a/make/Docs.gmk       2019-07-24 13:07:37.013405090 -0400
++++ b/make/Docs.gmk       2019-07-24 13:07:28.406550535 -0400
+@@ -274,7 +274,7 @@
+   $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES))
+   $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
+ 
+-  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION)
++  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) -Xmx1G
+ 
+   ifeq ($$(ENABLE_FULL_DOCS), true)
+     # Tell the ModuleGraph taglet to generate html links to soon-to-be-created
+
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 4ee007281e2..a2b28d2dbf8 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -48,7 +48,7 @@ let
 
     # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
     installPhase = ''
-      find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \
+      find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \
         | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
         | sh
       rm -rf $out/tmp

From 68e3e64398dbbd5c86965bfcb962dab7bc35d58b Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 31 Mar 2019 16:06:26 -0400
Subject: [PATCH 035/562] openjdk: add 12

* some configure options have been removed upstream

* need a new patch to deal with gcc format warnings

11 remains, as it is an LTS release; all existing users of 11 in
nixpkgs remain on 11 for now.

openjdk/default.nix and openjdk/darwin/default.nix become the
expressions for the current version (12 now; later 13, 14, etc.).

(note: darwin/default.nix was unreferenced; the new version is derived
from darwin/11.nix.)
---
 .../compilers/openjdk/darwin/default.nix      |  29 ++-
 .../development/compilers/openjdk/default.nix | 171 ++++++++++++++++++
 .../compilers/openjdk/openjfx/12.nix          | 110 +++++++++++
 pkgs/top-level/all-packages.nix               |  31 ++++
 4 files changed, 331 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/default.nix
 create mode 100644 pkgs/development/compilers/openjdk/openjfx/12.nix

diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 54239e58002..b4e19c32e26 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -1,18 +1,28 @@
 { stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
-  jdk = stdenv.mkDerivation {
-    name = "openjdk-7u60b30";
+  jce-policies = fetchurl {
+    # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
+    url    = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
+    sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
+  };
+
+  jdk = stdenv.mkDerivation rec {
+    name = "zulu12.1.3-ca-jdk12";
 
-    # From https://github.com/alexkasko/openjdk-unofficial-builds
     src = fetchurl {
-      url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip;
-      sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401";
+      url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
+      sha256 = "05q3v4vwjd7xhqr21bzlip5x4xhq5rpdshfpb8i86n4zvn7l0mxy";
+      curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
     };
 
     buildInputs = [ unzip freetype ];
 
     installPhase = ''
-      mv */Contents/Home $out
+      mkdir -p $out
+      mv * $out
+
+      unzip ${jce-policies}
+      mv -f ZuluJCEPolicies/*.jar $out/lib/security/
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
@@ -24,13 +34,13 @@ let
     '';
 
     preFixup = ''
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
+      # Propagate the setJavaClassPath setup hook from the JDK so that
+      # any package that depends on the JDK has $CLASSPATH set up
       # properly.
       mkdir -p $out/nix-support
       printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
 
-      install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib
+      install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib
 
       # Set JAVA_HOME automatically.
       cat <<EOF >> $out/nix-support/setup-hook
@@ -39,7 +49,6 @@ let
     '';
 
     passthru = {
-      jre = jdk;
       home = jdk;
     };
 
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
new file mode 100644
index 00000000000..ccffe1421ee
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -0,0 +1,171 @@
+{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype
+, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
+, libjpeg, giflib
+, setJavaClassPath
+, minimal ? false
+, enableJavaFX ? true, openjfx
+, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+}:
+
+let
+
+  /**
+   * The JDK libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.hostPlatform.system == "i686-linux" then
+      "i386"
+    else "amd64";
+
+  major = "12";
+  update = "";
+  build = "ga";
+  repover = "jdk-${major}${update}-${build}";
+
+  openjdk = stdenv.mkDerivation {
+    name = "openjdk-${major}${update}-${build}";
+
+    src = fetchurl {
+      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
+      sha256 = "1gyq4y13s4h13d9w66s35q2gr8w380bzvbyipp6xkl77kprz776s";
+    };
+
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [
+      autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+      libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
+      libXi libXinerama libXcursor libXrandr lndir fontconfig
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      gtk3 gnome_vfs GConf glib
+    ];
+
+    patches = [
+      ./fix-java-home-jdk10.patch
+      ./read-truststore-from-env-jdk10.patch
+      ./currency-date-range-jdk10.patch
+      ./increase-javadoc-heap.patch
+      # -Wformat etc. are stricter in newer gccs, per
+      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
+      # so grab the work-around from
+      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
+      (fetchurl {
+        url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch;
+        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
+      })
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      ./swing-use-gtk-jdk10.patch
+    ];
+
+    preConfigure = ''
+      chmod +x configure
+      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
+
+      configureFlagsArray=(
+        "--with-boot-jdk=${bootjdk.home}"
+        "--enable-unlimited-crypto"
+        "--with-zlib=system"
+        "--with-giflib=system"
+        "--with-stdc++lib=dynamic"
+
+        # glibc 2.24 deprecated readdir_r so we need this
+        # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+        "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=unused-result"
+    ''
+    + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
+    + lib.optionalString minimal " \"--enable-headless-only\""
+    + lib.optionalString (!minimal && enableJavaFX) " \"--with-import-modules=${openjfx}\""
+    + ");"
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+    # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+    + stdenv.lib.optionalString stdenv.cc.isGNU ''
+      NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
+    '';
+
+    NIX_LDFLAGS= lib.optionals (!minimal) [
+      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ];
+
+    buildFlags = [ "all" ];
+
+    installPhase = ''
+      mkdir -p $out/lib/openjdk $out/share
+
+      cp -av build/*/images/jdk/* $out/lib/openjdk
+
+      # Remove some broken manpages.
+      rm -rf $out/lib/openjdk/man/ja*
+
+      # Mirror some stuff in top-level.
+      mkdir $out/include $out/share/man
+      ln -s $out/lib/openjdk/include/* $out/include/
+      ln -s $out/lib/openjdk/man/* $out/share/man/
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux/*_md.h $out/include/
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo
+      ${lib.optionalString minimal ''
+        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+      ''}
+
+      ln -s $out/lib/openjdk/bin $out/bin
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook so that any package
+      # that depends on the JDK has $CLASSPATH set up properly.
+      mkdir -p $out/nix-support
+      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+
+      # 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/lib/openjdk; fi
+      EOF
+    '';
+
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        OUTPUTDIR=$(eval echo \$$output)
+        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+
+      # Test to make sure that we don't depend on the bootstrap
+      for output in $outputs; do
+        if grep -q -r '${bootjdk}' $(eval echo \$$output); then
+          echo "Extraneous references to ${bootjdk} detected"
+          exit 1
+        fi
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://openjdk.java.net/;
+      license = licenses.gpl2;
+      description = "The open-source Java Development Kit";
+      maintainers = with maintainers; [ edwtjo ];
+      platforms = ["i686-linux" "x86_64-linux"];
+    };
+
+    passthru = {
+      inherit architecture;
+      home = "${openjdk}/lib/openjdk";
+    };
+  };
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix
new file mode 100644
index 00000000000..283bd8f9e20
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjfx/12.nix
@@ -0,0 +1,110 @@
+{ stdenv, fetchurl, writeText, openjdk, bootjdk, gradleGen, pkgconfig, perl, cmake, gperf
+, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby }:
+
+let
+  major = "12";
+  update = "";
+  build = "14";
+  repover = "${major}${update}+${build}";
+  gradle_ = (gradleGen.override {
+    jdk = bootjdk;
+  }).gradle_4_10;
+
+  makePackage = args: stdenv.mkDerivation ({
+    version = "${major}${update}-${repover}";
+
+    src = fetchurl {
+      url = "http://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
+      sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz";
+    };
+
+    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+    nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
+
+    dontUseCmakeConfigure = true;
+
+    config = writeText "gradle.properties" (''
+      CONF = Release
+      JDK_HOME = ${bootjdk}/lib/openjdk
+    '' + args.gradleProperties or "");
+
+    buildPhase = ''
+      runHook preBuild
+
+      export GRADLE_USER_HOME=$(mktemp -d)
+      ln -s $config gradle.properties
+      export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
+      gradle --no-daemon $gradleFlags sdk
+
+      runHook postBuild
+    '';
+  } // args);
+
+  # Fake build to pre-download deps into fixed-output derivation.
+  # We run nearly full build because I see no other way to download everything that's needed.
+  # Anyone who knows a better way?
+  deps = makePackage {
+    pname = "openjfx-deps";
+
+    # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+    installPhase = ''
+      find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | sh
+      rm -rf $out/tmp
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash =
+      # Downloaded AWT jars differ by platform.
+      if stdenv.system == "x86_64-linux" then "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"
+      else if stdenv.system == "i686-linux" then "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"
+      else throw "Unsupported platform";
+  };
+
+in makePackage {
+  pname = "openjfx-modular-sdk";
+
+  gradleProperties = ''
+    COMPILE_MEDIA = true
+    COMPILE_WEBKIT = true
+  '';
+
+  preBuild = ''
+    swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
+    substituteInPlace build.gradle \
+      --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
+      --replace 'name: SWT_FILE_NAME' "files('$swtJar')"
+  '';
+
+  installPhase = ''
+    cp -r build/modular-sdk $out
+  '';
+
+  stripDebugList = [ "." ];
+
+  postFixup = ''
+    # Remove references to bootstrap.
+    find "$out" -name \*.so | while read lib; do
+      new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${bootjdk}[^:]*,,')"
+      patchelf --set-rpath "$new_refs" "$lib"
+    done
+
+    # Test to make sure that we don't depend on the bootstrap
+    if grep -q -r '${bootjdk}' "$out"; then
+      echo "Extraneous references to ${bootjdk} detected" >&2
+      exit 1
+    fi
+  '';
+
+  passthru.deps = deps;
+
+  meta = with stdenv.lib; {
+    homepage = http://openjdk.java.net/projects/openjfx/;
+    license = openjdk.meta.license;
+    description = "The next-generation Java client toolkit.";
+    maintainers = with maintainers; [ abbradar ];
+    platforms = openjdk.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e4beac924..5d55507382b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7687,6 +7687,7 @@ in
         openjdk = openjdk11;
       };
 
+  /* legacy jdk for use as needed by older apps */
   openjdk8 =
     if stdenv.isDarwin then
       callPackage ../development/compilers/openjdk/darwin/8.nix { }
@@ -7696,6 +7697,7 @@ in
         inherit (gnome2) GConf gnome_vfs;
       };
 
+  /* currently maintained LTS JDK */
   openjdk11 =
     if stdenv.isDarwin then
       callPackage ../development/compilers/openjdk/darwin/11.nix { }
@@ -7705,6 +7707,26 @@ in
         inherit (gnome2) GConf gnome_vfs;
       };
 
+  openjfx12 =
+    if stdenv.isDarwin then
+      null
+    else
+      callPackage ../development/compilers/openjdk/openjfx/12.nix {
+        openjdk = openjdk12;
+        bootjdk = openjdk11;
+      };
+
+  /* current JDK */
+  openjdk12 =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/openjdk/darwin/default.nix { }
+    else
+      callPackage ../development/compilers/openjdk/default.nix {
+        openjfx = openjfx12;
+        inherit (gnome2) GConf gnome_vfs;
+        bootjdk = openjdk11;
+      };
+
   openjdk = openjdk8;
 
   jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
@@ -7730,6 +7752,15 @@ in
         (lib.addMetaAttrs {}
           ((openjdk11.override { minimal = true; }) // {}));
 
+  jdk12 = openjdk12 // { outputs = [ "out" ]; };
+  jdk12_headless =
+    if stdenv.isDarwin then
+      jdk12
+    else
+      lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless"
+        (lib.addMetaAttrs {}
+          ((openjdk12.override { minimal = true; }) // {}));
+
   jdk = jdk8;
   jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8;
   jre_headless = jre8_headless;

From ade72d9110d18d1ad82d4b739a23392078864c80 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 25 Jul 2019 20:00:33 -0500
Subject: [PATCH 036/562] fwts: 19.06.00 -> 19.07.00

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

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 7c4bd77fae0..4531de86b1b 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "fwts-${version}";
-  version = "19.06.00";
+  version = "19.07.00";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
-    sha256 = "1aza6j323a908vlz3vkn0hda0jm34njg81aak1g4pqvmzhrg47ls";
+    sha256 = "04h99ri3nzhxr2js2a04bcj6zm17zlybqzv528j6hr6v0pv5wn4p";
     stripRoot = false;
   };
 

From effc0c8860a36c537774b91fae2b00a9e682fe40 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 25 Jul 2019 15:48:35 -0400
Subject: [PATCH 037/562] openjdk: 12 -> 12.0.2

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

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index ccffe1421ee..65c85d055cb 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -19,7 +19,7 @@ let
     else "amd64";
 
   major = "12";
-  update = "";
+  update = ".0.2";
   build = "ga";
   repover = "jdk-${major}${update}-${build}";
 
@@ -28,7 +28,7 @@ let
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz";
-      sha256 = "1gyq4y13s4h13d9w66s35q2gr8w380bzvbyipp6xkl77kprz776s";
+      sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
     };
 
     nativeBuildInputs = [ pkgconfig ];

From 330fff02a675f389f429d872a590ed65fc93aedb Mon Sep 17 00:00:00 2001
From: Luke Worth <luke@worth.id.au>
Date: Sat, 27 Jul 2019 17:06:18 +1000
Subject: [PATCH 038/562] postgis: allow on Darwin

To get PostGIS going on Darwin:
1. Add libiconv, as is often required.
2. Expand platforms to `platforms.all`.
3. Deal with PostGIS' quirky build system.

PostGIS' configure.ac has the following gem:

  AC_MSG_RESULT([------------------------------------------------------------------------])
  AC_MSG_RESULT([  WARNING: You have set the --prefix to '$prefix'. But we mostly    ])
  AC_MSG_RESULT([  ignore the --prefix. For your info, using the values determined from ])
  AC_MSG_RESULT([  $PG_CONFIG we will be installing:   ])
  AC_MSG_RESULT([    * postgis shared library in $PGSQL_LIBDIR ])
  AC_MSG_RESULT([    * postgis SQL files in $PGSQL_SHAREDIR/contrib/postgis-$POSTGIS_MAJOR_VERSION.$POSTGIS_MINOR_VERSION ])
  AC_MSG_RESULT([    * postgis executables in $PGSQL_BINDIR ])
  AC_MSG_RESULT([------------------------------------------------------------------------])

This is suggestive of some assumptions in the build system, which are
revealed when building in Nix on Darwin: the build fails because the
postgres binary cannot be found in the install prefix specified for
postgis; vis.

  cc x -bundle_loader $POSTGIS_PREFIX/bin/postgres

This bundle_loader parameter is only available on Darwin, and this
problem doesn't appear to affect Linux systems.

The solution presented here is to symlink the postgres binary where
PostGIS expects it to be, and then remove it after the build completes.
---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index de9d7eb1305..81fbd41b46a 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -10,6 +10,7 @@
 , pkgconfig
 , file
 , protobufc
+, libiconv
 }:
 stdenv.mkDerivation rec {
   name = "postgis-${version}";
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn";
   };
 
-  buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ];
+  buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc libiconv ];
   nativeBuildInputs = [ perl pkgconfig ];
   dontDisableStatic = true;
 
@@ -43,14 +44,13 @@ stdenv.mkDerivation rec {
     sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
             " \
         "raster/scripts/python/Makefile";
-  '';
-
-  preInstall = ''
     mkdir -p $out/bin
+    ln -s ${postgresql}/bin/postgres $out/bin/postgres
   '';
 
   # create aliases for all commands adding version information
   postInstall = ''
+    rm $out/bin/postgres
     for prog in $out/bin/*; do # */
       ln -s $prog $prog-${version}
     done
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     homepage = https://postgis.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 7f54b9a2c6f7ac61bcd9f7f8788cd4475b729bd6 Mon Sep 17 00:00:00 2001
From: Luke Worth <luke@worth.id.au>
Date: Sat, 27 Jul 2019 19:43:31 +1000
Subject: [PATCH 039/562] postgis: make libiconv dependent on darwin

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

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 81fbd41b46a..5e38cb42d19 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
     sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn";
   };
 
-  buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc libiconv ];
+  buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
+                ++ stdenv.lib.optional stdenv.isDarwin libiconv;
   nativeBuildInputs = [ perl pkgconfig ];
   dontDisableStatic = true;
 

From a12efe947f90ec816d5a9b5a03922a8eefd476bd Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 26 Jul 2019 12:04:19 +0200
Subject: [PATCH 040/562] minikube: 1.0.1 -> 1.2.0

Also switch to go modules.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../networking/cluster/minikube/default.nix   | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 5b5d6a98e88..8c85370728f 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu
+{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, libvirt, qemu
 , gpgme, makeWrapper, vmnet
 , docker-machine-kvm, docker-machine-kvm2
 , extraDrivers ? []
@@ -11,12 +11,11 @@ let
   binPath = drivers
             ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]);
 
-in buildGoPackage rec {
+in buildGoModule rec {
   pname   = "minikube";
-  name    = "${pname}-${version}";
-  version = "1.0.1";
+  version = "1.2.0";
 
-  kubernetesVersion = "1.14.1";
+  kubernetesVersion = "1.15.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -24,15 +23,15 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1fgyaq8789wc3h6xmn4iw6if2jxdv5my35yn6ipx3q6i4hagxl4b";
+    sha256 = "0l9znrp49877cp1bkwx84c8lv282ga5a946rjbxi8gznkf3kwaw7";
   };
 
+  modSha256 = "1cp63n0x2lgbqvvymx9byx48r42qw6w224x5x4iiarc2nryfdhn0";
+
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
   subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "cmd/drivers/hyperkit";
 
   preBuild = ''
-    pushd go/src/${goPackagePath} >/dev/null
-
     go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
 
     VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//")
@@ -47,21 +46,15 @@ in buildGoPackage rec {
       -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \
       -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \
       -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION"
-
-    popd >/dev/null
   '';
 
   postInstall = ''
-    mkdir -p $bin/share/bash-completion/completions/
-    MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
-    mkdir -p $bin/share/zsh/site-functions/
-    MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube
-  '';
-
-  postFixup = ''
-    wrapProgram $bin/bin/${pname} --prefix PATH : $bin/bin:${stdenv.lib.makeBinPath binPath}
-  '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mv $bin/bin/hyperkit $bin/bin/docker-machine-driver-hyperkit
+    mkdir -p $out/share/bash-completion/completions/
+    MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube
+    mkdir -p $out/share/zsh/site-functions/
+    MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube
+  ''+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit
   '';
 
   meta = with stdenv.lib; {

From 73352188ba788e8cdba81c977e08360f257ccd6a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 29 Jul 2019 14:12:38 -0700
Subject: [PATCH 041/562] pythonPackages.docker: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 74274bea988..d82cc0d3f6b 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -1,15 +1,20 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy27
-, six, requests, websocket_client, mock, pytest
-, paramiko, backports_ssl_match_hostname
+, backports_ssl_match_hostname
+, mock
+, paramiko
+, pytest
+, requests
+, six
+, websocket_client
 }:
 
 buildPythonPackage rec {
-  version = "4.0.1";
+  version = "4.0.2";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1284sqy3r6nxyz43vrpzqf25hsidpr0v4cgnbvavg2dl47bkf77n";
+    sha256 = "0r1i46h8x1vfvadayyvmh5hc6mpzgv3vvp6pv4g1wavamya2wnyc";
   };
 
   propagatedBuildInputs = [

From d7eeb8354e725aa4647420c503832267a465a2c8 Mon Sep 17 00:00:00 2001
From: Elmar Athmer <elmar@athmer.org>
Date: Tue, 30 Jul 2019 11:20:46 +0200
Subject: [PATCH 042/562] hcloud: 1.11.0 -> 1.13.0

---
 pkgs/development/tools/hcloud/default.nix |  6 ++--
 pkgs/development/tools/hcloud/deps.nix    | 39 ++++++++++++++---------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index fd05e12b4d5..4f3cae5fa1f 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "hcloud-${version}";
-  version = "1.11.0";
-  
+  version = "1.13.0";
+
   goPackagePath = "github.com/hetznercloud/cli";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0iknw14728l2mynrvb3fiqm7y893ppp22gbb3mppi6iy3as94f1f";
+    sha256 = "1bin9gcmmj3i6a11rv7czvnryl8bv7cjz3pi2cqx8baycg3hia5j";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/hcloud/deps.nix b/pkgs/development/tools/hcloud/deps.nix
index b0b54470128..01bde6f302a 100644
--- a/pkgs/development/tools/hcloud/deps.nix
+++ b/pkgs/development/tools/hcloud/deps.nix
@@ -1,4 +1,4 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/dustin/go-humanize";
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gosuri/uilive";
-      rev = "ac356e6e42cd31fcef8e6aec13ae9ed6fe87713e";
-      sha256 = "1k28zbc14p1yqzhamp9rcagjdw6wsdb55m08nx758jwlr31az6jy";
+      rev = "4512d98b127f3f3a1b7c3cf1104969fdd17b31d9";
+      sha256 = "12n3kjgdzrb50jhkcb2ac3437mdhxh33zrcz7mi4gpji20jz4ai7";
     };
   }
   {
@@ -32,8 +32,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/gosuri/uiprogress";
-      rev = "d0567a9d84a1c40dd7568115ea66f4887bf57b33";
-      sha256 = "1m7rxf71mn8w2yysc8wmf2703avhci6f4nkiijjl1f2cx4kzykck";
+      rev = "4442fea128d2bc91caf276b08518bdf4582561c8";
+      sha256 = "1g6xjknm0981h3b1drbvm6vd66hiah1cylpdck9cqd18kyxd6bpd";
+    };
+  }
+  {
+    goPackagePath = "github.com/hetznercloud/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hetznercloud/cli";
+      rev = "d6ec656f964aac4382d9c724edd27a8608e7b354";
+      sha256 = "0ng7hihzplwyz4sdipms4m9qq2bcj92qczzd5adhm6da851jxpbc";
     };
   }
   {
@@ -41,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hetznercloud/hcloud-go";
-      rev = "ecee721a51a772254d0104bf4d796358e40d6bbd";
-      sha256 = "0bwym7f8am14yfh584p28d8lnj4f9mhqi05l1mlrl315xn0c78v3";
+      rev = "70b166c92266125ee6a621dcc6089023a5f8d055";
+      sha256 = "02hh214qk8qrhl9rpaywv2z5jpkzx3y2j8gv5xmdprdamrjwwlbc";
     };
   }
   {
@@ -50,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "27c6b39a135b7dc87a14afb068809132fb7a9a8f";
-      sha256 = "13ldxh43xf4prmcrjzriz3gxpnijpqlzrgyhh7bnkj7lkhryfpk9";
+      rev = "84da2c4a25c585816f2c4211b699228d111d18ab";
+      sha256 = "1zh5kswqckz7aaz4kpd1kxbxnlhlmprba1ghkl742x6mbv3w08bm";
     };
   }
   {
@@ -59,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc";
-      sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy";
+      rev = "1c9c46d5c1cc2aaebdd1898c0680e85e8a44b36d";
+      sha256 = "0mxliq4gfvdazga8mapc2sazi915rz1h6prnark9hwbbsz0xn0r3";
     };
   }
   {
@@ -86,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "ff983b9c42bc9fbf91556e191cc8efb585c16908";
-      sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz";
+      rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285";
+      sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
     };
   }
   {
@@ -95,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7fbe1cd0fcc20051e1fcb87fbabec4a1bacaaeba";
-      sha256 = "0y49s4kazign9nsw2x3h39cgs14lqi57m4hrka26w49z8a1xdyc6";
+      rev = "fc99dfbffb4e5ed5758a37e31dd861afe285406b";
+      sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd";
     };
   }
 ]

From 1b4de41d64a016080195a5ce208e0d2f8bbb1372 Mon Sep 17 00:00:00 2001
From: Elmar Athmer <elmar@athmer.org>
Date: Tue, 30 Jul 2019 12:12:24 +0200
Subject: [PATCH 043/562] hcloud: utilize pname and quote URL

This implements rfc 0035 and rfc 0045.
---
 pkgs/development/tools/hcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 4f3cae5fa1f..9b64dc8a3b1 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "hcloud-${version}";
+  pname = "hcloud";
   version = "1.13.0";
 
   goPackagePath = "github.com/hetznercloud/cli";
@@ -32,7 +32,7 @@ buildGoPackage rec {
 
   meta = {
     description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
-    homepage = https://github.com/hetznercloud/cli;
+    homepage = "https://github.com/hetznercloud/cli";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.zauberpony ];

From 8fbf9559dfa3e705fa12488c115b6dc4ee1b1598 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Wed, 31 Jul 2019 00:37:27 +0200
Subject: [PATCH 044/562] nixos/tests/cassandra: Test jmxPort

The test sets it to a non-standard port so it won't work accidentally
now and we'll be sure that our NixOS option works.
---
 nixos/tests/cassandra.nix | 66 +++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix
index aea4fa4d1c9..c55733c9be7 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixos/tests/cassandra.nix
@@ -8,11 +8,12 @@ let
   jmxRoles = [{ username = "me"; password = "password"; }];
   jmxRolesFile = ./cassandra-jmx-roles;
   jmxAuthArgs = "-u ${(builtins.elemAt jmxRoles 0).username} -pw ${(builtins.elemAt jmxRoles 0).password}";
+  jmxPort = 7200;  # Non-standard port so it doesn't accidentally work
 
   # Would usually be assigned to 512M
   numMaxHeapSize = "400";
   getHeapLimitCommand = ''
-    nodetool info | grep "^Heap Memory" | awk \'{print $NF}\'
+    nodetool info -p ${toString jmxPort} | grep "^Heap Memory" | awk \'{print $NF}\'
   '';
   checkHeapLimitCommand = ''
     [ 1 -eq "$(echo "$(${getHeapLimitCommand}) < ${numMaxHeapSize}" | ${pkgs.bc}/bin/bc)" ]
@@ -27,19 +28,20 @@ let
       package = testPackage;
       maxHeapSize = "${numMaxHeapSize}M";
       heapNewSize = "100M";
+      inherit jmxPort;
     };
-  nodeCfg = ipAddress: extra: {pkgs, config, ...}:
-    { environment.systemPackages = [ testPackage ];
-      networking = {
-        firewall.allowedTCPPorts = [ 7000 7199 9042 ];
-        useDHCP = false;
-        interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
-          { address = ipAddress; prefixLength = 24; }
-        ];
-      };
-      services.cassandra = cassandraCfg ipAddress // extra;
-      virtualisation.memorySize = 1024;
+  nodeCfg = ipAddress: extra: {pkgs, config, ...}: rec {
+    environment.systemPackages = [ testPackage ];
+    networking = {
+      firewall.allowedTCPPorts = [ 7000 9042 services.cassandra.jmxPort ];
+      useDHCP = false;
+      interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+        { address = ipAddress; prefixLength = 24; }
+      ];
     };
+    services.cassandra = cassandraCfg ipAddress // extra;
+    virtualisation.memorySize = 1024;
+  };
 in
 {
   name = "cassandra-ci";
@@ -50,7 +52,9 @@ in
     cass2 = nodeCfg "192.168.1.3" { jvmOpts = [ "-Dcassandra.replace_address=cass1" ]; };
   };
 
-  testScript = ''
+  testScript = let
+    jmxPortS = toString jmxPort;
+  in ''
     # Check configuration
     subtest "Timers exist", sub {
       $cass0->succeed("systemctl list-timers | grep cassandra-full-repair.timer");
@@ -63,51 +67,51 @@ in
     };
     subtest "Nodetool is operational", sub {
       $cass0->waitForUnit("cassandra.service");
-      $cass0->waitUntilSucceeds("nc -z localhost 7199");
-      $cass0->succeed("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass0'");
+      $cass0->waitUntilSucceeds("nc -z localhost ${jmxPortS}");
+      $cass0->succeed("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass0'");
     };
     subtest "Cluster name was set", sub {
       $cass0->waitForUnit("cassandra.service");
-      $cass0->waitUntilSucceeds("nc -z localhost 7199");
-      $cass0->waitUntilSucceeds("nodetool describecluster | grep 'Name: ${clusterName}'");
+      $cass0->waitUntilSucceeds("nc -z localhost ${jmxPortS}");
+      $cass0->waitUntilSucceeds("nodetool describecluster -p ${jmxPortS} | grep 'Name: ${clusterName}'");
     };
     subtest "Heap limit set correctly", sub {
       # Nodetool takes a while until it can display info
-      $cass0->waitUntilSucceeds('nodetool info');
+      $cass0->waitUntilSucceeds('nodetool info -p ${jmxPortS}');
       $cass0->succeed('${checkHeapLimitCommand}');
     };
 
     # Check cluster interaction
     subtest "Bring up cluster", sub {
       $cass1->waitForUnit("cassandra.service");
-      $cass1->waitUntilSucceeds("nodetool ${jmxAuthArgs} status | egrep -c '^UN' | grep 2");
-      $cass0->succeed("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass1'");
+      $cass1->waitUntilSucceeds("nodetool -p ${jmxPortS} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2");
+      $cass0->succeed("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass1'");
     };
   '' + lib.optionalString testRemoteAuth ''
     subtest "Remote authenticated jmx", sub {
       # Doesn't work if not enabled
-      $cass0->waitUntilSucceeds("nc -z localhost 7199");
-      $cass1->fail("nc -z 192.168.1.1 7199");
-      $cass1->fail("nodetool -h 192.168.1.1 status");
+      $cass0->waitUntilSucceeds("nc -z localhost ${jmxPortS}");
+      $cass1->fail("nc -z 192.168.1.1 ${toString jmxPort}");
+      $cass1->fail("nodetool -p ${jmxPortS} -h 192.168.1.1 status");
 
       # Works if enabled
-      $cass1->waitUntilSucceeds("nc -z localhost 7199");
-      $cass0->succeed("nodetool -h 192.168.1.2 ${jmxAuthArgs} status");
+      $cass1->waitUntilSucceeds("nc -z localhost ${toString jmxPort}");
+      $cass0->succeed("nodetool -p ${jmxPortS} -h 192.168.1.2 ${jmxAuthArgs} status");
     };
   '' + ''
     subtest "Break and fix node", sub {
       $cass1->block;
-      $cass0->waitUntilSucceeds("nodetool status --resolve-ip | egrep -c '^DN[[:space:]]+cass1'");
-      $cass0->succeed("nodetool status | egrep -c '^UN'  | grep 1");
+      $cass0->waitUntilSucceeds("nodetool status -p ${jmxPortS} --resolve-ip | egrep -c '^DN[[:space:]]+cass1'");
+      $cass0->succeed("nodetool status -p ${jmxPortS} | egrep -c '^UN'  | grep 1");
       $cass1->unblock;
-      $cass1->waitUntilSucceeds("nodetool ${jmxAuthArgs} status | egrep -c '^UN'  | grep 2");
-      $cass0->succeed("nodetool status | egrep -c '^UN'  | grep 2");
+      $cass1->waitUntilSucceeds("nodetool -p ${jmxPortS} ${jmxAuthArgs} status | egrep -c '^UN'  | grep 2");
+      $cass0->succeed("nodetool status -p ${jmxPortS} | egrep -c '^UN'  | grep 2");
     };
     subtest "Replace crashed node", sub {
       $cass1->crash;
       $cass2->waitForUnit("cassandra.service");
-      $cass0->waitUntilFails("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass1'");
-      $cass0->waitUntilSucceeds("nodetool status --resolve-ip | egrep '^UN[[:space:]]+cass2'");
+      $cass0->waitUntilFails("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass1'");
+      $cass0->waitUntilSucceeds("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass2'");
     };
   '';
 })

From 4133064047a8b59e1dc7553d9629821b84405f1e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 30 Jul 2019 22:38:15 -0500
Subject: [PATCH 045/562] nfpm: init at 0.12.0

---
 .../tools/package-management/nfpm/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/package-management/nfpm/default.nix

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
new file mode 100644
index 00000000000..5cbb207ec4f
--- /dev/null
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "nfpm";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "goreleaser";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr";
+  };
+
+  modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w";
+
+  meta = with lib; {
+    description = "A simple deb and rpm packager written in Go";
+    homepage = "https://github.com/goreleaser/nfpm";
+    maintainers = [ maintainers.marsam ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89fc4364ffb..874c8dc181a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4295,6 +4295,8 @@ in
 
   netsniff-ng = callPackage ../tools/networking/netsniff-ng { };
 
+  nfpm = callPackage ../tools/package-management/nfpm { };
+
   nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { };
 
   ninka = callPackage ../development/tools/misc/ninka { };

From 19011bad0c512c42f68f1ed589df36ab66cf8ef6 Mon Sep 17 00:00:00 2001
From: Luke Worth <luke@worth.id.au>
Date: Thu, 1 Aug 2019 08:16:59 +1000
Subject: [PATCH 046/562] postgis: add explanatory comment

---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 5e38cb42d19..aa31d3163c8 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -46,12 +46,17 @@ stdenv.mkDerivation rec {
             " \
         "raster/scripts/python/Makefile";
     mkdir -p $out/bin
+
+    # postgis' build system assumes it is being installed to the same place as postgresql, and looks
+    # for the postgres binary relative to $PREFIX. We gently support this system using an illusion.
     ln -s ${postgresql}/bin/postgres $out/bin/postgres
   '';
 
   # create aliases for all commands adding version information
   postInstall = ''
+    # Teardown the illusory postgres used for building; see postConfigure.
     rm $out/bin/postgres
+
     for prog in $out/bin/*; do # */
       ln -s $prog $prog-${version}
     done

From c1da476a8815bb9c618e78bd85d54f8825f788b7 Mon Sep 17 00:00:00 2001
From: Luke Worth <luke@worth.id.au>
Date: Thu, 1 Aug 2019 08:21:07 +1000
Subject: [PATCH 047/562] postgis: match platform compatibility with postgres

---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index aa31d3163c8..63b8a39b0e2 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -70,6 +70,6 @@ stdenv.mkDerivation rec {
     homepage = https://postgis.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.marcweber ];
-    platforms = platforms.all;
+    inherit (postgresql.meta) platforms;
   };
 }

From 2ea2643b13530b53384adf664e4d6af459e8db30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Thu, 1 Aug 2019 10:44:04 +0200
Subject: [PATCH 048/562] OCaml build support: add oasis build system

---
 pkgs/build-support/ocaml/oasis.nix | 31 ++++++++++++++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix  |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/build-support/ocaml/oasis.nix

diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
new file mode 100644
index 00000000000..2ada920338e
--- /dev/null
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -0,0 +1,31 @@
+{ buildOcaml, ocaml_oasis }:
+
+{ name, version, buildInputs ? [], ...
+}@args:
+
+buildOcaml (args // {
+  buildInputs = [ ocaml_oasis ] ++ buildInputs;
+
+  buildPhase = ''
+    runHook preBuild
+    oasis setup
+    ocaml setup.ml -configure
+    ocaml setup.ml -build
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ocaml setup.ml -test
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    sed -i s+/usr/local+$out+g setup.ml
+    sed -i s+/usr/local+$out+g setup.data
+    prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install
+    runHook postInstall
+  '';
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 949c5b6a308..bac8e411bbd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -12,6 +12,8 @@ let
 
     buildOcaml = callPackage ../build-support/ocaml { };
 
+    buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { buildOcaml = buildOcaml; };
+
     buildDunePackage = callPackage ../build-support/ocaml/dune.nix {};
 
     alcotest = callPackage ../development/ocaml-modules/alcotest {};

From 15d5a93d16470d04fbf7827353bfa6e7b30b4f59 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Thu, 1 Aug 2019 21:04:14 +0800
Subject: [PATCH 049/562] gradle: declare package major versions

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 25ff6d09d42..0ec57cc8b82 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jdk, makeWrapper }:
+{ stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
 
 rec {
   gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ rec {
 
       gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
       test -f $gradle_launcher_jar
-      makeWrapper ${jdk}/bin/java $out/bin/gradle \
-        --set JAVA_HOME ${jdk} \
+      makeWrapper ${java}/bin/java $out/bin/gradle \
+        --set JAVA_HOME ${java} \
         --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
     '';
 
@@ -33,7 +33,7 @@ rec {
         echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
       '';
 
-    buildInputs = [ unzip jdk makeWrapper ];
+    buildInputs = [ unzip java makeWrapper ];
 
     meta = {
       description = "Enterprise-grade build system";
@@ -51,7 +51,9 @@ rec {
     };
   };
 
-  gradle_latest = gradleGen rec {
+  gradle_latest = gradle_5_3;
+
+  gradle_5_3 = gradleGen rec {
     name = "gradle-5.3.1";
     nativeVersion = "0.17";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 964ec4ada26..c3fc16d7b11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9414,12 +9414,18 @@ in
 
   gputils = callPackage ../development/tools/misc/gputils { };
 
-  gradleGen = callPackage ../development/tools/build-managers/gradle { };
+  gradleGen = callPackage ../development/tools/build-managers/gradle {
+    java = jdk;
+  };
   gradle = res.gradleGen.gradle_latest;
-  gradle_2_14 = res.gradleGen.gradle_2_14;
   gradle_2_5 = res.gradleGen.gradle_2_5;
+  gradle_2_14 = res.gradleGen.gradle_2_14;
   gradle_3_5 = res.gradleGen.gradle_3_5;
   gradle_4_10 = res.gradleGen.gradle_4_10;
+  gradle_2 = gradle_2_14;
+  gradle_3 = gradle_3_5;
+  gradle_4 = gradle_4_10;
+  gradle_5 = res.gradleGen.gradle_5_3;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.

From 4ae454d1eb6c79f67eea29e37dc37b69e87554a9 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 1 Aug 2019 19:20:16 +0200
Subject: [PATCH 050/562] duktape: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index f3b253bfd22..f79c30740a1 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "duktape-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
   src = fetchurl {
     url = "http://duktape.org/duktape-${version}.tar.xz";
-    sha256 = "1s5g8lg0dga6x3rcq328a6hsd2sk2vzwq9zfmskjh5h6n8x2yvpd";
+    sha256 = "1z3i0ymnkk6q48bmbgh59g1ryrwjdv46vrf6nbnmqfv3s43r7a46";
   };
 
   buildPhase = ''

From 53e1df4e30fa095d5f100a2d16115b4860a18afc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 1 Aug 2019 13:22:09 -0700
Subject: [PATCH 051/562] pythonPackages.elementpath: init at 1.1.8

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

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
new file mode 100644
index 00000000000..1d2d34541fa
--- /dev/null
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, lib
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+  version = "1.1.8";
+  pname = "elementpath";
+
+  src = fetchFromGitHub {
+    owner = "sissaschool";
+    repo = "elementpath";
+    rev = "v${version}";
+    sha256 = "0krczvf8r6pb3hb8qaxl9h2b4qwg180xk66gyxjf002im7ri75aj";
+  };
+
+  # avoid circular dependency with xmlschema which directly depends on this
+  doCheck = false;
+
+  meta = with lib; {
+    description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
+    homepage = "https://github.com/sissaschool/elementpath";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7bc682e3da5..c7960565648 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2178,6 +2178,8 @@ in {
 
   elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { };
 
+  elementpath = callPackage ../development/python-modules/elementpath { };
+
   entrypoints = callPackage ../development/python-modules/entrypoints { };
 
   enzyme = callPackage ../development/python-modules/enzyme {};

From 0e979671870694f1cb331035af5156091680ac43 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 1 Aug 2019 21:28:33 +0100
Subject: [PATCH 052/562] hound: Wrap git & mercurial binaries

---
 pkgs/development/tools/misc/hound/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index f1875ee0903..0f9219f10a0 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -1,10 +1,18 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv
+, buildGoPackage
+, fetchFromGitHub
+, makeWrapper
+, mercurial
+, git
+}:
 
 buildGoPackage rec {
   name = "hound-unstable-${version}";
   version = "2018-11-02";
   rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
 
+  nativeBuildInputs = [ makeWrapper ];
+
   goPackagePath = "github.com/etsy/hound";
 
   src = fetchFromGitHub {
@@ -16,6 +24,12 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
+  postInstall = with stdenv; let
+    binPath = lib.makeBinPath [ mercurial git ];
+  in ''
+    wrapProgram $bin/bin/houndd --prefix PATH : ${binPath}
+  '';
+
   meta = {
     inherit (src.meta) homepage;
 

From 18c2645f7b64027f6470fab146708d210f011317 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 2 Aug 2019 01:48:26 -0500
Subject: [PATCH 053/562] grpc: 1.19.1 -> 1.22.0

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

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 77773e91e17..e91d57b0cd6 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.19.1";
+  version = "1.22.0";
   name = "grpc-${version}";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj";
+    sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg";
   };
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

From f2c7593c1aa37a049df0679522ede969e77f4056 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 2 Aug 2019 01:55:21 -0500
Subject: [PATCH 054/562] grpc: fix darwin build

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

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index e91d57b0cd6..81e90154aa5 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
       "-DgRPC_PROTOBUF_PROVIDER=package"
       "-DgRPC_GFLAGS_PROVIDER=package"
       "-DBUILD_SHARED_LIBS=ON"
+      "-DCMAKE_SKIP_BUILD_RPATH=OFF"
     ];
 
   # CMake creates a build directory by default, this conflicts with the

From ea5ce273fb83100e0020d2ee05aaf352806a054c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jul 2019 16:44:33 +0000
Subject: [PATCH 055/562] reason: 3.3.7 -> 3.5.0

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

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 715b000f323..5ade7fd6fba 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,23 +1,24 @@
 { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
-, menhir, merlin-extend, ppx_tools_versioned, utop
+, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
+, ocaml_lwt
 }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-reason-${version}";
-  version = "3.3.7";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "reason";
-    rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a";
-    sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk";
+    rev = "ea207004e021efef5a92ecd011d9d5b9b16bbded";
+    sha256 = "0cdjy7sw15rlk63prrwy8lavqrz8fqwsgwr19ihvj99x332r98kk";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];
 
-  buildInputs = [ ocaml findlib dune utop menhir ];
+  buildInputs = [ ocaml findlib dune cppo utop menhir ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
+      --set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \
       --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
   '';
 

From 3b43d99e70bdb02b6ee4844de13f6f747ee192af Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 2 Aug 2019 04:20:00 -0500
Subject: [PATCH 056/562] postgresqlPackages.pg_auto_failover: 1.0.2 -> 1.0.3

---
 pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 87a54471eca..f37e347e89a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, postgresql, openssl }:
+{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
 
 if stdenv.lib.versionOlder postgresql.version "10"
 then throw "pg_auto_failover not supported for PostgreSQL ${postgresql.version}"
 else
 stdenv.mkDerivation rec {
   pname = "pg_auto_failover";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1296zk143y9fvmcg2hjbrjdjfhi5rrd0clh16vblkghcvxrzfyvy";
+    sha256 = "0mggf5h6gh2mck75dmz5w63gi7d10pqs58fdp2jdpv3am75picll";
   };
 
-  buildInputs = [ postgresql openssl ];
+  buildInputs = [ postgresql openssl zlib readline ];
 
   installPhase = ''
     install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl

From 67209e1b20ea7a0ee99c1eb066c9605c7fc71919 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 2 Aug 2019 08:57:36 -0400
Subject: [PATCH 057/562] blender: 2.97b -> 2.80

---
 pkgs/applications/misc/blender/default.nix | 24 ++++++++--------------
 pkgs/top-level/all-packages.nix            |  5 +----
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 5445c7efb59..3b98114c710 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,7 @@
 { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libX11, libXext, libXrender
 , libjpeg, libpng, libsamplerate, libsndfile
-, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages
+, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages
 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? config.cudaSupport or false, cudatoolkit
@@ -11,14 +11,15 @@
 
 with lib;
 
-let python = pythonPackages.python; in
+let python = python3Packages.python; in
 
 stdenv.mkDerivation rec {
-  name = "blender-2.79b";
+  pname = "blender";
+  version = "2.80";
 
   src = fetchurl {
-    url = "https://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c";
+    url = "https://download.blender.org/source/${pname}-${version}.tar.gz";
+    sha256 = "1h550jisdbis50hxwk5kxrvrk1a6sh2fsri3yyj66vhzbi87x7fd";
   };
 
   nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
@@ -36,7 +37,6 @@ stdenv.mkDerivation rec {
 
   postPatch =
     ''
-      substituteInPlace doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
       substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
     '';
 
@@ -47,10 +47,7 @@ stdenv.mkDerivation rec {
       "-DWITH_INSTALL_PORTABLE=OFF"
       "-DWITH_FFTW3=ON"
       #"-DWITH_SDL=ON"
-      "-DWITH_GAMEENGINE=ON"
       "-DWITH_OPENCOLORIO=ON"
-      "-DWITH_SYSTEM_OPENJPEG=ON"
-      "-DWITH_PLAYER=ON"
       "-DWITH_OPENSUBDIV=ON"
       "-DPYTHON_LIBRARY=${python.libPrefix}m"
       "-DPYTHON_LIBPATH=${python}/lib"
@@ -58,13 +55,10 @@ stdenv.mkDerivation rec {
       "-DPYTHON_VERSION=${python.pythonVersion}"
       "-DWITH_PYTHON_INSTALL=OFF"
       "-DWITH_PYTHON_INSTALL_NUMPY=OFF"
+      "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}"
     ]
     ++ optional jackaudioSupport "-DWITH_JACK=ON"
-    ++ optionals cudaSupport
-      [ "-DWITH_CYCLES_CUDA_BINARIES=ON"
-        # Disable architectures before sm_30 to support new CUDA toolkits.
-        "-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61"
-      ]
+    ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
     ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON";
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
@@ -78,7 +72,7 @@ stdenv.mkDerivation rec {
   postInstall = optionalString enableNumpy
     ''
       wrapProgram $out/bin/blender \
-        --prefix PYTHONPATH : ${pythonPackages.numpy}/${python.sitePackages}
+        --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages}
     '';
 
   # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89fc4364ffb..05ecb607bfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17226,10 +17226,7 @@ in
 
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
-  blender = callPackage  ../applications/misc/blender {
-    pythonPackages = python35Packages;
-    stdenv = gcc6Stdenv;
-  };
+  blender = callPackage  ../applications/misc/blender { };
 
   bluefish = callPackage ../applications/editors/bluefish {
     gtk = gtk3;

From 458f6ba981309cb9faabdb969466e27b3120d057 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 2 Aug 2019 10:39:01 -0400
Subject: [PATCH 058/562] solr: 7.7.1 -> 7.7.2

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

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index 6a32ce39d5c..ddd46299a9c 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.1";
+  version = "7.7.2";
 
   src = fetchurl {
     url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
-    sha256 = "1i189xhlxrpdqx2gx3r8s4dcd7nm74vjynwkrgv2hnq4mw95zf2g";
+    sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://lucene.apache.org/solr/;
+    homepage = "https://lucene.apache.org/solr/";
     description = "Open source enterprise search platform from the Apache Lucene project";
     license = licenses.asl20;
     platforms = platforms.all;

From 1e2d93cfcd5c34435afe561b4be9d83baee2e898 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 2 Aug 2019 16:42:21 +0200
Subject: [PATCH 059/562] idrisPackages: Fix overrides not applying

Previously when overriding idrisPackages, it wouldn't work properly because it
took idrisPackages from the pkgs set
---
 pkgs/development/idris-modules/build-idris-package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index c67d53f8d9c..28bac4e981b 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -1,5 +1,5 @@
 # Build an idris package
-{ stdenv, lib, idrisPackages, gmp }:
+{ stdenv, lib, gmp, prelude, base, with-packages, idris }:
   { idrisDeps ? []
   , noPrelude ? false
   , noBase ? false
@@ -11,15 +11,15 @@
   }@attrs:
 let
   allIdrisDeps = idrisDeps
-    ++ lib.optional (!noPrelude) idrisPackages.prelude
-    ++ lib.optional (!noBase) idrisPackages.base;
-  idris-with-packages = idrisPackages.with-packages allIdrisDeps;
+    ++ lib.optional (!noPrelude) prelude
+    ++ lib.optional (!noBase) base;
+  idris-with-packages = with-packages allIdrisDeps;
   newAttrs = builtins.removeAttrs attrs [
     "idrisDeps" "noPrelude" "noBase"
     "name" "version" "ipkgName" "extraBuildInputs"
   ] // {
     meta = attrs.meta // {
-      platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms;
+      platforms = attrs.meta.platforms or idris.meta.platforms;
     };
   };
 in

From 612021112f693b876d882780cfcb936b60793290 Mon Sep 17 00:00:00 2001
From: Zaoqi <zaomir@outlook.com>
Date: Fri, 2 Aug 2019 22:43:12 +0800
Subject: [PATCH 060/562] Update default.nix

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

diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index 8d0728b7556..ced4a156137 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
     homepage = http://man-db.nongnu.org;
     description = "An implementation of the standard Unix documentation system accessed using the man command";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 5bdbfb18201e1988e8f4302ef88f1d2d647dbaab Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 2 Aug 2019 10:42:12 -0400
Subject: [PATCH 061/562] solr: 8.1.1 -> 8.2.0

---
 pkgs/servers/search/solr/8.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix
index 3c21a2a77ef..48f5847b111 100644
--- a/pkgs/servers/search/solr/8.x.nix
+++ b/pkgs/servers/search/solr/8.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "8.1.1";
+  version = "8.2.0";
 
   src = fetchurl {
     url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "18a6pgbvg6z38r3kqkhr152z7sa2hqip2g9fd26y4gzm2665j5dm";
+    sha256 = "0j9lydxlng785h2n1b8avinrkqdpbj5qn4rk897p2pbf4fdv795z";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://lucene.apache.org/solr/;
+    homepage = "https://lucene.apache.org/solr/";
     description = "Open source enterprise search platform from the Apache Lucene project";
     license = licenses.asl20;
     platforms = platforms.all;

From 2e7355ff13a58347ff3ddc1139413b89ea313bf9 Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@gmail.com>
Date: Sun, 21 Jul 2019 08:28:34 -0700
Subject: [PATCH 062/562] pythonPackages.stringcase: init at version 1.2.0

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

diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix
new file mode 100644
index 00000000000..79f05f9b72d
--- /dev/null
+++ b/pkgs/development/python-modules/stringcase/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, stdenv
+}:
+
+buildPythonPackage rec {
+  pname = "stringcase";
+  version = "1.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "023hv3gknblhf9lx5kmkcchzmbhkdhmsnknkv7lfy20rcs06k828";
+  };
+
+  # PyPi package does not include tests.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/okunishinishi/python-stringcase;
+    description = "Convert string cases between camel case, pascal case, snake case etc…";
+    license = licenses.mit;
+    maintainers = with maintainers; [ alunduil ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 180de8ed8a5..e7c64680217 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6075,6 +6075,8 @@ in {
   pydantic = callPackage ../development/python-modules/pydantic { };
 
   fastapi = callPackage ../development/python-modules/fastapi { };
+
+  stringcase = callPackage ../development/python-modules/stringcase { };
 });
 
 in fix' (extends overrides packages)

From 29bdb1c67253054982448f6c4e8bc3d5c5ee3c8a Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@gmail.com>
Date: Sun, 21 Jul 2019 08:29:39 -0700
Subject: [PATCH 063/562] zfs-replicate: init at 1.1.11

Used by zfs.autoReplication module.
---
 pkgs/tools/backup/zfs-replicate/default.nix | 42 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/backup/zfs-replicate/default.nix

diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix
new file mode 100644
index 00000000000..83fa76b0800
--- /dev/null
+++ b/pkgs/tools/backup/zfs-replicate/default.nix
@@ -0,0 +1,42 @@
+{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest
+, pytestcov, pytestrunner, stdenv, stringcase
+}:
+
+buildPythonApplication rec {
+  pname = "zfs-replicate";
+  version = "1.1.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0386xc6rw6bhzw2a08g90afb3snqhm1ikx65bjfh22ha69fwmga8";
+  };
+
+  checkInputs = [
+    hypothesis
+    mypy
+    pytest
+    pytestcov
+  ];
+
+  buildInputs = [
+    pytestrunner
+  ];
+
+  propagatedBuildInputs = [
+    click
+    stringcase
+  ];
+
+  doCheck = true;
+
+  checkPhase = ''
+    pytest --doctest-modules
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/alunduil/zfs-replicate;
+    description = "ZFS Snapshot Replication";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ alunduil ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d4295586fa..8f781dae9c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24563,4 +24563,6 @@ in
   dapper = callPackage ../development/tools/dapper { };
 
   kube3d =  callPackage ../applications/networking/cluster/kube3d {};
+
+  zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
 }

From bdd7b5a3abbc6f826f608dd68f5c0ed18fcff9cb Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@gmail.com>
Date: Thu, 25 Jul 2019 21:30:59 -0700
Subject: [PATCH 064/562] nixos/zfs: add autoReplication functionality

This adds a simple configuration for sending snapshots to a remote
system using zfs-replicate that ties into the autoSnapshot settings
already present in services.zfs.autoSnapshot.
---
 .../services/backup/zfs-replication.nix       | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 nixos/modules/services/backup/zfs-replication.nix

diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
new file mode 100644
index 00000000000..785cedb9869
--- /dev/null
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -0,0 +1,90 @@
+{ lib, pkgs, config, ... }:
+
+with lib;
+
+let
+  cfg = config.services.zfs.autoReplication;
+  recursive = optionalString cfg.recursive " --recursive";
+  followDelete = optionalString cfg.followDelete " --follow-delete";
+in {
+  options = {
+    services.zfs.autoReplication = {
+      enable = mkEnableOption "ZFS snapshot replication.";
+
+      followDelete = mkOption {
+        description = "Remove remote snapshots that don't have a local correspondant.";
+        default = true;
+        type = types.bool;
+      };
+
+      host = mkOption {
+        description = "Remote host where snapshots should be sent.";
+        example = "example.com";
+        type = types.str;
+      };
+
+      identityFilePath = mkOption {
+        description = "Path to SSH key used to login to host.";
+        example = "/home/username/.ssh/id_rsa";
+        type = types.path;
+      };
+
+      localFilesystem = mkOption {
+        description = "Local ZFS fileystem from which snapshots should be sent.  Defaults to the attribute name.";
+        example = "pool/file/path";
+        type = types.str;
+      };
+
+      remoteFilesystem = mkOption {
+        description = "Remote ZFS filesystem where snapshots should be sent.";
+        example = "pool/file/path";
+        type = types.str;
+      };
+
+      recursive = mkOption {
+        description = "Recursively discover snapshots to send.";
+        default = true;
+        type = types.bool;
+      };
+
+      username = mkOption {
+        description = "Username used by SSH to login to remote host.";
+        example = "username";
+        type = types.str;
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [
+      pkgs.lz4
+    ];
+
+    systemd.services."zfs-replication" = {
+      after = [
+        "zfs-snapshot-daily.service"
+        "zfs-snapshot-frequent.service"
+        "zfs-snapshot-hourly.service"
+        "zfs-snapshot-monthly.service"
+        "zfs-snapshot-weekly.service"
+      ];
+      description = "ZFS Snapshot Replication";
+      documentation = [
+        "https://github.com/alunduil/zfs-replicate"
+      ];
+      restartIfChanged = false;
+      serviceConfig.ExecStart = "${pkgs.zfs-replicate}/bin/zfs-replicate${recursive} -l ${escapeShellArg cfg.username} -i ${escapeShellArg cfg.identityFilePath}${followDelete} ${escapeShellArg cfg.host} ${escapeShellArg cfg.remoteFilesystem} ${escapeShellArg cfg.localFilesystem}";
+      wantedBy = [
+        "zfs-snapshot-daily.service"
+        "zfs-snapshot-frequent.service"
+        "zfs-snapshot-hourly.service"
+        "zfs-snapshot-monthly.service"
+        "zfs-snapshot-weekly.service"
+      ];
+    };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ alunduil ];
+  };
+}

From 5b30a10a0c1bfb720fdf000cfe587ac54071b894 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 30 Jul 2019 10:16:33 -0700
Subject: [PATCH 065/562] gopro: init at 1.0

---
 pkgs/tools/video/gopro/default.nix | 38 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/video/gopro/default.nix

diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix
new file mode 100644
index 00000000000..f783b086345
--- /dev/null
+++ b/pkgs/tools/video/gopro/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub
+, ffmpeg
+, imagemagick
+, makeWrapper
+, mplayer
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gopro";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "KonradIT";
+    repo = "gopro-linux";
+    rev = version;
+    sha256 = "0sb9vpiadrq8g4ag828h8mvq01fg0306j0wjwkxdmwfqync1128l";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 gopro -t $out/bin
+    wrapProgram $out/bin/gopro \
+      --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg imagemagick mplayer ]}"
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras";
+    homepage = "https://github.com/KonradIT/gopro-linux";
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 110cc27e846..fd0ef57e4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3415,6 +3415,8 @@ in
 
   google-music-scripts = callPackage ../tools/audio/google-music-scripts { };
 
+  gopro = callPackage ../tools/video/gopro { };
+
   gource = callPackage ../applications/version-management/gource { };
 
   govc = callPackage ../tools/virtualization/govc { };

From c2466ced95318d8cbeaf6efe972f7c296a98c4e6 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 2 Aug 2019 18:48:33 +0200
Subject: [PATCH 066/562] pkgs/servers/x11/xorg: Git-ignore download-cache

It's generated when updating using generate-expr-from-tarballs.pl
---
 pkgs/servers/x11/xorg/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 pkgs/servers/x11/xorg/.gitignore

diff --git a/pkgs/servers/x11/xorg/.gitignore b/pkgs/servers/x11/xorg/.gitignore
new file mode 100644
index 00000000000..1bf88f244e8
--- /dev/null
+++ b/pkgs/servers/x11/xorg/.gitignore
@@ -0,0 +1 @@
+download-cache/

From e3329f9e85b80c2defadf0669dabdd011dfa72ab Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 2 Aug 2019 18:49:45 +0200
Subject: [PATCH 067/562] xorg.libXTrap: init at 1.0.1

Fixes build of xorg.xtrap
---
 pkgs/servers/x11/xorg/default.nix   | 17 +++++++++++++++--
 pkgs/servers/x11/xorg/tarballs.list |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a5869b21c58..3be672c29f1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -728,6 +728,19 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
+  libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation {
+    name = "libXTrap-1.0.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2;
+      sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg";
+    };
+    hardeningDisable = [ "bindnow" "relro" ];
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ xorgproto libX11 libXext libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) {};
+
   libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
     name = "libXau-1.0.9";
     builder = ./builder.sh;
@@ -2834,7 +2847,7 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
-  xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt }: stdenv.mkDerivation {
+  xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation {
     name = "xtrap-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2843,7 +2856,7 @@ lib.makeScope newScope (self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ libX11 libXt ];
+    buildInputs = [ libX11 libXt libXTrap ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 26c2721e240..426b848a138 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -202,6 +202,7 @@ mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2
 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
+mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2

From e51a0f68c69ba93163954bfdc4140034c61de55c Mon Sep 17 00:00:00 2001
From: flatulation <furdiejungs@gmail.com>
Date: Fri, 2 Aug 2019 17:36:02 +0100
Subject: [PATCH 068/562] firefox-beta-bin-unwrapped: 68.0b12 -> 69.0b10

---
 .../browsers/firefox-bin/beta_sources.nix     | 746 +++++++++---------
 1 file changed, 373 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 78a6a52e20f..133c37d0606 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "68.0b12";
+  version = "69.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ach/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "63b9f627e652b3cd48c33eed8fa04e4c154b0e2dc2f6dd58d43b37a5a4043d2b120b45f24c1e794672bbd4e981d0865fb950c336b6a4201973e4c8b3b4bf1d1c";
+      sha512 = "1a7b57f59dc6503e2c457955d48609fd06e6b86b23a508ae15304e19fdf1b347f209a58075c24041ddfb4c80a5aaf9e66d5e721cf57815d16f43741b5184dca1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/af/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "58e69cf58c679b8d7ccd2a06aa61b71f6cd4cdc052e506bed2155519a13127049457a1e47789077ff1bd87dbb81583a60678e230e5c6f1ea7b4386a20e6f26f0";
+      sha512 = "5f037bb80ebeb5da5eecc94bdeab4e1809e09d6aa93bded34dd87d929e72237e69cee896ef02b51d5dc2a272a4fe40739fcf683ccc9806dd8039f5ee403534cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/an/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "51785eb45aed769e65a786661dc89e2044475070da31910e66a567b4f747df8ce694d4a5fc28c9cada0e4a1ab43e553d9ffd9ebf2249bd4ebc523e35312bf944";
+      sha512 = "f48b2f24cbac76fee0a6b6eb1f77f13234acc283f3213c7c5d776410c4c23a17207ff7b857d609d25eb80a3f1c3c6dd4742d5c7a3216ae0a6193831ff428dd3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ar/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "79d5044947911e22d2e4a4c563b34a38a8e6972637026cdab4fba359566d1a78163298dbfca544c388918b2d3581fdffa89a9a61449d5d20f1c7e7989aa987c0";
+      sha512 = "be8961705ad1f8c90c5a5550b7fe6d3427d53cdad5e3c4f629f5f6267cdf6085a35d03ed49851e54413a7b00230ab66d7348b751fdab2d1ca52e9e9a156c4b1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ast/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "ae7cdc0d5dcd7297c9e78f55e36207621b148b8040d074672a64252e681bfcdcff1c17af021a31f3c9d89ae38326cc508f350c6840d77b1480b25e05f1c6b2d2";
+      sha512 = "d323bda4f61c784179484cc85171ec802c4fb3a559cc177937f0862ace8359d91d0b205ab289b724a0545f82dd36a8e7e1312053747b8ff64ac920effdf2eedb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/az/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c8252fc3fb04008f0cffa43db9983fd741b8bfa04e0fd03d8a293f9cf2eb7a8a7b7b3a6ed14b0fc433aabdb6f106df8c309d83b1a1e60a6539d7fdbc236be092";
+      sha512 = "afe1a5359ef53315d8c27db657ac578613d392d3d946e02456e03fcbbea756f014ec500639d6560b4bd8d096e23699650118657d0b08d8858b89cab9a102ace8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/be/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "75784cc6833bb7c988d8b288a8fb64fda53e642fe2c2bce5a525b6aa3a823d409f996d221b90f4445a1ce4d5fbaf0fcdbf6121a2f0e7a0d8106686c9780b192f";
+      sha512 = "4ad1e8dc3f5f28ec0ab9f652a1d49dc0d0103b1e3c2462a9cb8754c444fa31bda76ea24b3608efcdddcab8ad2a1248214462c60c5348cf918c133152e7c33177";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/bg/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "38aa22c8739e72594757db7130f34e577b260bc2a61987761348dc356b9d951fba997f5f78084bdef9d8742faf4491e94993fa4e0777913a3c58b28fd3be791b";
+      sha512 = "d510f03564876531f7406b210b60a4076c9c48d403f6a80901bae6495beff9d2bdcce953ad02245b20389c38d9b0843e76356cb52cf081ddd46738e703335b2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/bn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "d6074ab4cd4346774f143406facd7dbee1b3e4d45092a9d61085c6639c9ebc47599b2e8df7dfc79a2a15335a7746f5dce08fac9ebdf082df12f407aff5dc705c";
+      sha512 = "23c1674ba24c7d6abd7159ec422fbe718bc706424ff243623dc9852ad3867281e54aa1b6129cf9a5d5de56d267558cd6abaf6821ffd51265bbb7202914ab950f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/br/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "47377442b5c53424feb7c329f634a1e7da72ef92f152beed1306a602812184f48f9d0d47d22d7f0508a23e27b997685528b80297866668bf04323361f926b255";
+      sha512 = "bc3589a09d40bf7e2e538a408a1fbe0c3fcb373b0b0002e5ca039b60d655492283830530b251d5acbf1152dd64f95097aa99f37965819fb19386014fcdef9cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/bs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "ab2237624d724a130da9daecdbcbc6f34feb76320000809d227929d35456450e15d45088b809b043c0387843e988b1a3ac155b44a2134c8ff57d8f79c81746d2";
+      sha512 = "a9c60dd3ec3d00a171eb66506d514560b3c09b5a2650b17207bc841dd5b365d0f545dba75b37c0e84e18321cc92932ac25ff9859a76a4be2f8174fcc594b8211";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ca/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "559f469319186e63da2da98864f4070414bccefa619a8ff5b8d149e3bb44013fc8a9e29abcf66931ae1cef3b76d0cc1f626f5fe84aa00e7905330609746f1ef6";
+      sha512 = "98cc03135c40f3c827b7bf583925cdc11d4595fc4fe8868f52616efb2ae72b26145964a97c01e199a65cb643642c558802dea6f4c1c45a1daf2f201a82467eda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/cak/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "10ee270b0f201ff6127e1dfaf2e80a4f665ffea5206944d658379582be0169242a2062705cd5588764ed479775efb2f7a476a9618ad8517c90cf36350c587a35";
+      sha512 = "74ea91936aa49ac7edc9d91917de7ca9ff15226d95375d02c6d687ee3effab8dc3c47c38378953cd55486e2c0d4fb2a00431178ea45309d1a20301310c42c89d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/cs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "bb44e9cee3a211a858b87e307494376edf3edfd7c691c5e643b1cf575aca2f6e95987fbecc11355ebeee724c5607f6f938360b3e1ff2157433de22ff3cc18c68";
+      sha512 = "be3c5fb9f0fa30a8fa9fff4df91f622dc222546aa8aaaa8e64f13dabc86a9475c1e2ccca1426457d287cac2c3159f048b5246cf7a9372bbb46c67d529e126bbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/cy/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "15be2de82abd5e631c609e034fc267743835a7b35c1afa0ee56c082d3abd3aa293254021141d435004afe7b0dfb48af03247683736de091364476f63635e01da";
+      sha512 = "b60163ce4fdc726507b2899bee66dbe03a3b700c4a59c42d7cc3c131648588ec1b29664cf716b176fac73b9749f630505ecf65248110779b2cb55a2ef05bd9dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/da/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "78ec7abc743c26f48ea5a5232feed7026f9b57992214c007d2486cf19e996a5c074bf972951beca030e534fa1c967af94ba5767d8002bce1089a007926ede8b2";
+      sha512 = "8cd36e2c99f8e15e27cc5263d9f7c329b3421184ac017d34e286492190e0d74cd521849376d72bfe5d718c81ad4ebc0bfdf7d892a810639e212530184c9f457a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/de/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "be1e4a3466b3d2d442547895623bd055055da4911345567c569f54f098a31b12cdb25a36994796435e1effd7cac2c0f064614c89649faff9b4b7d6223fdd4439";
+      sha512 = "b7b8fdf8caf159bd2a10c2a827b2d89cafd97cd29554f7b837dec9f3b10b393010b3fde927c2a54be02b232b2d105d71753c94b15be7de29cc226ab03c860a05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/dsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "184815dddf4d41ec5d00db47e43004bb8af8cddc694412a81af405da38808e75f7ba1d73f74ebe68409d3e939858ef390eca6829e58bf0739ac9f2552f07171c";
+      sha512 = "9932ee55b2d0ca583b9120260592569fffbecdf10745b3d320ff1c68f3866dd1f89643cf6c8df3ec585fd34530bf2a0d49f4a5f835d7a65b10ecb7da7af7067d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/el/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5ea63e62510babdebf33296a4ed91fea53758c67f5942db663964f04af6f9f96e091d9a423c9558eedf553b4dd69db55e453c1ac99631eae8813581874f9f584";
+      sha512 = "6a0afb7e5ab4323957acaa6b53062d0a85cdebca058270a2486310e50157b8028b2c77a4d366a503f44034a5879aa135bfbe1f95a4a3c6ddc9498ca1fbc558ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/en-CA/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "af35af203abe32360fb99ff7a913554ef0520c2524f93b5c194cfe080cf2f65247aacf0231cc1b90867737c29b8b385983d0ae0de902bc9f9cf4f0bd67de2b14";
+      sha512 = "431c6f3d28a2331628ef0a762736bbc4d1bc4e68a73de39e4e3798618201c579f0bcf9fd61ac26fada5c7ca0b112e9f9d3cae96ad981ab677e88805f8b5d2bcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/en-GB/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "145c2b405c4eeaa932720e706246561dd83038a8a21918f2ce1b0012efcac7d0d7d9c3257c2a8b3020197e4a6bb8fa93609a0a04bbc698dac38cff6de13b1b6e";
+      sha512 = "f3c852da6abad331eb3f0e168736aeaef9172a258f949d150f729bb295e76674bd74715671950e338542fb9ab08331d5d53883db449438814a1378e2c0c7cb5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/en-US/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "0a2c58bd51c6ef8ab4826130067ed07ba87f81c621d0b5dc3166a366d054e2e71b982fd65e74d83bfb63152d4087e46e07177265c6b44f538953cd961deed5f0";
+      sha512 = "64d49769e3e908510b4539f39765ff3eb7b108b24e7f431be837116a6b83ef13a02bc3f5f40232a87c9ba25305d75f30f2ad830a9a37cdb30e5cb58bac567fc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/eo/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "e26839f4b78cb079016a39f3873380123be4d7ca804c8b15ed59190157a806395513317adafc978dd45bb7571350685774e7eefdce720a14b81b38df5d9ff06f";
+      sha512 = "2e078e519874deca4790e1f97c56d8d7f51988e321a676ee347fc30fa51b6ea25d14dc7f5f79d8a0dfd4c76fb4540599fbc0fd7ba16460907e8a1ec661b6eecd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-AR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "fc6b5902ee337bb05a3f1c3e4ba9f37e90a8efe650003164d662a3225ece90512a86abe5fddf9c80e2eb30bb1cdef022b03fda53175f9f6fd3ff626d502c5b82";
+      sha512 = "7d3b797c0dd0c13867786dfe2779a264a9fa5b4626f9db97beba08c69f0d63de425b6dc6447554ca9a5fa36bbd942510c2565405469d1e4aa64737de7f024231";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-CL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "12c0ce281867ad4f6c5a190ae11174bcdbe81137a31deb0eeb6997a46826d6f53129394b314d3a0d6bae1d4119498257d34f6ffc5b30568d457b6a6ced186639";
+      sha512 = "e8382333581d1a30db66941950b2ecb02d0b93a48d2da79a63c36b66f093da20e03943a51aae9ff6cbd65252a7cd0b4b6760b8b27ed536f1f5f058411b8ac4fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-ES/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1e30b6695d13c1d11dda43f4f87be9bb5d0115891ddaaab793ec842d4b38ae669cd71db065eaede2fef84235bb4ef6186d2cdd236d310a4b7f27e03a725e410c";
+      sha512 = "312295d067a1aede3ee947c1423b8dac575610e24bb8f0b5c5bc981d009e669d8185978ae3f3b17fa9fe655f4b3a01bcd3aec2afb3adf8b916ac2abefde302cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-MX/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e60152629eefad15af7af7cbf788119732933911c9c3765a9722aa11617349a4341741b5116e7a4e76d5f5bf3c1f7bf786c3d4b10c2c33ae6cf19950f308a331";
+      sha512 = "147deb688909ffc381ad43b2311d30815601d48030ba6e381ddfecd9a2ea9b299ccf1337adb12907664a30157a0dacd19311f311f3765d23ce5dfe85cd469d2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/et/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ab4fc13e9c851065fd04f25e4c1e2ee740e6505e903e8c15150eb60b3d7a80af678f7af1a2a508b651d4fbfbc7bd9f5626056df7142806561a00736237cc36ca";
+      sha512 = "82847b67b0c1b758682aee0a404f27f04e935eeb77e62ad7636e8ae6671e4bbdbb369b38115c0d66567029929f00841eaa254cb180653f730f34446fd45df57d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/eu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "46eec787849aaf9cb125e881881a7e0c98f39ac6a5666bf56b54f78e07e1e13bae5308083717cc9ee4e85cbcb6dab60eabf5b3e722507432e0c122bede73c11d";
+      sha512 = "79e6551219630ad521e67a7f5669ccdbe7346a5dd0ac6b1aab2654d13430d971b4e455b52900e82e0a9fcc7ab6f27f4433d90ddedb57f199cbf6bbc6217770b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fa/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "fd595bdb3dfe3bebf04d80499b25386094ab9c594815c93b678c41c551fc5198db60012a66a878d9bfb0f300c731607b7bcce94108a8b44d515b0238d7d30a59";
+      sha512 = "67e80ad128ba1251fbafc483be98365e80b8ef888448e6e56fc06e901f93e2f10de9683bdb1e24b77717bfec0428be30769ff8676c7f52b8004159a77181b05c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ff/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "f3a4dc9dc9677064f65e7eca298eada76feee7399537860db48c853946d163b405a1db2c84e58c7be6b1e868ef9e3b09c5058ca7dc0e7c107db072bac2907d5a";
+      sha512 = "3b888ba947259b334ae018d3cfd03168686abecf00b75fa1630491f3f190fd59a62af7e06bfec135410b1ee78cf82acc387bf9b13d5c7971b25d82a92733053d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "ce8ed3b5a3856903db73ef5ea0286126c119a76d44f5dfbe7f8b2261e99046fcaf4f06d07118dc1726d915a5e1ec909a4ca45ad75bdbc3f16b93258a6b987e52";
+      sha512 = "70c13e5d110c1508b66cd48baf81652860196d9d350e36e51631fb6f4e979f8fb4df9f712f15b13c54b2c2651661eb2465599cfbc294a94e137dbe93ec15dbda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "75ca1639d5d2be13c186ace6cd9064705827bc63fad48dfbdbe275d1c427ed00b6ce401cfd1c019b46d49453bfce1de51222747f8d7c9ecf373a7898be7993b5";
+      sha512 = "3c0da7e5784b34cfee62e4b66e347132f02c22ba7fcef9b384643ddbe1121a2865169079e064e157193ba006c720ddec3d59e85df6c806226a5185142eca9c73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fy-NL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "04fb6e2c7c0bf006f45b1d43c543fc43a81063de3dd923a2e72db5d8baf6375251313d00bf960e7e3767f60999884b018bec51a47b92415d6c90218327790da4";
+      sha512 = "387aa2fa548820dd9e4a1b4ec374b500946dac4f93aa743b2166f08b78cdf8d34c86bdda25e7c4b17df0d94773b94c88a76472a27ca6d522adcdcfb4ef579874";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ga-IE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "746f3ac13e2d030db89cfee4629c6dcf467a735c124f026e24fd409794bb567730fc50fa4befdf9fa093456d86bd588c9657cd26875683f86d919ed0b3993d18";
+      sha512 = "968455b9e61db7b669ff4a34fd085508930576d4e1009431c5207b1c76a66de776eed3cb6f0370d26d9b44d9c3e4e710537e57c86ce5b28d90c5f80a828a3594";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gd/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "f28e688e388e3a5c587bbc41e58f6af85ef41fe67fa847d6ee257005a783a6e2e19f422d8678b3c44e1e386d088a276ffde8da48feca5acd964a706c7eb94222";
+      sha512 = "557937a63061312bf3371e2f257c9463667182a28e4f4488caa39ed57185344cffac6a937817cf058538e39ce4087f6734c2e00a2a1cedff253736480818dd5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "444c4227c6ade4ff0452e751646a450a0db96f145ff6fdd68f7b58e6aac291ed1313e57003a6084df33d4718e407fa58d0043e6eba5f585da2ed98ea4f40ffab";
+      sha512 = "ad568ee3c89d7e869bdbdf2a50e611ccbeb6c6446b2e314e474c43c6f0d470290bca3534e2cba917b1ed77b7c8480a756cc0c2a3d4907ef91809f21f6dbbfbfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "dbd6a63dde30c979727048957f80d677d9cb3926f64d8783244e28efb167872dce4d6089e818e2b5a044969558395e6f74bb29657aff1424a07711c18f0a1aac";
+      sha512 = "52440609480bb73b62d4ce0d35e68f459153ecd815233c70cb5a2f2f5555d56cee0bc548eb68f6e2d4f3979fc14c8a101ca9a9506a3ed592341a1f818962d325";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gu-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f93f362a8711aeae41c833e32146969d3a931bc26066ab84d4f3f09384022d9ee23b791e6893ce530766443f365bdcb8c732d7ab9ce9c7200a66d6a90da96bf5";
+      sha512 = "d6d445097510f45d9c320b19cd0db97e69f8e5de8f31a532e1b929d0bcb04c86dfe38b20bcc5ff320581d7febba06f1ef5e3ddc61641dca382b66f0f2d7fa942";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/he/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "96dc618290fc3a6b8d073e57474c2dc5c32e6708be676ed42eb73e0073186c82b110cf63984de43ba6bafebf808da15e4650c34df47d9647b62d8b9290de8dcf";
+      sha512 = "ee81c7847efcb09ad9603194641798e200558b4dca7f19b93ccd918e4f63fe0400e9a91583444f1c017112dcf56d73506c29a94eb0694bdb58f226ef2973088a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hi-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "2154a8dd7de9584b03515a750a23fbcf415009907cd6c1e4d08003e0aa6b5683d47554a9ce1222631f12b63abba151480a2a491e686b8c89e5ba22f819ee7c48";
+      sha512 = "8c7044bfc7dde901dbd2ba7e719da6d5385d260a6473a1e0f3f9af99f1ea3add4382bb2683264a1cfe60379e9fae4b68a41f30fa183d54c83502a173b55a1db5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "19315270b79ea8b96457977cbc4f71d2f16359de6e515664aaec9c002f4d537ca5d0d0187eadb6ee2d5112293ffd0e5a0bf156665401bbe569c2bc8d4d712ba3";
+      sha512 = "b680b30f2fc0f4f82f8cdc3eb7849d4a29b667a8cda453395b28499581edb785cb1bfb3ec39efe032f150e5b502955579803459a2dbd2f32264d677ef190de34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "74d86de9290a8f8260301c6a1f5d39b8e18742cc8f2b3f8d282e4093765e4938fce7181bbef81da127cc0fa4b75dfca8cc44de5cbd29e6f56807b049a24a1ef5";
+      sha512 = "8c4ac8f04d933bb104b533b2a8a512e2f30bbb6219f4d5622ca873a42a4d365131083cf9ff7a0be879c098b2b434cacfaa76106f432e3b609e1bc92b3ad674a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d5bf23cfa847068d09bd90d8b6fa1494154b65b1ea6323d7c3d275b46f973f8b4a98bab02d4e61706a3fb144009b4b5aed7259124fc36a037926d9372f409adc";
+      sha512 = "7ad2b72826cf5d98afd1dd65fc30cf9e5525656271f3d1be3b40b2c0a1321694cc6ca36eafc0c51f77e1ca8a6408fdd6d3be528923789564d2ca8bdbab5a5cd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hy-AM/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "70fa78782d08bad09b937718055d2dc89e10ef0dcb8e6d0cf8af07705890818c11550cfd307c54792bd1749499bf1addfe4e89ce0ef35276d4ced93ef75b34e4";
+      sha512 = "fb850f1bad3f626f3272e9ae6e3a60d51b63ba221f341752334b490169874a44f2be3c9b3783fd523b3f4c0484bfc26999a84cc59c893100f21ece93f01b4b8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ia/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "abc7de0b055056395c57e8b7cfe086ba31a447165230b9012f6e14162237a6c49b7ff2fdbd0db373e3a5cc5e596dcc48b16bcce4932638eb6fe2c99b82ea0023";
+      sha512 = "796915bb31c4c18f22348dd7fb1e7c33f44938b5658fb32cb5a86e1470c8f2492642a81b0d2f59721f604cd785e5b56dd45c001d070b2e144b191ee0d0d6b21b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/id/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "55bd13dd322a97af87b506551880017f112fc29a11a175ba6040ed4c1fe672f7ebcbfce0e4cc9b409373bcadfd1dd9327ce53c858a18f4420e5cf366c441874c";
+      sha512 = "5613ac6fe486517bede9fbeedbe64300e7be8bc1dd2a65bac94defd7c800e97c1a4ee5a2375fd0358de3a466a8ca75288b1b6b6c676e3ae02634aa35731bd8e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/is/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "4f1029f4696fb66d1a407e6b74a9692e916e35dde605bba0aa61864bcf129d12c8f3b58a399e5118cdaa70b62f34b09325273308ff188c98dca7b8eda4851ac0";
+      sha512 = "339bb54fde82ce43032d00b2245b114392a47a8eebc0be18a7a0d4cd1ec625412817303c48aad908d1bde88fd80e4a1a2245dbdf5ce9556c0a8b998025b1f58a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/it/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "3c1f74c2ab991a103783eb78c23c82d6ff0a3d30913ef5bfc3d6ede8772654e8b5f3cab6d5b4cfbd9dace2f8f2ddf1fb542ae57be03179737fddad72812d7d26";
+      sha512 = "4fda975595c299241a10ca325a828af6d5be420bc76c021dab815bda759010982213a55591cafc69139dc6a796df96c0eb35d7d7503c68e78ba71926576c40d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ja/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "157f40be2e4a41cf91ed4f6b27fb03da9f5f333e79103773879e3f559cb0f10d9947129cc9d09bba93926260cd0b6021ceb780c269b9f4efe73c9da0af03bafb";
+      sha512 = "d620ac66a39e20439f1a83ba7aab904d78ef85355418d65e8a61b441f7f5e02f349201141fbc4a36e5810a4e2ccbedb624aba0e8071456acb0745ccbca05989d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ka/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ae819155531645b4bfd34fa3f2fcab86ae61cd4efce98dc05325c77cb4c9a9acdfb4c256ac36357575f9826090c92f02d30670dc02efb0e84fd2cd66a71a1cd6";
+      sha512 = "9c2025a3e57112adc9417bf27f16d596e1639531dc1ec2ac685c91ca79f27f3361f1d9c5b5f6e864391c62068561985e257c1bd8e63a80443521c9344fced2a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/kab/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6447fe7826efcdb5e639d88c0ec13fc180f61d4cfc1877bb6f814a305b4480a6481b0403e0656a0c7c10f3595824a85d7755eff197e7b5798288fadd0eb205bd";
+      sha512 = "5ee9889fa241c9a4f9cce25d8ad557ff8d4112dbc620767ea8b874683b1026fbf65d6fa335a01e11c317d59523f43e7a7dd8ef7af60173104a0eeaede4c5f8cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/kk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "f0d272fc030461e6de01c21c3b06d7a8105a81991d7c6347090c85e450a0fe1a44b209b9ffd90c4ade956ba37678398dc4e46640179306bfd2f6b8fcff64dbe8";
+      sha512 = "410790bd0e13444a0780a1dc3042daafef1d8594164d4062483d1c03cc6ba4f682602a5fa28310b1d64c26ff511766943bdb0f2787b9eac0a64668ea38914971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/km/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b8b26fc961738ca0fce723ca41f6bec5d75d18722f7416b93eef2596cc2c01f7831da09b5de305b55c5faae3826382329a2fb0163e1bd79a3b73e00fcaa6c947";
+      sha512 = "98936520579408e241575b802fb77247072cf832b0e6bb2bd0be75af246d211ddef7266cad5136e51e30395317985d4a4aa66647a20e3980cd2aee3e6a4a4de7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/kn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "7ba655e207aeba5cf8f734be11f6fd20fa7fc57d0dbfcdf588c70bec224fd23ac2a447c9238ed9559ab612f5f829359254bb88a80851dd4a6ff691ba4d5b39d1";
+      sha512 = "1060fdb60461684c0bd8625ed4f5e53f967619682ef920cffca663c70c395a211bdc940931f08de07814b5796f4fb6ef0b340543e4a1bdc526f6f4cb5a250e9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ko/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "1a9480d6f8c9781d401b5b3d98f43b60bf6f0d80121920fdee1ccc6b2339e9c7a96b6fc53214ace7a459e84991cf8d712fc558250158fe10ce7b6b57c40a6172";
+      sha512 = "4a88b46b972a90a8ae6c00ec23d4d4c00b18a6f5560f0514d939a135bf2c3f9207fc2bf84a19fb496182acfb95da70037ecfef0ceeb2f7a2220b5803957763e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/lij/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b76d259acf9ce2ec775066f50e68d5821c50b475d870c3c69ef70b66fe2cd14de5f52f47eae6b9e419538c7292149ba301a6c7061cb14eb7b707e5bc8721a557";
+      sha512 = "a219c8f97158fdfd1bf0dfcbf40540c5adbdb861c3e8df131e826fa5feb73f33900024a8812a3ee648c63a8c8d69641f927ebb437745730a962db85bfde229d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/lt/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "509413d7a37363ba9a57ad6f6389f8c06120480d0d0cb14635b914c0a0026095d522c95f8c6c244b12c048137cbeae240f12c1b35843b00e2c725e37e3a59540";
+      sha512 = "4faa38c7fe80b3176ba1cff0153577adfd13480917659f8b45c70a1ff5650e29935ed10cec88059be602fbff64583153642acc9dbb419a8d269115659db55a37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/lv/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "ecb21ab93dca533a2de4b31d48523a6dc83a5901f3824b1cd480152457bfb908a5650f1f9a948713e0e5cfde566157e349f171b1fde5a201dec30877f42f9204";
+      sha512 = "6334ac39f823a5a289dc60288eda76f2fe770d8eeb1c3e6b1265eb5c7b2f1affca0143b0311c8ff077f39e093b3ccfe743e4aded6384bd1e0d212067207df40c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/mk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7853fef96ba965febc97c43b9030b50c9a0d3b2f3af31eea2f59ebde3792f6c18eaa207617706dea9c9c24d9d19e1898c357b02b41060ef6b0f79b0c5ef9e8f0";
+      sha512 = "9b63449642f2e047b49e3a29528b4aa29565f72488c82f0086ee1d427d980fb64f913b3ddff1f1f799071b1fc542ee17e6822728bd0187b38fff28127229d63f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/mr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9b769e0ed3884bb60e7a5d8347bb0cd6af654ffadd7b3f5fcb7f848c859886cb29e276d7e6ce28b56bffed2dc87a9d6722f03e2f0af9b51a657620e57b48dec9";
+      sha512 = "be966949b09bf18819d34c774178b8eadade9b259082f9b6d6782fedadea6ef604382e8667ef49c479422f7c46df424d5e8d47beaae6b5139d2a4d372c2b59b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ms/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "f076289f7bc5fa8ba644111b306e076103659b8d779faf3dc3c281d9bc7c19498e47babc80795fd20ec8e1c772db984b165418f9e48490c692348de87f1383e8";
+      sha512 = "71664b9bbbdc21da73698ed616bd6cd34fdccbad0212288d3eb6a332ebbe1578bced0ff4f4d587e4cadc076762235eacf568e0b5139a0b851b5d6bddb6a41807";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/my/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "d268b850e130543ee45230d3594411d617b5d81bdc85e92464f51772794caa751a95a319a506f3d5e7de2bbaea08fdc86959d167e5f7a29ce050d196b038a447";
+      sha512 = "9fb7a365fbdba50f664a1cada9fc26995f7b5809ec65334ba87127108c1e5027ce46f8c793d5da7cb32daf1788e2a98fe7aff0fac1b2d2f3f47ecac041538b2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/nb-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "f2822fbef945733f249690c30fe06762788455f574696711fa1eaae1decee763ec4d793d0f51702b38c9d87e6697f90a3f81292bc824f2b0d12fdd3643530b60";
+      sha512 = "17f96fa38949bd3be40b3a6bf6e5ebe323819940946350ec535182f0197edb89af45500f54c76e51ac2fae1a95412b9f2a41b92e38803cc4af1097123e6233ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ne-NP/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f58c8e74f86927afd5cd74b8e502c6fb9366bb2aa85349dade0a0b2ad538c0f2c11c68c305dc6d590bb2d9caa8ccc1b465493a8b1e1df914d437a0f124399330";
+      sha512 = "e9cfc087a4c5ffcc223d873d26ec3203992e4ac8f418f5eea156f66bb92f14606da3cbc00cf7ec0524f549261153df9e40e402e73aded124b57c95feb6812740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/nl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "1ddc6e85c68bdc42af08aca251160b720afe535505865adf2990386fd6cf6cc59e1f65ceb36cd3239b12da43897ceac325e69750ea1fb93adbc90e056714990e";
+      sha512 = "19735c48e5da611d5f982bc7d295cf995d878b26ff35f55a7798ebd28689996c75fb8e5971c6db627e5cdd15423150dc146f8c03f4886fa50913cd8818a1bbd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/nn-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "125ad213464891daad95c54c2354d36c987c9de62b695acdf999cd3b4a3cebd692b780d28307b4381da05f9fba6556d76a5c16e9e0c4ff5c7847511995a17944";
+      sha512 = "74a7eee4b310f9d893208f28ca0a03863f28daf95e1cb3197ff6805dc17ced77cd4e2b3d27bdbcf20982e71a6e60f36d9f0147c650623b7f79467f9a060f08e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/oc/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "9b6d7a9c9e557d9a836aee780ae5c0ef7e81540c6064c183243e55928b32a4f937270ae4b2c21f33e625aba6662a5d0f614167aed728941025115b5a5947834a";
+      sha512 = "ec7f830c37cf2e67d978038898df581bbb7fbedc3b98117bf4497104713c382261cac7921eb45898e23343deec775587a6f1f69aaddd788ac15cea293593a84c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pa-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "5adbe11d8313d055e58cdc9fc51750b31f8e284403f823e11b72ad9069986647305001a9fd7db737f3943819878b5b9bb70e8c4cde61834ff8bb33e4771399a7";
+      sha512 = "e5d72332e01f54c9576bd1aad7f54733c43061bd8e1813b8094cfab87d18f2144817270c572780f66b0fb0ae6a4bb7071221735317ede3b6eefe1f6204865766";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "c67e75c02e92dcee4e5c2dc71b087ffc3424d18951516a347a4b00c68542a7bb05a81b03dde60f3b4edf6c0add653c72edcbef8db6165811182e9be3ac7cc8d8";
+      sha512 = "93cbf86c41086b81851e58a7b6a66f181a6baae871954664c088e3fcac956e4854b5590d1c5226b2cc286f12db85c21428ebc7a1c20c769dadb992936746f1aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pt-BR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "683165b6c93ec9e0f109b1ba4d24c907cfbc3787136d99307d15abe0e1eed8b6e444ad0b70a352a4aa7c9bcc0d4a09efab48133a9a07797d6e5b2f98e0ee1650";
+      sha512 = "ea2f727cdbe67174939f736c6b23a9d88c902655f13445c74866a71f7a8f22e9037436e1589a52d258bc6d5f1338853de846542a6bab3dcf81d5e092e206e2d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pt-PT/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ce7367061456c3009e7dd6b4d0a3cf6a1324c3daeb7406020734f63adc169214b9deb26dc37936725d4ca3ed1208d4d81fc5dfdd73d7753b9d64bc8740f76acb";
+      sha512 = "6d6b8fdf32ea8ade420fd64f4c882d554433dd9743bcecd11986a70ca5d12f9150ae4feae6897a412bcad192098ccb44412fbca1329ded3b77e15ba06076434b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/rm/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "801801eae3a2c51e753dbe1c436d0fd5832c1fc9f0687c04c2a5452f1dbe06435c9619c13f87d6fff2cffd5997469b4fabd8e2d9c917853ac34e3695c1ec223e";
+      sha512 = "dfe161375554d9886b50220b4d33625c3779d542fa20e713d7dad8c1221c1bb9c4300a4d139ab57335fc021f237e3316404637d2a837095e247aaaf6650d20f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ro/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "be62b477b0b72b6febb26194604e7be748dd1ed879e3e44e02d430f4feb40b5e50dfa8a5affaa1836fc1ba20cb1aad5fe5482cc870eab83570809ac90994c087";
+      sha512 = "c3f6766f3f22acdae48cd340112b0248a21a580c68a473a311f6923340417487e16fb82c99648909e627be4cda63a779905f5a17b43379eeafb795b6c1dbf5f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ru/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5943d3f90b1830607619a15cd61493969fe79b7e370934f20de1e63da3cce04fb733fdb9efc8568cdd8ab5fbfe23d67f86be2cb5fe4a9d738688e096ded10f53";
+      sha512 = "49590d809c2883ce0eb7c5db156defb950c5bb6cc1106e4240c18cd4f17ea550952ac36d2ff8875cad4fb24cdded1e6d51881d5b9d6e360e44f780d884125e92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/si/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d230ff8a7e74efb71424c8c8df2ce1895e44643da96e67f042f1f59a06aa4b3abb8e8c6fa29033196ff6e5cf5ab8792de5d9ec51ae59906c019a6df028ffd436";
+      sha512 = "66541feefd335e4b9f79e9165ace04f36decc46ec97b211a8f9af86517a197b09209e8f43bf9db449bfa3f1bfed37a8d3fc438514efbcce17dddb6577928b41b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "57fdf155d558627c6c80d722574d2361b99fbe692ebef94d53ff52d3cfa33e406339e8c6ac9219c3e4a7de430426aff8be30d5946f7284fdcc50ef514b0c0c70";
+      sha512 = "9967449c710e8a08e7936dc3a297fff5e254d1fcc960f04a6b349aa97526cf6924522975e750770ace0aa455265c6422ed97fda48afe25d254cbd9b30517171d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "95f792d6bf63d490d2622156abb2ffb4383252f734738df1b76fc07af60a382d4bff37159ce1887ac411e9637676c24aa6487fc97c1fe8b296aa2971d148f983";
+      sha512 = "7b3881eca1b35475c26806f29f9a7155e63e159cc139558366f8e1dcd92483be475de2b9075184a31fe1c7d3c8c0a7053b90e7f763f33c38adf8cc57722d7b9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/son/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "2583e96c5d24231cb3d8b1bb4d9e73c5e6cf73724b10612cc4bff6b2a6d3b7d30321a06221339711293671f8648ec80d48a650e2f18fedc821ce9876136252cb";
+      sha512 = "5fc0d6cf18760f577dcd2e606247a16c20b39a234d60e28880107e1324045db4a384d65c4e83da26d0296f2c89864d24c8bc24127dc5aff8fe080e7c727536ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sq/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "0ae04967e13f3d3e279372001afda687aedf087cb1773047aa3304f36575409a85e91e7076b494d98a78d9524284e80773ed5d87d4856df7407dd0cc384d67fa";
+      sha512 = "7ca9d972c906796828deae1e79dfb1ea9455835ba1b870d3acbd484103db6d87e76011b55668da3a6e361239a8ad87d5acb7d25ba3ab474e28018bd8c768cc57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "8f0dbc4ff9381e66889abf817a484e1b21f72646211d7acdb4b3c6e0fb2af349d436396a8efe8a20ec8357e42bedda4d5811537563849be5ca7c1daf4ab0d23e";
+      sha512 = "ae58799b2b20a91df60eaf452a0c81b1d608eeacddbf0a98d941abb8a9c7feba8857d9fed9e4c59fea2b24a7b6ba7e1193be826008450794fb710edb36ee2d9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sv-SE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "7725e0444d58ba8a2c095511649c45b4fe63ae348cefbb7ac4ef80e3aa776e43de8f9555e5d91074b2a74664c7dc1ad463571efd846735b91ff880ec2ed76d52";
+      sha512 = "273973c93b118f70d0a83af1daa3ef64de77444172e668ae34df2b547e053047ce4fbb565b4ab5b0f2094ef7cd11d0f8f37b4ef205312e80e99b16f67eeb30e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ta/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "952ee81f4d42181c5babc12d0d6abbe9e31d650e3a3957d7d1afcfc54335d1e1b45691fbbb6359a531c73fcf46435fe468bdc87825d42c66b74b64264194fe88";
+      sha512 = "813cae155b3e8ab0f78542124648e8218705f5122f4a340dfb5ca15cdf3ed3f7505845a6ea23263e139b7f3713a0db304c360289d4989f91be8bfec45436af09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/te/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "de9c9bfa66dc87f2311bf18a15e544391662d36e0f71a72278dee8e24d4cca860f8cfda8f93bd2bd26fc0c3d3992f1603f2e3fd36fbe7a9478390b9535d51e0d";
+      sha512 = "4069f40d9ff366c3f126d77855344424c498b9e9c6e9fc78c78097b8d3b3087478f8c3964d46671474e98023c32fd44202d43967ac8c3d81b3debe5467a14788";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/th/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d421e5d653b00e290c6acf069c40cf43695b37796bab9a59e7d6c4f9fc4ff22e2d3a9a370a9f6a558c718014cb16a5e0dd05bbec7e1ebab78e50a539bb1a1581";
+      sha512 = "9e0a5a920856b492425a493aa85cacb465f4f59eb45a6c0ba2cfa631558650e40a9d23c12032b543487e78092730206862af1bc7345388803f992bc4fd5bc0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/tr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "ca4a1f139e8dd4dfee268c0b90778cbf0f9462ae9bc037958cb5b3e0668b902e392ebb5e5dcaf9d72974bf1a5eccb74b079df3e3a81cfad08501cbb39129d2d8";
+      sha512 = "1f97700f9c6b9996523c100b7393f3ac465c45adb1cefdb163b77b12d7679df2163296880e9004e4b6f8dcd8840cdee24eb752bc6a985f15e2d8f57db01d9e0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/uk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e85e9926f59b948f6d9f181a87f8a6096e0ab85c81ca63bd0ccb885eebb05091a11d1c0c583998807b0f153b3de4b76447a2a82a99da9202964971cbfde73ae8";
+      sha512 = "c8ad5621ce8c61e83aac7cd7b272ea7bd668d159872442aa80d88ed1b46ccf77de913e8cd7e339388b117d9d6797c36b9535dcb0efccd805410f804ebdd1f105";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ur/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b1c42f0960b0bcac39b0d3ff2470881bb1d4f69fcdc2d2af3899d8379fc9d949f2b1cba879303e47d5d67122290a82158a12e36a05fe2d41eca3ea68b603973d";
+      sha512 = "e1c056d287dc38be98db702869d16958379b8b56ddeb46770b175668f447d87b043773c3c9907e0d106abed7cdfe1f99dd871ac4510836664964b3a71d7a5289";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/uz/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "a862cd7e358d5aed459c93671a0541137c93fdc9687b4caf483ce3cdfddd6964a8e941b92cfa85bc638c7f20a6f2fa219d4e275000eb3452c6a744a95c44ea06";
+      sha512 = "da694f4cc7f3250e88a8c54e94629749c30288776a1838c8f2183dad59107cceb3984aff23ef4e7d05bb7acd001e1b69adccce297695b206409214e9995b41da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/vi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "0b4cc1154a43446dbf10a796896023ae1d7570dfd9d346cfd05f402954a3f31d803382a7c50e25c0695fd09144f465060cce838e8de144df3fefbed3288358fe";
+      sha512 = "b120a6a272abc7c633de952415b35c13ca88f4263eb939f9040e9168154d7309c3e096827348407c36cb09d1ceb67fcefb4b3f3dd4e35da404a1ec44e103e126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/xh/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "f5c4b78437b9e389cb2a7429d02679280cf9bd8fc7ddba32640221addad8350805c83543588f7567cc19cdcfa2cbf9795a88ed44b3158a7fec9087e2e7815171";
+      sha512 = "68405955b821eca91f75943630104710a0ced12933b3c9fe84d836d10fce32cba1a0799be8de9f3cb58758ae627b5692c9e7e624b8fc62b0d70a16734b7a5e4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/zh-CN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "f1c7466c71a9890937bdbda1f17f8813f7cebd7200040338c56c54b40644f47f91bb74ee74734bdf7c2b2343e9445a20098182cdae23876c0c9c4a98e711184f";
+      sha512 = "ce80275c117902d0a2edc1e7a1b6f23f5b54e684f813e38696224151621f2ebfb2184bc018905051a07b0428e245380c630cac60d5bc927b4329e701cb0c174a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/zh-TW/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "c98e96c1d0d792a378b76deb6222c7cd202c77def3790cdfa30df155b629986c97b11ce025327c0cee8b03cdc8c4c16a938a5060774f1e029bb17c88ff7e9e5f";
+      sha512 = "89ef19db13cd8da8e19612381c218a601429cf666f95c762510b300eb9140812c0adae9e5b7b4957eccdb8be7fc306deb9a089c19434b2410162265782e5226a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ach/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "be126d8ae1c0998da42006332da3110dcd15a233d1ffef4cbc4f09a4cd2426fb2729e698d7d632fc1ba23b6c1e0ae6d38081aa48a63f9cf738ea6e644273033d";
+      sha512 = "bdee0f41ef6b4d2efbe13e256616820df048610af411befb91256bab040225530cec74b35c591ef740161d12a8fad6cf96e35e25bce7453be30ad8111c2ef3f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/af/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "e6bd3df1a3eb81fcf78a570cc62395689a7e2d456051ccdb85a99b5c48966835e58fd52098fe7e75ad1f6fa2d333ca1d4853be2775071077b42679c31ab00590";
+      sha512 = "9268d6071ff9142579be3495edca6325dd283128f2a1ca60d6e249d0a963aba7dc3a897aea523804f5485843950db5901d4db9ce10c3ffb1273dfab5adbbfc72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/an/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e8590dc16c0047b0d409c60091bddfd4019fee4053ae42c874733e5da0a03a4e170eca053e7dcd3fda70057d7ace4c3014032008c9ebb9ed5c05c8ad57f0daf4";
+      sha512 = "8b42c162402df67971c01ffd9087768b4e49dd60f069b88b154b3e1a237c0c4f9c7a7e4f752a83e8fff3eccaa87e7599a9c3ebdcc3fb70604032fbe7db524d62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ar/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7aa355aae3c22329f5769bda023bff2a2bc509e842306421c6728448f55cc675163076ffb76163d56dcac77102e200c78a5221114c6576495d24fca021d54886";
+      sha512 = "d4a0c3987c1bc8e304ff065bf1ca1dae66691e28a51beee4726bfa7a685b5efe17c19ec8f7520b982a1b88c631b126c8511abaddeaae2818515ac59b2781e830";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ast/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "df275d655fde2a2a9c87f77d608bc0ea30807817ce360560e6315b5fb9ad1a06d19399784f13df1be958bcc8cadc84f9ab4e9c2a7672099b23e5c28051b07c01";
+      sha512 = "089557a50dd106d25e35eb72ff741c80e8aac36974c2d4a5c49842ce56078ffd8b9f67d829be48411b46d4f823bc1d9ebb2dae22e8293cc197e57eaf23099b72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/az/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "0dda2c6c3c403890c2019ed19e506ce30b86c8d547996d22a3e778c9d519f0368496454b37ddc14c6b7dc4cb3284c17ce2550a57d3ae31b8d4b978c05eaa4b8b";
+      sha512 = "237af11c85728ea6d05dcbfe456a5dabc369b0fa690d23a05457b7541d787b149bff45e5b71be4c39ebd808f65badec902e657cb6cd3dbf7081fb4c962a27b00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/be/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "cfbea537c171b49b866de652ffe26b8ca7e57fe79bb834bbc859781a78505ecd21bfe58194585e60654555a1135295f6bd9efa26e23fa86f9306df9a172a0c0c";
+      sha512 = "c9952ededa6dcf507969ed16ce47ea4f6e2694c1e9df207df5457ff92929ef195885a91ff1d160c1dbb8e72e6a7796ccf4ac36a9bc28efc3dfd4e34f5cc17907";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/bg/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "2b4f145666a4e77be1a8af82c1122b6d2a71ad5fa1f2bf8a938f04f7b67619f639ab9170858efd49d7333d2073e40363213f946e161404d3ef250e2f5cd13868";
+      sha512 = "bebf78848ee8b81af5440ebdbe49dbf14de20d853f1e6bc6a8b7ace7d6c329ac28e3df2a754b7e5e2c1210f6cde54b539a11d676708ab36907ded0ac4025d6d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/bn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "c8a1061200871ea00f380f464ded104c757dab2430dd3c416d027a6dfe1c2a1bf97ec6963e6ce2a68f99dd6abef1ba8a0cc978f1387ba0e8dd3793e259abb078";
+      sha512 = "8f4cc489cdcc348fa19c8129c8a9e83507e7f30dba3f2788b21e6573ca0228909612b8e158c8d9cd87dc8b69554bead47d9522fd754bf045964a1880a5deee06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/br/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "cc40c33af7dcf8258c6d675f392c15da86eeaea27c5c4b27fc2d618b5a7f5cdeb2a2b827134c4fc5f88321d5df5f2d04be088dbf409c51b12538aa6855a7897b";
+      sha512 = "564878573b16470ab89f3ec82d2efcefa69708a2abcb9fcd7527fe6d3a0b1302a400eb121dd1041599942d436583cf931b6c13a9eeafd13d00ea15f3cfd1c524";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/bs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "fd5e9ce9a3f25d01b0a14cf8729b1f44256a279f57211f37af888697f51cdcacead83209c39f126da266d06b6d9fcae30005776da9bcfdcac823f0bd5b91b374";
+      sha512 = "4ad5cca7ce623219abfd09f94a33753f909e344ddc8f2687d6a50386275728e13853106206e1261c6625328f5448578890e496752cc11796a30757e29fdeeb2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ca/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2fba5d90b6b1c2ed66b6fa8dc52371e77cb1d783acda27c88341c89ead42a8acc6a271daec2b0c0a992b27e2737fc33c26638abdf18ebad64c2d54b2d3e1e84e";
+      sha512 = "83617e53c6b10b7668e7675ca0bd17d4a121eee25bf2381b2e97aae3f8bc2552422a18517f0112c938fc032f4dfc62c85844ac05f823b02346423339dc8f679d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/cak/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d9d1ac1370867478bb211b9b51f71f9aafd75745b4553b66cfcc739c2c5f5ac42e2db13d31eaec98877113c0fba9482d4547824917d5f1b8c3e8d43e0045bd8e";
+      sha512 = "11b6a20036725b6e794a2d76e73cb6d2850d498d8bcae442fa31f663901931665a9e4bd21c6694317eb3a493bf6d33e00bc8e8ad98f151a2bd38daec404a9e5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/cs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "703dc733105080287191c1e77a6c969a6b8ae9ba575fbfa572f43c64982c0a957b4319c76712dfcaca2ff6b4e6ae00dbc1f325df2b06261e0cacc75cc279b9a3";
+      sha512 = "387f5bf3c18887cd89c977504a2fb956944d3bdefbbe17410edc541ab8ceb16a4118b0e98e7193a85c66826c684e636dab7e7ab5033d4fcc6304ac49d0d96997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/cy/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "d2e139f9891abad647f8e4cde9283e5a4376dec5ede58ecd27d16cb92a623ca5c5442aebe7ab5ad5726b899b7a90d109350716ccbcf3f645aff46d9167bb8cb7";
+      sha512 = "a0c139b58e15851ca69fc9e138df813912be6ecace6003a3dd474ace17f4f18125b74f247bd795b619e6964d238c162e16ee83c953fb3511369842ec6374b4e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/da/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "3c6fa6a9112dae40dbf70328af0955a63f1a7c0c2216daf6a3b42a2e6a14f841c6d04e4e294c9e8bf0564afaaf20d9959730fc8b50a491a059955c5e1b2beb99";
+      sha512 = "4a9459cef3d4c737652014d2b5a29801c3517e28d614cc1f8fd4707c7571e952a53c9bc0827308fa05272416f84e6db95b45bd27cfd7411f0bd15a75b17d5eab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/de/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "dc1c0b8b87a83a6bb2f30beb4da6b3d04a7d0fa0feb734cc207b2b282d3fa55cc5a0bc19d0b9fe430424686b0c785a2f6797210ea7c740c2199cacbfd680500f";
+      sha512 = "1aae6f492c3f7dc2194fdc923568bd8b77ee9f591e7ca9d8f8e6e6dd14f6873bb999340ff0c347a60982ae7a35a1e98ed5cdb07cd079493e06f5f248859b99aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/dsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "f7589f38caf59a8acc7d02c026119304443c3016482c47b39613834d93d348f7489364d1fb2efdfb2397ba9a8fe088915531e21b95927d3fac97ec2f07bc6af3";
+      sha512 = "283b212624768d1ffd58573f67e253a4f8d8b0ecc824fd666290b5424f1b1642d3d88fd0e1cc29f6259860718ab147bb371583fc5a8eebd408d5e73c7f8e1ed9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/el/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "50d0be1514be61facdc660ffe8079defa37cde6f823b47ae498cd1e4536c9f6ced551f82ca8ad08e0be4f0d64b2e8e055a20f3a28b282566c61545aa39994a53";
+      sha512 = "1ec29d5a50105d7f4d4b6d6cb2fec25a9fabb150a9de547fe13fd1c37a964ffb2bdc5a66599ba315fabca4bc833b8b12e48b218ff70711e06dca8b5d36332032";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/en-CA/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "eca93e266ef850971878ee858830f056afe430d5fb6dd45ebf0cc305bbf4ae9d8820154c0c8df596a344c4993ef184e000c9059e068e75064ea53d8c0a2fbd07";
+      sha512 = "86658e29977df1dc66487d4f4550db41474ed8625c920763336e2a1ecf98da2f0ae0d765c7a0b7ecb5864b505d841789ab93868bc1bb0542c687e359662027d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/en-GB/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "504c55d0039df0db7cce4cf0346919462fe0ebbe1e36a05ba452b815506d58ad03ed6bfe5e4d347a29a1ee97cbac52158f7939a0c817513e3cc864ad0d80f3fd";
+      sha512 = "c8b4401a307d72b27843fccf12d71f72aadaa12eaf373af78f80ba00fb27fd3f7b06a430ab17bf74955d4de673373dec25faac738cb2bb292a48134043d95a6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/en-US/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "882a4d9edfd71941cf685b0944ec9a4d1dbc7fd847a9bad9ad2f91d84ba0edd025b40529f26d9e9c40707cc82c741e360d1935df3765d1210768967614a416c1";
+      sha512 = "291e666a59b9e26ba612a8cf75b04e82610d6818fe3aa034b09cd62052d52c3990eee25a808838348cdbb7606e2a9218c6a9478ef868207f0c920cab76bb393f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/eo/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3fac5b2ec348b453b5710ab58184a8716b98a08da4f7c344690c221c3467c01f92ee21125ce396695358529190a168c2f5ad7d7a6a0b82391e17e94bfacc86d0";
+      sha512 = "e056e31a8c364ebf56915967d54d0d24903adf32a751123171470bcd968779b3e58cec4731f9b126865b06bafc3aada52e6c0c4abadb981161c390b1ff75d916";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-AR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "589d3bc9f2da99d81ed11b2ee353f7dec1fd2f747cd32212ff270f7a1adbc1691e4af76026d1e11e21632a2c976b4b126ec07ae5977209127a99e50e859994bd";
+      sha512 = "b165b4626e4326b9a7b72d32497b935b14e470a8ec9731491762a4f2f5b020766a453a5d277a4b693ddba243c39a5145f6b1962cf65282f983ece1a58d9231f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-CL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "d0cccd7eb4d8e7593288e5268661075355e528ac6f50bb06bca66995687af703cc15b843641aa41e2d9c34a71444581b151555de083282d857900462fca4a4d4";
+      sha512 = "e50aa715b2197242e03890bd7d981b34bbe438e7b594d38637495d6c5c7bbbe14dfc345893e08eddd095a758528ffb9f8fd73dc197bcd68c6b3a9aaa8dd403cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-ES/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c4c39caa2d8e3787bc81a125c3639720c315540f3efd4030f6b16f7be73d7162e9c3f404ecbf9a89918fe522b492e79db9e1983960a0f20e60fd9e5fcf4a6fd6";
+      sha512 = "cf0900c6571046403fc0dc2369208ba65f580d6894b2e2888d50631480e2945129311e1a3f5971837c6afb3b558dfec83c0886802c7881c8840ea883a7049a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-MX/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "3d385a01ea51929790a6a1e81700aa6fbdd5988b6721b791aa65ead15d20654a7e71cc5595d9a8c9652fa760e07a4b0757115b46e9d9de2b2282d83999ca93d1";
+      sha512 = "321f06c0105c8d969f1ea04ca8065bbca76d4c42c8eb18b95fb3d859b0d0d0a5e7c1bf5d7c9894821987b2a4d46c08198faca5c03cb0a51b001039977d523ecf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/et/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "e3a278a33d7957326cd0631766d3a4784190c9d3225814ff1fc7f987edbe91fba39dabf2eac7fc95f44ff8eafd46c79254affbaf4d0ade7fc25c9c14366ed4f8";
+      sha512 = "db603e5489fd329fa7f9c7b8e5589d2b7d62ca8e295dcab1e7a3e838c125f1acdca7dc541f67366acc4550682a121e132e5aff8243fd5e0871ad94249f037941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/eu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "89790aaae509fa4338abdb92bf2380355f88a71c9246807ebb7099b443bd961fc9dc4190204a72b6d2477e69081724b503a1abc913fab0dd0e1e5e00033dfab5";
+      sha512 = "c74c42da5f7b1b08d3f031b6f67bc4b8fb3d77c7364bfc5d8ad442e0883efc7488e1699c560ae0c7efb88e4c4f5a661d972489b431bd710211398334047d8c98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fa/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "37738b97826f9cf0d1e5364385f4e960487fceea5c27bbb82b43fbb4596ca6e8418edc8f78e6fd323ebdb5472abcd015fd50b345362bdef27ddb172549a9318b";
+      sha512 = "fb791c52894ee901a54df353a7f4b3a16259689e05c4a18931c878665645d123cf493d25bfdaaa4641a6f925f2a23a77e585ec73f9f2bfb33b87ad3ffecc94cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ff/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "cb8e50396c862b276678a2fabb80f980fef30d994f53a09359d58604aa0a27eb0b278e5d9a1b1dc7c1fe596a0d3e0313bfcafc44c0d065c4cb3abc5c6034e6e9";
+      sha512 = "f5c657a4d1ff42e772943ade151288fc8fad73e532ee11f00ad6098288483a3326eb00a80f13b38abf4165a1ec057f5fcff705ebf9c6d1a29a3fab491b08b63a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "99fadaee05f23da102c430d3d1481962b540b71663a219699ec57b2b7342b3531fb3dcfcd506d505364f4c72f3f659140a1169993283683043fbac76cc282eed";
+      sha512 = "1d758e4d9c472286d694c70075a0e9a6c955f42e21ef38057e9647a91722ffa15909a39e4c29ecf8d221c5ee3d464a0bdab80b9ce2e9b048a471295f0b6b4dfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "70c559e2a9efef7314ee1f029b21e684ca39adf2aef298c613b1fbb93b7b727885b51bebd741eed536d4df4f61e3f63e985257cce79433ab3e6412740486e73e";
+      sha512 = "12bc2af05bd45e5296340560fb9b1b5c3b970bf4f57a3425fc4e7a810a8a092637ecac20ac1fdc643a4d891754b93109bdb8214ba5fe93bc62137c296d667ae6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fy-NL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9935b93db2eca7b29d190cb61e29e249d307efa2475617e4a4885018767bdb7d745380a6ddce2611af94bda34054654de9ef5f61a5cde627900471511bd51f10";
+      sha512 = "274c67f1acca9b79423da8366ed52036229917547dff79f740918818c379d21402eb0516ca8919cff136b6407950e6b4fb6fee3ce6c1bbc1d68092678f4f255c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ga-IE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "d77f318779d04a6891e4b05f0e17fc76ef8571df1bc87d251b1c00997c9f7736df18fdc98c2a3f91473309dcb2c74df121e300816fc1617efd806a738d4e99d3";
+      sha512 = "537e1760621cdd5e0690db7ca1aa0fc935b0e1fcf1a037d988c38c7a5294e34cc904d44642234286b24e070b27ca67e41b7bef0e0983ef6909a977ce3b0ec52b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gd/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "c960a3557bce3e6aded9454f506ef14eed46695d468199d4dfb5a9bc84314aa171c0b61c3c3972925a881ed5da6d3cdbdf6dd0fce70d2c509cc9d49e6cc74af8";
+      sha512 = "1198fffefa0cfc1e4d9dc7058c840ee3aa6957022a988c3f39fb9da29b74650923153c563f1c5504f70bf8effeb35ed4d9b697e637613b145ae88d556002c064";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "58a0dbf623f87c0fe76384b5407b0681e2ec6418af046a65bc843ab0731d84fa1254244405bdaad92ea03b867c1022cd8359a3f469bbdfabc2d177a2dfd38a3a";
+      sha512 = "5484eb61aa9d6103b9b44ca9dd0fd2ef1440b20a5c07392aa1a71127a0bba0867e55797429edf328a5c7fd207325df0deb04429e2224ed9faa1336c8d189f5db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1dae8f4d086ca7ae9ce7ebde47d5f11b49768a3c074915735171f851a10aa2ef70bea0701fafc345d777e5cfd5517604744d70e143217426fc3f8a29350904a7";
+      sha512 = "65d1b767146511e6c337cb18dffe1e1e8bbcc702aefb6dccdc31b6722a3f0146826e154b0255ede79f282a3fa3bb4b63d7350acbf49d752d2e8b58de484c2b34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gu-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "ee01da06262f1f87093a19f775db4546b2c0a7d2e0a52bf2640e2eb77afab91f36c5134f5e6ba61f0839e366417920727f82066d277bded53d30cfe1bf708841";
+      sha512 = "e8c3cd52bc402b56d04ae1be33a99197df8570d160fc415893f9d91ba7a4b64e20f345282eba8e1b71f9c486db4b37e84e6b56f63b8f6f15532a1ce9bdcee7e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/he/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "20db236c57f8ef23cada1a4d081c6070141db952986431b6654aaf78f70fdeacf0d50eed7d2b054ef51ff56807ac019efb16a67b47bc9466720a50f07cd59614";
+      sha512 = "b2b8b13ee803ffdb039bd656a8f7eebaf10cca29a49ddb2555bb2e561b39a7f76f3e65243e3b37ec31b182897a260ae801ce11223f888949677539b103561398";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hi-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "3713350c1cd114dee03fcc74fc4620e56e8f56eafac03fc93e39f3d5bbdd6ad251e9e3b68bf380c1225f4092d607b6624debd37b239853c564a32f5af7ad0edf";
+      sha512 = "e564b962cdef896bb6b7708c315b3ab07bb51c4d3813a9855d5ecfd774577808165c15db6f875894b6ca4d9ce01ade8b2eda64d12d2b03a507291ed235978691";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "d7b407331779e0ba9a717b339ce3c0c7ed7977f2d78ffef8889285de4855d50db9a2d23455c81b87620f7235bd1b46259be7694ee05a34c6a80bf3eac172518b";
+      sha512 = "56ed53ccf263879995b79e9455a73fd7fa9cc082fa984f603d5b9347231232598f85f7c3abcd4e1ae243098ad338eb59efb544a1aef16f6c55e036ff4ea02324";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "f0be34fac431045229d9719f7dd8de16d7c47688f8fb403d701e07163376878d82fdd5990cfcd3668d7224569630942c1e0819152d1db397ce25f965decd84c9";
+      sha512 = "9bd729f6d27874d73d4d174f8520dd5639d6e8e4c2284b67438b73b44eb715478a66d2be348b431007fc19ba7c347f914da59265369e80ff7ddb545e6fde25a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "acb207fe9c841da3e1d6e0ab80b0a48fe6e8361869be1871bf156f33c99bcafba28a91b4e533a28218416e5a5c5864ff44f7d75ede0deb04c283db252418a164";
+      sha512 = "872993e7f725c8ad3c360cfdaeed4ad0839857f52d88d5db040ec4dbfd829241a7aa0f4c786f2e5f174b4a3161000dd2bc962e9f290e8f67a0757db52ab3ec7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hy-AM/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "c8243580e1d4304d9e249ff49e9f14021f886ac29cfaee1b35630f9ac1e7cfec125cd547bee8e645f1c3e709aa834da46a97fddc8fe1eba565ee33818a10a443";
+      sha512 = "a503a134cbde97990b0f733eb79a93454f668c490040b83a109200a3c54560730a1a1b9fce137af6ca5e1a37268b994f500030be8215222d442b651f319e3f75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ia/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "593f1f384da7f3adc0d945ce87b7196e6b34db416e860c6561a0b4b6e37c2cdb945f26ec465f49caa3da94f2d95230830f8a09a32de6896fd5348aa9ce6dffc1";
+      sha512 = "9ff8052382c08e4181c55706cf6612abf24ac8db22a64f7adacda83efbe3e17b8866a7536a9bfeec555ca0a8f3628e88effcc39998a13f382223551d111ac3ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/id/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2c8f939c34c4655173599ac5b5b485695bb3e5aa83e734fea482659d0883e784463d606497de540877bc9121741f9a2fa45fd9842979f348502dca9f148d45e5";
+      sha512 = "e03931527fb8a834973092e7cdc75fb1a03923a7ee26abb4e415a6eabef47a32a52accb1365030b4ee84687289a2b71c94faf633f39fa868ee0ffe235e1518f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/is/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "cfebb762b4318c4db863b1a1307cfa59965333d99f6cf78b99927df92741ce8cbf2540b657ce9ab948bca587a80cbc11633033499109addea0f675a2fa9747a0";
+      sha512 = "403339f6fffb70f1541b11840e38ef8ea52d2fbae4ccfe802dc1dbcfc1b2ab8ce50ef7eb3e20c485d86f3ec1c97cba9077a131b7db8d3ba42cec71778b09888f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/it/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "f2ae7405bc9fda25240a53a731a81724880d0a61f975ecd4e916c46f69648bd09e94f9703cf7f159de3d7578b2a5f114c5abdc7b425540533622a44659fe8580";
+      sha512 = "518a661eb87dae3af75834198c6fb1d3f6836511dd532b3166f4b395ac0fb1ab602b56a0a8be06f3474e2c89da8ba04b09fc116b2391b11b229d2aef8ff31275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ja/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f7084f3dabd2e5cc4029c3840b3ae6cb5de56919076325a5c2789c39794574cdde5ea656d75fc0e0ee2b5600800ea51c3db66431a793362dbe949c49e629bfb3";
+      sha512 = "e1ad475114f41e22ef4eb38cff1870822920fe164a79791b21a9b7e9dfb4c7ede59f16578db71214d72270e18ed7eac759a2a978b9fa1c52b04b8b07468c9531";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ka/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9cdbdad908b6c0f292c5bc78a1afdb867b7bccdb43afc524ef3a72a7079587664cb0df58aeb6b3aab3cfb509c0300bf48b3c56e8b6a6ba94e6413f4a4c17a0c6";
+      sha512 = "4aa683433623ac70de7ba0377f8fecd9685a40f1ade072c70cfc2bba375158e04d54fcb25a170077e321d300de849a9e19eba464c619b9f911c25340aa636133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/kab/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c2e65f580b84e26addf7f13642b17596d91c24afaac8decd03235dbf6392df083368ad1e7b3a5f44666ff87a8dc6a08bc3030410be8a578164d3140a8743d2b9";
+      sha512 = "45f1b8a04b5a80c4e8207eb9c52b44228b176037aa47319325c0783dd6b5b09c07f76f12535d1f1eda265e0e6f160c24cfd087c699c24d628fbc4d007c156dec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/kk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "ae42960c95b5331f5bb93dca24a2a2e9e10ff210fa4d9cc8adc728a67e15dd1e70c57a8e2ba4ba9feb0466268ec7df14cf061aedd30a597a89a46d3f9fb3a313";
+      sha512 = "6b327637688b45f61cabfa626fb8b23919142e8eba03db5727bd18b714d4671f6beca487c43fe95f48d9d6771e1775cda098197e41addd06979b480558bea85b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/km/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "7b4e27a7be3e0d5641fa152e76b878d1fb485579e298e7305934ed4d94ac719e658c32345891be818e03150a417542fae07ebd03db74eeb5e9912a75ec5a0dbc";
+      sha512 = "de72e1d2164a102c063f6906678a739d70cd7e0b44dfac622ef94e79d7bf076e32fd166b12f9fc077b65592d97d5d6b2f13ba2e403c24c9f9a988f58c9ac3554";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/kn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "9082afa873079ac286dbe1bbd977f6499fb3dd31c9665c6632750de20ca851dda5559aa6b697034367257517dfcd449ee98f253539521c49b3b1d5e4cf2baef3";
+      sha512 = "b505d91f5586a2aaa53824faeb65c31fdb85cd975e8ec659e63c1c95a71f96fa13350f93658455cb9000bc533551a4ca1cde49a0ea74a0d0a8927215b251c34d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ko/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "21d84b384cc16f8b0b62517c355fa438fce255b3d5a7fa77902da2190530c868e46b5a99da059ca5f1306fa58e52471cf7aa85c2d860b8983077d9531a408bbd";
+      sha512 = "84fc13c778f38dec4399293bf8b4129d5d21596cb9442e2f6a6d9cf671917b762fee13509a817d272bb4883ae012692919eb62f8c83ae9620684a9f458ac85e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/lij/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "88104bd633dea730e1291fb3e1be8f63c68be288c86505d5fadf4c51189460b4315408b15d1c30d4a78dafada45687cf4d231c324a2fbb5b1f1c6f0df053fd4f";
+      sha512 = "afcc6d36a9186a24c7672bf0c3cc181e021ec2c08651a84b58e9f06e400394d8ccc7b4484d17909c3388714104ce3485005eef3911596dc23abf8ea9515a4908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/lt/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2b6159e38a3c32f993a9a03e12dcae5198355804b60c262354ccd1976d5c448d133a4e4bfa5fa77040a7811353aceae105afe9e4029e97f88868bb311fdcd64c";
+      sha512 = "ad072bd72f7160d7bd9caa7e69d8b1cfd8744e6ead5e1ba0bce5c89a5e4c5193cc55b56018f9feda5d03041082eb5e054dac18ae78d280d7bba72fa5b12ef84a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/lv/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "6aa7a4e61ab8a08de96b233e98efbd6a558562dd20400b5c905fae5d25e7eedca8732028b5c810611580f250e9fdaec5bed9b6be4ca82a854b218fb50bf29f76";
+      sha512 = "3b8bb275384540b32b29d32a72ebb54997aec84b2dabe26ce6f9a92ca60a461dac4368fc8ab816001664c1e8702c130aabf5ae3c39c107da034670aa52b9b616";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/mk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "aea23827fc798c1870bbcf3a1d6305835fbdacbf7b65d3a58cda68d289dcd2abc1552af01c7f81ec2c95953e8a390072fd38bb187083205069c10e049beb5509";
+      sha512 = "519c24ac7757d8af7959dab1e88315f4e4c163003d9467c5d1c5606fe74e9972d35d54731eb46cb7de98be456094d047782c62bbd6e3880f6743c2b3441ce865";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/mr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "a4016ed6ea3c66f3e136e324c370373b79240d021478333f1e75fd5a6041884be5f3984cf769e41e05bb7ba4ab27b3e110b4b60acad2734f57aec1955509756c";
+      sha512 = "7dfa0d85c946dec0190730c49b79a447311e632a58e467c5451c467fa870e6262077f89b2bbb57e29d9d35ae78fb182c4553d4f192aed45633776b6301a53a26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ms/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "360f51dea75071407513f798b21cd5e45af7f00a6d106550270d8f1cc381e9d93946c0c5d7a5bcf0869c7b552e2a6f217a00a7e33b628e55849298ec71d7ab4f";
+      sha512 = "2e7201c05ebdf99e7dd87c1fd974a33fd8c5d56e34aab55da6af22237ea8a4caeb6367ffdbfdfb15e5726096b918ccb7512c77ab20e02f879f4cfd5be27caa3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/my/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "500597a8d6728ddecbd535d8d7dafd5a7f462319b2aa8dab159b7c2f6662d4bdb67988e6861ea8e1e8bfaabd1b8ae3e0e281f6c695e21b86f3557299c4f253f7";
+      sha512 = "f5cb255dddc705083cd5c91daced163d4337b4162d9686d6c76ab935aabb6d3a651e3932189948115c1612ad5e864cc83ee17f107422d21eb9f8dd54e28d271b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/nb-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "a42cc16daf51f5820e0fc549131827e9e00fe9da455607c54a069a2ea25cbef0f7d0b831612dbca90763ff94d143ddbf2f3dd795b22f137b167af70f30a27dad";
+      sha512 = "d0eeecb4147ef017c4301621ef7c04a14e1aa7af7e7de2882733ff77e8fde916f55d68573cad5d104eb631c60172b7fd886b4c896c1fe9805841ce5e40de6a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ne-NP/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "e279dbf320b862b84cc47ff48422f979080d109f6d5e222c44ff0b7a282a5e2f9c7b8cf90e31a00c62dececb6ed580d15f78126adc1ba5328edaa83bcd2df389";
+      sha512 = "db7f205b6c42575bbf1e69c256c2113d49a86388f58eb806e761024e73f70ced1a974e18b226c83936a601f428c54ac8deb663ca950960154c60e41fec37efcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/nl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "927e986bb7ac3cb3c0bca70b1731427c47b0c08be95d71017c6e748b837ee5eae4b9240f2c106326f9fe4dc19503e1bdd211ccba4574f10476980083aeb9f6c9";
+      sha512 = "b5c4569a404b9b7cbf6b3c4e1b125c1b45fe228018b8513766726f00bf7e52fe2ed1d07f724f5cd2a37afce2c84201d30425d156eead9e02a47011c95fb045d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/nn-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f3f63b23cdfff7d7b7d1a83906afbdaca279eca3bc7bcb0e81844617ae0c682e47de7677e50e9aa255d4153ddc2c71380631ffe9c75467183f9c04ad14fb9a81";
+      sha512 = "0d8661643f719055c88b057838fec06b19cc5c91d7975149dce7c61ada82dc7f40516622828c05cfc1a5bd44442f2677907b460770378b92bffdebba9dee3015";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/oc/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "ced599f04e78c03c0aff767aa874ae9a16f931a4ccf6fa720eb75fd68dbbf7cfd0a5ff34f5d0ab11570d02d6b9f63f797c41f191e7d00218113eca83cffcd65d";
+      sha512 = "5064c9198ec7f2c2e83683405d0ec619f7f8243e326051e33fcd869499fe281836ad2d5e1b633a3f264f7968398ff5c8933c5f7fe95729db462395042673058c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pa-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "beca221d503a6b082df8bfe67e9be796c670088e0b3baf30b6e2fb24a9397f10efbe7958461082fb0696ded9b4e4b5b15c77ed57006a76e0c54623cf6f04235e";
+      sha512 = "3c52168910d6612a5cd6540b74d922624ed399bc6cdede95ca1ba83cd534acbf6673170687393d3f0ea9a04fbc5940e97062bdf25484a779bb93f914cf793865";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "0eca48ee1275ed2bec85bec2c9d0e09ab962c4ee7543441126ff520cd61ac5bc686d1ce006243d652ad4c79fd08be6473b87c0052cda20348a66b5eacec18ca7";
+      sha512 = "b8e627cae2a2a2acb6b0dfab43ea501171165898196634ec435944d625ef8d1048ed02ac94aab9bdaf63ec5b2f3159d534db78801b1038fb493797ba27c2d7dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pt-BR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "0f1b2909355e22bee9812ebe04b2ab9280b892724addca0915b0773592a6598b0aa48543d92a16be39eb1f748f8109594cc129d59d5a74afcfee8ce71ddc7d8a";
+      sha512 = "263678f014c16c22edcf4139bcc443a02fd67dd41a8820f670c2a1a44f83bc3bc4532bbad92707525264baf687a17b6d5d3e46bd9d7228a3798c7387d218e17f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pt-PT/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "2e8a2d2208825576580a86734f5a77a0d17fdc8ad76bc317a1171bc610eb71f20bb66502cd9158a8afb281ac5e92f8edc9a81592f2df4fbfe2e368acedc241fd";
+      sha512 = "2113203fef6c17485784d4ecb03ac8ed249102a8bd231ef3c0a9c95c06e0d46ab3bd5af475ffbd9ce11036df0937e34a42ea560a3c056ea153607e93540fb91b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/rm/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "6132cc4dd0ce68b50ed5417842c3f8bdc8deb3243f82cc6160ff657a8d51a73403e6a6f987a7a8fc519806c380754a1fe9eafe804c08a972d05c1fb75c76dbf0";
+      sha512 = "57e47591931d942c59259d10b41a3eacb4e5d8d61540fc294546a0a15dd347b2419b64b66e4a33e651e2f616e158b7bda60bccfaea1a42182197dca694e43e3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ro/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "b7b64b358f847a47831fa7b30a4b1fb2ce5e3dd68252e8516ec255e193d5f2e4f4831bd4649b29ecf8e94e133b9178ae62f13a2bc1d56b93195543d4fffc2a21";
+      sha512 = "0c206c38a7833d1c7596f26a0d6b995cbbaedb2b014464dc15c82fb3a8315bb524dec0d2df2ddfe9a28b8737c32c87a85c8b815f284535dc572669089266fee9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ru/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0c06df6db5060e4c5d7bc1802ffa5b31dc7fcbf041d8ad94ae5d2f02f340ab0a1b8078c0b35822c25fa48b9a48f3e89f15ddb3819f27613d8ac51d3033129bd0";
+      sha512 = "fa544b95295299c3a9eb8c97be37cab4faf77df818f624562dbfcb553f6b9650b458185e52c2a77ce07e3884ce76bcf925e15aabaa4af4490abb9a6b9ff1ac81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/si/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ebe76dc51e5ae556152b468084e848d2beebd5b6a2b87efd136db6936492a03085b8207c2928ebb2f5dc003be4fd47e7b330034bbcbf7085663e08348e5580e9";
+      sha512 = "2f2a407162f4c1fbda3ae3c2f18a97683ff12fcbf863734659d45aae50ea6cc3a8bb447449c1e1922b3b64f84bcc295596287cd24855e10ff8fe25401293f888";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "e722e0d139da87df2ae9526621379f1e8a23da052bdacc21204cc41b2ee22a316c915cedc8d13c53b63acbd5a5e0693e52a6897fe4c94f33bff8cbc27c4d0f0e";
+      sha512 = "871daa6bdeb59b9ac1c3d73316846d2955bd278a46f17820c7b1f9724a91968f7e1dc19934701afe4d880a22befd3999784e1cda962620400b01bc56662245d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "8ffecbb942625559f6d97ee57d716b97a8cca1110aaecb5759b85aa2f56d65058b08e48b939cd9ec493d709d44cc3083843eebe1e742d6bebaaed15eb9bc4149";
+      sha512 = "02e477a1c5ffb5cb8df98c8da67dc1556e0bc832b99ab03b4e231ee801baa8bc2964ed81e94ef431ea70b958c3c18fe01dcfec583823d4aebd3c6efb24333772";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/son/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "bf56d3a90aa862f478c0a858bd307663f1e0bcaf3298e3f3513d0a55a3be3934677778ed16897d477cb27874bfcd9cc7f8965cf5916b48de3425459a04d2d1e7";
+      sha512 = "b423b037a5395bd230030ce18056703867d74fd595b54c070fb9165f8c8b25108acc9b35fe0422bedc6e5ff57a0657b4bf1ebf5b9840c3b5f0fd3db2b577d416";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sq/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "5745e225017602257b546b1b08d112292664f46e87a62cbbd46a9fea65db34f24dff61f1473f13927afa33c7c6dd2d9e8e3c3d0bb18c7a6014e45b878c2aecd1";
+      sha512 = "7805e5a4b7b84e3ca89bb40d086726b42afb07e6aa78ac2c5231a1e8a3deadf02493b83077841e979b08eee913062c03a6da6b7a835acb54dc2ce34692808a67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "90f3ae30892151dca30556aabb3d5ef9f7e2fd85d361d32af4d87516337b8389d8bcf01708477fded9a5cddf58a9f69980fbed68109a36a4892ba3e1e0229df4";
+      sha512 = "e3506dcd3a14fefffd3a450e2573498db3fc82ecf9e20b203c5bcb3ba8d9f62e7dc69dfa3ceece91090adafad675451bf70d5badda3e0adcabf340410c9fbce0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sv-SE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "b9c4453da8a47729a63ed1c67d18d7544cc9a6241a2b9feb246f0ada423086dd72bee3b91a0ef1e335ef15fd1c57ac1937a25b311587ab2470438d8f93076532";
+      sha512 = "cacecb4743defedf9f67348adfb201f0092d835049b8a93afe1f1bba6c919441b540c101024f8e55b4d3ad2f4fdc71f8cd91bfc7d35ba5ee2af4ec13efacf10a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ta/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "99954f03406a823b9662f371d1c6fdbab18d15099b081a4b7ca99517433aa67c22c719efc1fb84baec3e3e25f1286bcf4d876e9494b8b5f92ef921f88c99c57e";
+      sha512 = "9184c8ec21fecb20291cefaca07b78fa1d18baa5ae0af2a13639f0b3de176b80615a133a26b575a8c10d722308f50aa0dfb34d9b495a92a137cd1ff738467be7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/te/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "420c1b6eabaf6062eaf635625c52a14534dd4646c3c28946ff13a9ac573ffa200d71d29098bb99909747d90e2fa5ff8a316e1785ff45eccc1fd070cf354236d6";
+      sha512 = "e903b44ee00bf108bfdb57a31bd954a7a924c039e606bbbe8d804979ea2c9d9268e23df1da36f1188b3e2684bf77a8ccc12590bfd02f73b759cd8f660f038a31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/th/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "9e399d3d6c76a27e357f3d5b6a728f6dde409b1575588b55f84b1ee53668928ec1d83a425feeda3dac0198b5ffe15d432d00b9404e13c0cc861f9147fa0b93a9";
+      sha512 = "1c5c1a75ebe2cc3a80eb88d3cf80787360e88401ee749ab5b8944caba5caf55d267939376a0c76c72bd733b31d438e141d3f937bf604e8f48e333cc3024851a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/tr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3382250950fe1ea125a3058c633440712f5db3505c92e695708753e8b5f2b89d2a283dc09157c47309d926a0f25662afb1c540d16c15bc2b97cb661cfddc10c7";
+      sha512 = "a7fc78e4abbaf40ec8982ee14054e2cce5f21e4c5f6fd2dc04d38bb6b3b062c12a97cc7dc113b8893a1f5a842aa892ea1440bad081530918e1108b7034e349e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/uk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "207e86fd3d98316afd63f4c5f10651e9a5c754a3aa2c4c2b50d40eb51048b32806fa631a7559a919b540111f8ca5ed84d038afbb7865de90411d627360b9b979";
+      sha512 = "fbfc588e3a366190509948fa846ee0c075e91e4489ca31c496ad73cf3150d93cd1ae657886f370ff36acb211852b0644dd3bc446da973a2dc18f019752a0810e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ur/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "faab2519f98d53694dc7aa55191a6296f29baff7efc9484790a2a78aa7c6fef09e5a0384fd9235ef32df4d75a0a0a1150a40f6d83f37d487ae9535385ea48210";
+      sha512 = "ec1cd0bea6a8a78ec6c8bf459d84af87958bf11835ded4c33a46cb721d37a0c56854bc754b5f4c13890b3a436d8c7b9746a6a421683f7845b72052eec9f59bae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/uz/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b71bbdf0ea3d19038cba328516eba8c49a5a36d29cb0e04151140c7e5b19ea982c7389cd5248d846c760d55f723b11530d050a327a49f3d8cdb371fd283c1a9a";
+      sha512 = "0d8f70aa963afb07cd2a3eed5eead80afa7a8e4664411a781e2ed808fee47381d341b4a0a118b73cf19a3639d61dd36f47a10a5a4e88243ccf0a4930585aa02b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/vi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d2a27da5ee81c6a46f3e8f4a0d21d37bdfdd1080a8dcc8f43b121c5b4fa6a5a544e8f04a6bea3204c1c8b18604516909a0d8717581d6b2f88a432aa5d04c4aea";
+      sha512 = "530c31e84972d53a6983291bdf1a01a4528503f122f94bee9e3fd4fbe284bf7b92f3f53e9b119c9da678a9b453b6f64a054385b96af2bf7855a90babf7cfcf14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/xh/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "c52908654b48f79eafc96a5b4f31e13595383dc397564a958fe4ecea444beadaeeac88c1b1c3929005715796a89dca4e3befdfb6d02f4c1503b7e86f1deefde7";
+      sha512 = "e2c3ac847fce76ee7754e02fe1bd34882e2364ec8773906f9884ce2806b47f5cd966fd5fa39229bf6ce67df43e803542cd6a4925255138d007b571288c8212a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/zh-CN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "3fcb1f091af4b37fcdf29ce99299ec02cfa07927f9945bb27be8b97e9374cad28bb2dec9f03aeffd7334e9802f001c520573cc1d34e5670c2476ff16f758347e";
+      sha512 = "04c3306367ed2284b08fcb5c8a8f0c5d3b447117a1195b50457d0e9907d262163129811e95222f307668f4c1178a4575c6d80f3d7ad68587630fb83ca6c1f9f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/zh-TW/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "440464d74bb0601ac6d0868a2fce0592a1d49fc029a2bb1782e6758d35e7f7a3961ec0cc60e8b389aaea2dc42703551f7d31e3d1c569e485ccf58bb0e34ba126";
+      sha512 = "cea2e28cec094e9672d849a94b65f925ffb44de9e8182961ba5fe5e1571d665a069c525ff11b9f61632b64017674266b109d5cbd032f552d0d99ec9fc347bba2";
     }
     ];
 }

From e8ab003ede7586414b8e98be47ccc92c58f882eb Mon Sep 17 00:00:00 2001
From: flatulation <furdiejungs@gmail.com>
Date: Fri, 2 Aug 2019 17:39:42 +0100
Subject: [PATCH 069/562] firefox-devedition-bin-unwrapped: 68.0b12 -> 69.0b10

---
 .../firefox-bin/devedition_sources.nix        | 746 +++++++++---------
 1 file changed, 373 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index d9b96fb7e63..5d4ee39a4b2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,935 +1,935 @@
 {
-  version = "68.0b12";
+  version = "69.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ach/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "4239de26746d164633b7095da96a837bbd58294a4636d6bd3e4b23cb711f6cb6b1f56f1fd7d30938225f1532117da1d9eace309e2249ca7c6671685d1d9a97d4";
+      sha512 = "9d036f8217a95ea3d601e10050ee15f75f6d3eea5f38f5a1ce0a773d92cca7418a863385555ec9112751016e4008672f8de79c17b7156775d7ba3eee2a4c19d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/af/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "ed5e3724fa2c88c84b4bf5d4c38613dc99546f952b74ac2e9803f9fc8fb2d5dfc58f8ab34244671eba42adee1ac1e917e578e9625f7206bf3b4b58aa75a5c8aa";
+      sha512 = "def33babd8a97fb1b9f9059a019d5c823e965f404baadc1daf3325a3f7437f0152585dd6ba13f67542eb7b1e7cb2f265986c7813c35e65cb79febba5636a6c5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/an/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "ee87f64673037099dd29fac1d3c545298f4db4d12d0c8809e1f8ea6eddd29210edfb9e20346c0f5f747ba86335e123fd08d5b40b0a6d7ba2f34d4906dfda7f19";
+      sha512 = "b51086111c0a2a989c6123729028b41a834f25bff19836b486bfd935d52055a8c23bdb0e79eb8718d86a4b4781ed6fdd02b946d2dc5e0b86de9fc2166393f1e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ar/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "ee2d65b077b464ac1a27e5ff24f33a303ec2a614246cdbf83cf84a7356f1cf3f721f6d804283c9fe2a47ffff1e61688de6129515c5fc833d60f8de2efe370f0c";
+      sha512 = "d3cc62cfa029a7112aa8b27257e2b1b7c3adb99d56d3d749b19009be92ada130353f6d5bd8383b78ddd179417779d2425ecfa2d778a4752f7a876f3fbef84c34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ast/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e9995774e3349c221f22d09413d6fc30bcb57db262ff311988f596d63702d210b904db5720577c06be4d53e2b95ade7aaa7980b5002ea93c9b9186f108fbb83e";
+      sha512 = "75ec692ad8b8d56e13b6b34a980c9f37034b188a675dd0c975e598277fa919587a90a3be11867bd63db1c83a12876d10e2eeb83e5666f10c256adad5b9f369f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/az/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "0fe2676b475fce70b5cf325d1044829022599962d1dc144840189f9057623bf575db1cd7cfb8b6d7ccce6588134c91bdf15cc6907fc94f696947a83671cee9b5";
+      sha512 = "9f44dd00187942430c69898298e677dbfe8385a9e43d312681c7d487ae3353b0dd668a87945d41183bbdffd8bfe7331d1d752a594fa515372139385935134417";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/be/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ece3b80725f7a2cd2a97778a64f3be788277fcea436151cf5221554a4746e7f9215fbd708f1d7634b974e7716c387c3c8914a5ce3386323c048353cf8aafe039";
+      sha512 = "faf91758f3cf17f8dbc570195adacbd93a57f46f0750eabceb6e66df16dbf459670254712b63146b89be67442ba828d5506a703cd51bf3d7c42708ba30bba3e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bg/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5bb8489017dbf8a66aeae34299257afd9849337ab94de9d840db7d408bfefce3959ef08fff6eb2f5f8b3b5878c451b32d9b1ac9b46769149b8dbabeef1b38352";
+      sha512 = "b712fdfa9643d00cf44129ec7d0f718ebb46e48fb568d70989b5c094f1a7c231247672620955f397b94e7de0aaa74893780155901cc1c4e26ba4ab9646b566e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "fc3633d0b2668687410a0163e51eccc67ded362e5e588d53ab2d3ecc804d2e8467a6e935d1eaa696eda720079a82a3c63913803787e33d2b93016d1125f52ae5";
+      sha512 = "9a41d3c3647f3c7c0f5d329edf70693f63835a5dfaf67df08d7937a2efdc89b4cae263e4447ea09e05453be4a3ca658a965f3aafe432cad86ce9ce754c4e5813";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/br/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "5e310958d3cabb6911cdcb5403d377baa011be673f3e69a55f4269ad427fd33e13a2b2c674e0bd221589feaeb26b91ac98d7cb9c1d5f718bd7a83c5779ad9e9e";
+      sha512 = "8c3ee20552f7c85723cb8489cea7f64821619a09deaffba94f42c1b29c55894e40720cb3997791c10baf27c99ea11976741c30286e417b207ec620a3dee4c771";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "0803e0f91a6696b643e73ea0fddc2e58867a3ad1ef909a8f19aa03aedfb2dc6197dcfab8bd14d0472783d10880e1e23f19720192fc22ad42fac00dc02e4edf0f";
+      sha512 = "348c1e68f57f2a09c134452aa110b39cd638d97bb0b8adaef7f57210c9d95e3a8a6732e72a437219e517799835c4d1d6332af54706239bc604f57e166d859898";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ca/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "ee6cb26b32ac4a103736432007bb48f41167d52ef89ab27fd2c9764aea4370eb65d88b54a06c37730c3c4c823b02b2519109d9a71d096c9a68a82e86305a01f9";
+      sha512 = "4630f3edb4f435dd169335c67477ceb6e42f2d8161dd9559ff58525fc117f7cbf45da534de6e160bf824b3b4b41ded3d3dcac2782f2a208ab7d0e014b4ba40ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cak/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a5547de0ea1ac5c39aa97550159e82c6595241f6079a86bf832c798e3b4f215a6869c1e43e9ab0e1f0d9ddd54133ebc6b0fcd20bad39f5fae9d30ff641c5397d";
+      sha512 = "2cae224ee70259a60c0868b83ba933eb43867ca0345bc0fea9693dc3ddcd9130d7325ba953d729778e7ed0eae334b200abd11dc1e903183514c11475e0a61269";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b4ae0ce992a4aeb6d16ce6f56ce81887557c95bbaa70636e1074c9d3e2766400413cdcc36c0a5994209dad20dba9a6cebe55011eca9295203aeef0a13b74493c";
+      sha512 = "434ef8593e4771c00b772ef3be672fa82d1084431882a6b95011cdaaa04035d08bb1927ec0eafe51d44e7028e2038f798073c5287335300989866ee7f7347ed6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cy/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "d1bb65cbeac9c4bb7071a5963cf622d36792b9ca436b89e0d3f6bce3e718c2e6365364d876379ed5cff908a38565f593af236341b9712d54818f1c359a55cf57";
+      sha512 = "e26e3a3e571efa96d03169f17bb7e0920b2ba160830440ed924b6b60c244d31297bfc72d810292e07b9abeee9cb4843f0c2369192b827362fd65bb3f9da4c577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/da/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "a9b46e51ee7e941414cf6ccc3d9b531ec5e621966515d66f7b0673a7b2be548e8cdc7f783ce0a756e4b50ce2d4b17dcc0dcbdb8c07c97d8ad70a44264155cd69";
+      sha512 = "4cac02fcb2efbe5736e52232b2cc6225572f9fa2518129d501b7d86d782177b4581d9d0ccd5d90131a1e2d676dc43ce9d0841f036701cbc543d379a24ac11fbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/de/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "f591e1ffc684f428fbae4b94ce1086a27c9ecea4e9528c18e6dfa8af2a967ff8bfe374984390a6808c2bad656e13adc7cafbb76c862a16f77804d1b4fdfcd29c";
+      sha512 = "b8279a32bd29f70e9470707c9d8843a39c9c7e95c1b732944bdcdcb1fc383d33881ab40f2d00ea36bf01ab7501a77e754dbd2230187fbb2eb0b324cc155a4412";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/dsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9947092a150bbef82391521ef36dccdcdef9eafe5b5282af5f34d28fc0dd6d173e146ad9ac7f7ee10ca02e4a5ce5099f29939852565c3cac95507f33a8f23e1c";
+      sha512 = "761e8e0c9414a8a72fac258d52729ad4dab8376e249218ec49ceb47311bd798346b57902671ec394f1ef2c15b641c47f9741e67c76f54684fe4639b609e1700f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/el/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "a806b3ec254afe96748abf2f9c970e5e5b2ffcb7f7c70e1c4c0c92ed60d493da5cc6b22a5bf78aa1de8c36f5108e4283ed67285d53ebd737d86950c18cce66d7";
+      sha512 = "ed8d934d5c7c3bbc1126f04de045cd5f0ed9a529a8d4f207ff115c2e8dd4e152c801e5a4aa0b37fc10dd8fd1f1e363b78f21b4930d49e25649264b751c1260ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-CA/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "b3967481f6e7f4e03ab431d8e76ab8bbab286da468897e75a6dceb6ab735f36122ea4ce85867113143019d3750262f705d1f64d59669ee590bf08db409788c09";
+      sha512 = "60689489f53a863d55cfbef67499220efb00aee32ee6ea7054f41f14df43c1b787a04ea374e0ab950dba2110b2728b980fdc46f97136614ef8b97eee210eb58c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-GB/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "7c68680326ecd1d0e7bbd2ccc90d36623434e8019c5bc0968227e15af92b1f07f65767fb2c78a5051538fe79a17bb485b3b697774d938fe3ca876ae3a2e728e8";
+      sha512 = "c3e10c0f0922e4bab3558cbb6be106278fa782b50a0fa5e38db6adf7ff60e88717af15437e48ea23b15762424d89a94361663dda8e02d6fdf9d6c19a5afc90a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-US/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "5cab4ea7a8d3a72e6fe1535b21f1b48c2adb183764b71fb230d051b2112ad2466672046faf6b0feffd4b93dd727ac6c824ff420e37901b6e00b6a32b91c830c3";
+      sha512 = "135e4b561e311d6132164808272bd689b486b840d652ae0ea4ce9a7096472836fe798309d0feafc1ab8cfb32b2c72b396a63734b4795e591863a5c89bd49802c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/eo/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ac913d42212452ce632c86debe61a27d46f682d3fe1c41c61724cb0aaa5ba3b2f63867d0addac46fa3f71d42282dbe3a3e5600990a1dfe611979fafb1c98f4a7";
+      sha512 = "8991bccfb8cf10e0df6a2288968b334edd0b71a4030c0e008daf124b6e5256d73dbf5b5b376570852a0fa338570a9d286f24ef63dcf039842cd0fb1eb5901695";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-AR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "fd003ca892cb26d56f6a3e5553a108c29180310203d095e8cd428a2bf499908c24f8e55077ba443bf9dea6188025e82bb18ebd86fb06e59d3abe83bd1fb23171";
+      sha512 = "57a8275cf23e29a9a425ce23ef3bc787596df0dda95d5dbb2673bd658ad0bdcae3fa554cf51899d5a2719ebc218b70bda176c3467a01a7a4da7a60678f668101";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-CL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "d5144d975a73ab85cef8e271d78f408c7f4f72db7df29c4a7b756fb6134a2a0dec9eb77472f2c980c2e290cea6d59ac9f599e4e946844c0fa0054f79fb201fb2";
+      sha512 = "2528855037d5a843895c639cb0d2b353784e59dc2103c4175e085f216d490ea037bf440bf4bbf926301143079a2885040c294c77b10f032135fe070b20e99371";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-ES/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "586ef6cff55662f1287cd5ab7926e9f269f8e337432d3708f66e660aad348b88cfa5ca28579c703892695091501cdcda0df18553bfd16ee13c06b26de5581d97";
+      sha512 = "4c5c6cbd1fa3680489bf6324e975bcea43429f7b55be853d2523daa45adf1f22772d0427f9df005c7e3c22543830473df82d4da818aff2ff72c96902d0b72e5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-MX/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "1a5e2bb5f11d289846214261703fb1b953fbfcf5dde959ef769cb03286bac9a9ef93866000b00828b49c79e4db9aa620327b4f77c3a44f7ccad158a66600cdc3";
+      sha512 = "e2400bb17d7df8b0541de8c391b28d2b5e7ee9523dc73d90e9d10ec578b3acb58051c6bb510b18c076b7dad8a4b4a7ddb605db3af318022c369ea78cccf3c441";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/et/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6542fbd6db3f5b41a878ad1172da004407a733c7b6cc19688c1377c24ce5c13ad8e6972d54e02acede345ce948c34b6c164589d452295c0be723145615d2743b";
+      sha512 = "ebb2bcc463312c187d2c5119c4e0e5580a78477be61b76a028a28791398311e0fde3ddcda039397c9d63f8658ceb7490b62fb6e69eeed34c204e60b6867b216d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/eu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "bfce7ce5f0cd03a065ec995f9bbde6a797741b1e9fdb9d7ccc334a8e84deed04dac62e344a05f1ba29f8a9487866520821eb8da02915e2921d0dcaad0922924d";
+      sha512 = "8c3796a5189f40324b2227750ea72b09397df750a154e1056a8bf9b7933a8ad6935a64be569641bd391fdaeb9d10cdd330c0ad031ea012e9a64848d8a034c650";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fa/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "e0e0ef6054925fa5e8987ea9f802311ac80d0290107bc7cbbf8141ae6bd191928cd12a17331edff49ac59673a8ddbe5b35fef6308957e57d6204350ed13b5e97";
+      sha512 = "239371297c2524142842dd18b9de92c8b93b7fff82c045599d19effad81344703c65cf77e1db4c665de2b565cfe5ae7ec8a7589b68ab25b5ff0e6ea90b7c4cad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ff/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "e224b2d00f272c997ea127f4664e958ae7a7e795965a07beb4ae082549e2f7a866eb5489a7e82240c00fd9f21223d82fbca0f3b708b9c632a98187896c6f1424";
+      sha512 = "064babe379e9753394acfda8e1a9ccebbf1b980ceca6d0898e897b5ce91d06c74fe525c5c2ac34d9527c55acffac5f70a88ee5742ab363e3f0855d5d851bf56e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "294d654921278d359cf174e28c9cc6cfab1800caf42beee733621ecf3f6b27add20e036b6fc7f7f6fbc6a14acc2ee47865d28f14999e88fa91b5da5248282f8b";
+      sha512 = "411501345e1f1f9bff9d03f2e97e756d750cce3fc753be5572016de12bf18c1b6be716f39b0db87ebaeed6bc300264eef9d1624d82fd289767ac32c2765cc44c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "c855b9c5880229379823d5a3486f588cafd654f75cd60ee741e3b1cc3cf84acb200f0a62f7c17d2eea68ff65df83a6b4789b11f027f56d166b05cc45d700ea71";
+      sha512 = "9bd4161f31256e12ece7d5cc28eb78dc0bf2249a6643d6d962524582b10a520ce3dbb578fbee803f9f2fc301bd57adebb7fd6f9d3f83fa7c7fbb30b7e16960f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fy-NL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "f0086a1455b5f6b0ba116fec9dc3aad31f0165edec2d8ae84258d624142ca1651dd30a8d4d4ccd7441a81b9def479836643ad9ee753eab125d70932c097c1cd9";
+      sha512 = "d14d82ba14694de463c45aa32ab5782643233c12591a1c48732067a4366f22467e4c31d231164750722f2b6f6b61b2a8a2378e866b55de706ba83052cefeb24d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ga-IE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "3488aa241d4eb1af1ae759ee1576fc22e44ba23730b24c78018d5e975b236206d19a1724bcb1b9c28bc3635f3a024f55fc5ddc8211d8803f3a6957e0c3c05011";
+      sha512 = "1fc14f670747b47d6b784e7a4f1875c90cf566009f084e5923af853f4c46686cdd0d66eebf410a4d9f024b260af57151d281014303ce93226b95c20bf41d1944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gd/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "703b0c668354a90ec5960bd529dd017d5fdb5c014ea9b59b4f8491cdb6612421c22c5e14083074e6d17ad5f4293c7cf5db789ba86cd3ad27997619e6cc95aec2";
+      sha512 = "60bbe1d315958353d50dac327a358a3c1b52f5f93ea93262d640d91cf85207f47fc34fbf689c9efb60ff63b8cb8d7e991cd7edc8effe2277c8b70bf026d36608";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "0412e4011dcda241839eddb2ecff5b3e67399891d8ad3caf5538ed7cacee3fd0e5e5dcdec97b6afa92e50e492c4c3b3fb5169aa4f167f4cca58e2adc8d081b3e";
+      sha512 = "dc13fa5d442188edc445c0a32e0dfe96d6320cddf6369c6a70af52f77ea375d98b596655cea8df02c81c7db4a8fec9ea9e48cef7579665e7c4ef89eef9022dd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "693aa9153aa73a92b00a56aa331c05f0a09a2c4ef8315cae07a158ae709d9182a07f36722fe2dbf52959fba75cc8494ee81e71a58b69d6a6da8c638381fc746a";
+      sha512 = "23c145e14f86300430479ab5253c854921672341b3ab0c5748bbfb1d7f4553a22f7e7c76ab3d48eb8110c9a69caa337cfb0c4cb66b53b3a267cb077375449897";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gu-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "df97e1a087a21d7e8f478a50f8993b34d82f3305b3eab3caccfc72927ca9b6f03e431f9b63aef6d044eb1905f1df1fc81c9cd4bfbca4c67a1d2f92d302ca3e20";
+      sha512 = "8738fe7c58893724e6a2a5b46dd888823fa0e1621639341b36b120913f28626f9ecc71e7ae54d16704a411f9c58908ff4ac7f77c8c4622f4278969ac7fe665af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/he/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "aa41c1dff2c5e2f8db9557f1632c1cc0739bc02c606775b602ceef7ea2f9f560bdaeaf3785654aca205c5dc6357c29c7292b1fe756ac8fa0ac2d1d01c15663ce";
+      sha512 = "09fc26d62b294e76662e005980cf54bdef3f5d0b38ac83da3fad4b85bcc0bd614651249caa4a37bf681a7f1ff03470e79980216f24d396833fcefc808ceac4bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hi-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "53e4d3fc6741dfe72486ed2ca69ec673419d1d6c518de7cf494a7c8c1165a08f6a6113c5c1c7c86b7cc7b2c6e3413eaa790f26397e28dfa86d69bf91120ba02c";
+      sha512 = "a51273d8cd8f4ecc4d7e5140daec8d834dbfc76567a62d92ac5a469da733a6231fc6c91e5182bafade141366936080499c51f6fdf6d61f023292c0fdda186507";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "3c3ea9b770da15c1424a05aff6c87f5699269831c51bbe846caafceeb0a2401201f01cdf4d9cd37b84582b6864a9e53655bbd0f42ad19cb669ca8c28c73a18c8";
+      sha512 = "19947b47816f7172ce94fc1a91516520fad41fc09fb8d5c25828ceabadd8506a2d5dcc6f1e1f32c43c7afff48066bf5729ff9c831dd5f3dfe1e509a3874c4965";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b1c2285b03472cdf88ac85ea1b623a60d976fef85863e5614c561fcf7e9fa05ddfdbeecb929e01d5508106d51ed2c0c24400b6447bbc357be147e950f0d64339";
+      sha512 = "1eea8f2b9904f4dfebb08c718df271adf3bbc9b7eda5d0109e3cc5e34aae7688e1e81769b9bae51c8252b3d69aa52a9b740e242137675015973fe2310dd4b92a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5a5bb5c7b68af0faa608a9ea8af8cdb0bf8740e77766bfac26cfe25963e6fc8492a88e171e6299cc7c022e2f3d04eaa22df10acfcfd82b42c72bec28466fe449";
+      sha512 = "098bdd04332e0cf675e3cfacaace38a40920fa58660098e27483555ed5f55b06f9dc8e64b38a6bc6729d7e2ba39faff02a7f90cb0286470bbae26ea523ec5fe9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hy-AM/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "8a3f3d775bb16ca99a58ac819efbf256fc17acc542f7cfc227806b96bdf24ea6ad737a4b749134e00989b7777cb35000dd6b2d78085ed0be3dbe8065f174171b";
+      sha512 = "3228e47d2e168b9b93bb96631345a41a0130eba87ff03f8b57c0a71377f011b208037df5f03936e9d8543d994872bca26a78ed19f12a52c723063775f76d306b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ia/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "7abc1b715852d94a9b5e8e02b7f235d30d0222a297808dc6cc24f9567fccc3478b8c689e133e0595c5c236b0437a6a546776898a683c34cdcab4707968757c68";
+      sha512 = "7fc1f0b3d8a4957d04080de201430af03db69a56082b8dfc07ff6992b10e0c357693aef3e6f1231eb3d3bf135218f6e77e79e000f329da7c8cf9b144108c1248";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/id/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "23ad16f9e5d7ffbaf4ee487c75facf91b0a4fce7ce001e67890f87ac805c8f9f54aa6dfb662bcf3a7536d6fbf1eedc5f393ca6382b89039a1b1945f6544216b8";
+      sha512 = "740baef5685aec6ce47740e925f0f764dfaac1a736a634c119bf012bec24e7872238cd128d19f2f1d59e8452f54e95a9c10816748b4ddd8b7e469f8bf1568082";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/is/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "567af9d4865c9796dd8c7c2c1b564c897c35b387a7da28ff68d45b6a1a0258121a8ea432e6972e7f47d32c64c3bcc99d16f43547afc8faba21512a64e0191d3a";
+      sha512 = "10566dd3e42d4499dd82900e160933f0d66773576341ff7d39ab6d1bcef2188a291856d9f3854f87f2086df77b914f9c30893446f4ae0f580d07613ce6ec31cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/it/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "bf6272b515b54020cc3301136eb134b9ba3943d5b6c97aa7ad92d7b429d69fbaf2abd2af52bf5d111185f0f62cd174a52d89197ba6e22dc7d3a4338acdd737cc";
+      sha512 = "67e67041f213108d6fc2fa6fc5144fa20c8de19237669949a0be8786885c054710a5971bb826127c75facf65fb5a5175a349d60e4fa7d0f3e016eb48f434068f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ja/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "e60909c2e80c5351f6ca6f00452eef4069b08ddac80aa4d0c2e2dedb2f6a8965fb04e94f0334aae9c8fabf7d611579357251e5931e4cedb5edbff32a6e735539";
+      sha512 = "24da0b3cb0f81b593563dc3eda3bf3559357d2f3f1b9019772850bc49f410ef4a12800e0a54edfc888c810083f43d74757359c82438498fe20853435bb7cc066";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ka/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "a3f6f68b741f8260adbfdde61fdf6e216c482303f7f10c46355d020db98cc9cc818dec959997384339c1051a5a7eb79371412dbbfbc416ada3c4d291fac70d8e";
+      sha512 = "9212744cec092fcf7440258f2d6c07f680b6b89bb73e804cca0323d4d86b4d1c7ad6bf2c24ae6cade056d9fd742fea5220847bd17203d319ef87d1d015af9179";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kab/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "ea01ec4928bbc83cc3801fb166062b5875a039046f80337efb62369ae93fa38e0dc9f8170dcaa9699f98557f9cda1b01d007b720f47157f2217c936481645fb9";
+      sha512 = "dc48121c91f66d5c33c7afeec4218861cd8dc0aef232a4940048724541269a22ecf21645f032a51289cb5f362dda8b8073084de152337cefe21c3e4c97d0744f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "551281239137022acba3426f790369bcce3d8372afd6bf62f4077fcf640222906461527fc7c339d7a2355a36278007180742af74ec0d27b64b25554057562015";
+      sha512 = "c64ae21572eddf9b97b0fd3c97d0927229c54f42af3fb65bb3a8e579064937b76f4e3ac32ce3debe24537dfc5d6aaf3615f1aec7289e62a043b1aac7b2df653b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/km/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "9e3ef62fb17222b701e3f348fa5d48395a1294f762670b214052d0434865c7b10af3550ceb384437009a940241c4851e7dc57ddbd8a745a7b3e4fa3dceb6c346";
+      sha512 = "8348b595287e8b22ffaa78d50bda5550ae027659f91c83317f2307e180d8aca29b8e58ac0b39787e7abdbd66ca88cf44fd937a6eea2064fa8df9173ac9978898";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "654e866b0f4ed8f2c1582ca229e13f4ae3c5db02849e28bcf25993c4154ee436429e16d265be68c08fc1b328ce5f349b13795f9fa1794346679ffad057f4517e";
+      sha512 = "f7a2d48278c9c2da883f889c89ab83778b2d9a43a32ce6186d7b7c5428a62138689cdc3182fd851da4b992b51902352f0e28c3cf7c9bd9c014712206f4c21c11";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ko/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "2cd646fc7261ac381a7132b881ae5bc02e351797a5218f4ce4c227dbf55240fec4cb4351d6302c79365376cb8c0b2b1d5b2c331efe0a80bd36b6d786178598b7";
+      sha512 = "ef00c8295bb7598e0fd9a9023c4c404759e41436685c23ef0ae9c756bdd12e1cf34ae6cec4d5327807797128a3f54f105804445b11b03317ffa0e2495e262442";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lij/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "22a5705ee4868520fd2e3148a9327777fdf5d87f459c565a88f266cd0bc0347452dfd7c06c784c6f3428dbfb0f682ec50fc080aa17b4c798455c5f9fb417e59f";
+      sha512 = "a7927a14c82f8f095e36e5c1440e8e95bbd8906bb2945c0f8b6363b93290d9e3195c15a48d0a3e6ee9da44ff050c016e2ee7118f1e1f2c14bc234efa450fba4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lt/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "b420dba741661ee320a0556edf98617f42a9c8bf3759dd13041b8fdf05e82145f1c4d2b59521719124290918fab53dc2182a123e3f1aaf1ab83cb7d187866f1e";
+      sha512 = "0b382fe2188a0251cd0f45a4ca6b9e1e057249e01fbb2fbe76a34035fae4fd704f1eaeb75319acc75df1a94ece00d956b5886f07a0f5a21a5e00a6acdbd8f830";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lv/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "3ab942e922592771b1c02e93b110e8a757c8bca9061654110d08a2181221d3697a2d385fce484e108bdd44eae4d69043aa02c3781deb297674c2671a87caf874";
+      sha512 = "68cc69b2e070219bbd23322480cf232bce9daac37afa9b7a8cd4d8f512d82ac170cc3926a0245218b6bce0994aacc54d8f3dcb9ea0a7941e9bc3b707787ad04b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/mk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "f595c839941e6b02a6e312842a0a6effe80acb81d69445b5d3a3ccf559c953de20266343362b87480eaee809c5baf9455f30ecfbd7a148b5a7e753e421b97c97";
+      sha512 = "91fe3a635b0cbc401d5293c04da69dc3a59aafa062be8376e559858dbe9aaca49ba3826fb7486e8f12ebc582bc96a83268ed480b95324e008c77270dcf813f18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/mr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "5e7d0ddbc640ba9e9f31c5754842bcaef5d90501f208a387daf5935a9be9d97ff340bb551c7fc5dd9fef9da7877fd3e6558fec5dec9e0eebf0d7ac5a367aed8f";
+      sha512 = "8315f540933ef132f30ef28c744fba49b30fc4152d2929a7ed673939da5dc1c4de490bccca83a33dda2ebcf27624ad1892e93756555ee2da8395039ce76a5d38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ms/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "7c9c34344989bc919b842dbd02c674fcfd18f1357794a91500f237dd7eb58014e135d4124533726a92db69fc6e69b40d6b1e3bea425a9de649b71134e70d16e3";
+      sha512 = "fa8272b4bc3d1a6a032c987331bafeee26b7f0881a75ba1b788171441a35e1ca95bf9dff46c529eb926dc867b524590ecb3262f2de04c0fcd8ecfad806955a6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/my/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "30e13316e102d857b0a2c257910443cd38cac26b0d6b40e9b352a7c6800dd2890231084b04a9ee32f6eb1bb92a811d5cf54a4c4c19f8edf263d5a890d614953d";
+      sha512 = "b46e40abb59f4157800ebfa9e79a5aaf968fba405a77dc1c7360965d5d690139d8ce1f5735e6349a198c2cedb0a1fc90d3cdaa2d414e0800a7130de8c45753c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nb-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "c9550a3c280670f8753dbd308737155f34af95e9622dc0201d96d1a1ca6e326797e6f0c9889893c34dd43daed6f6e6bafcd0b8ce2fabef31dea30bc6804dc95e";
+      sha512 = "469a56fd2380f457bc84cb2fc96fa580ad0e7150042b6b9e0ebb27b29f315f34f8c2e2caf42284cc184531e392632eb52773be0d080f32281c540d81f3b63752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ne-NP/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "82bcd5dbb7e227860e0ac8caacd47a1cc32f1e99664e82e642612c5fbcb7906faa5c853dfa1fc347c4da200064ffdce455935f48d524d0a4c27121d58c1f4bdd";
+      sha512 = "88540a7aaa06488b3252e898cf654fe1031921e27e98525dfb5f44f770d60b43b5fd5450e5321b27b31e73e663b14fe98716f25b7db5b4acceaa7bee55f4cf79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "9760b1e715752ca64e539570c032ed31c45d336540001dc1b7505c082f2f048b52038c5bdb03138e5e7ce291ff5314909e438974dfc848b66fe864fa9d5e5ac2";
+      sha512 = "5fccf7ad91b99aefce329b515bbe5096141618a96469912fd32f621c98be17acfe579cf03137d96cdf8d8319c4ed3d4b28e8bbe1ec2f3251b8c004e19b14b1c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nn-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "b1712c4d0e87c77a21f1da15ac86407c4e27a8c1a7ad7882e08fd93f6ff24c029181dc14263fde6f27329ea80e3eaab8023d31fa63c90cc4aa7d5f4a43692f17";
+      sha512 = "7d9faba6bb18f19d9acab0c63bc4ffcbdf8eecdbe345943674ff2ac9545d24efae2cfeaeb34ddc8e6f24bdace18d6a6ad77d2ccda7518063ee1cea2e66382a8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/oc/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "49b2a7299c9c884d3180513b4e8f325a610c839cca52e8a1b9862a0e759112f1490ce109a7c7fc08aac289adcb73176183d1ff693720737fcfc80296e662ccd6";
+      sha512 = "fc14d0fa30457836c0b41950df190f931c6c011a569f9160083665deddb33b6947d92485ed1e2c3adbad6a9bf51480d64c108de79a39889a87059020d0748f51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pa-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a1cb0f0a3502481a5f88cad6bafb82fa177936db8cbd534be954a15bb185d181d0959abb5b2090de6225bb14741971662aa58a3b362a26b27e2b6f805764c2fe";
+      sha512 = "641580dc6260a863ee948e2fe7a814e7aee991efe556ca60cc6ff0074ffab369ca9dda05d9c3028ee22d000bb7cf5264dc56cec844f917039a7e2193b2709142";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f7207b2839d9c948ea15d9063fac22f16824072a4a102bfc41a7e31962f79bb60fea5de01f0c780942f33ad7066ae7ca1b7a03a7be13a195753b1db3ddba659a";
+      sha512 = "467b4c1f71cf5732834ec482f0ee1afb3d047b4a25c6a38928fd9199fed3598e94eb34ee3da7d552e3135a054d13423d94dabb430b19d00f73d0c99d6ea1df8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pt-BR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "eefb516a3322efd51b046838a86ddbec5e65a87326f3474876f6e42cfd8bb138d2c5bef32e9a2fccff61c01307c39e7611a83acd40a9e9ddbecc473d4b506ede";
+      sha512 = "af6e8ea04434f992a88c8a2fde33274776841bba274b0249b21f3ada6d991fdeff53a5499e0c92ec54e4f1acbd52b5d8226af89cab7641062d73cddfa56602f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pt-PT/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "92f417c004802c422474feb25b69cb6530df5c34f36e1a1a2feb62e87d8202618ad033ccac40465e903d9c85bfa7cf30ca87335e082af6518d6cb114bedc4cff";
+      sha512 = "238852418c739d91ee6213da7c3fb9be47ca2c2f1ef13e459ebd7219814c6052147a9b8c37aa2f09155a15c84f281c20a6f23b53acbcb20ccc92392347970816";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/rm/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "04703dda30160f844f8c1475caebd9f604cbbf05f522fbe1aaf841d4a335e295372a4f26c2d07ef24fe07358699450ea13260de1c97e49797f745a484ba11226";
+      sha512 = "13f001cc46a461176557a14de16303976f6f6cb91f778d6c9f1bb6f4973f2ef939635c28c64eac24ab2318abc558dd8b7b1b71e3ce71d5422c13fa0508900c49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ro/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "c4f5a4a4fd04f2536f3bfa303a05bf78c78c0b7b22f4f1d975baf3fb46cd9f7562db151e7c321e4260dcb2efd9bf81e751a6e2ceaff0e3289c5e54932973cff2";
+      sha512 = "2f454799772e92899a138a32702200c8a261e653fb0a9b588e312091e5acef92362eeeb18bc26ac62e6ca093f1ed07e7839010d07396754114a0b989d5aaec07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ru/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "f2bfeb0c11cac02047c2bc4d29135cf56a4d67eeae45bbce6394a0b496c62fff54b270f23024031c5770cbaedaf8ea95e806effaa0d026434358e5a593c1b4f1";
+      sha512 = "efe333e4abddf173a87bce8e3b82a5112a2d36f5ae690c5ad09ae668804ab3dc67a6ca3fc4d1fd49ad9591a482a5e617e4f897aa6ef59638920cd97e863d8a92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/si/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f5c50ad106a1c9e4c0182c62c23ca088209fee9b5856aa77d399ace75c3800746c9c79e028dfdadb6094aabc680c129c7510d26d7f258a9c9409630081acbec4";
+      sha512 = "245531ae683a796db5628becba71ba68e389d8d9646dd678a08327e41c66d2f1baf9ba223ac70d19eb110d56cb932238d1642ab129989067f4e9fe87b8d73f19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "d251454b2078ae1b6ccb5252a9b88a057ae94f747e207832e3e955c15d9a2b17c5cc203cd5fe7c2ec56e1a326d1758c8012948a42f4c9d7cc5ef2c84fdc2f4df";
+      sha512 = "633c280502541f20572aaff136e0e7a2f4ca2bd2bf8c286703688ebd1fcb4516933ad46761b9bf90da033b4085985ca96e3224e8fd30d6b22bc2d531ec9195e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "a99e992d5b71a22e5e9ca260b0c45942156474ff48da53b5cc02785dd84dbcc381b94e8b2d44d4568656c588c65a49e75c2d8c6257107e345f867df33a3c8c3f";
+      sha512 = "0fcfb99cfc7be32f2ee53ec3d5d3cc436c6d423c3570e5d2564bd9e662d2e1b13339e1e63a702943b54de4374c756fcae5c6ffeefb5d63a962b5e16ce69d222b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/son/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "3669abce71819235bd489ab54e96107508b8c75ed3c29d010e36033c9ec4e6d2a440e1ab41f212d52436129c7d29209223c5cb8bf7a855bc5c0ebbe4e71edb5b";
+      sha512 = "da0321adc6aab116cdfbe1a9e67bca1e4eead2612827c783225badeec0c25af867cad573b16d4c9e052c325e922c1cfdac506fe77e707a7e554bb2268380ad15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sq/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "2f0ac03412be6e5010ad0647c4be28c9edc547ad73baa509bbfc7fdeb478c9c0ad87ef6698fb0d6a60718109a57f5ab58b0ea16a997258c01dfd463ff5cf09b6";
+      sha512 = "d3f30a04a94669b0a4cc2f0067b6f15431de64a8e27d66f700274f498f4a19121fb3008a23e14c8e6949f9c261bcd4669a0afc613d4c7dc08b3075cbbb61dc79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "43c708b130e0319e9fe2ae2fa2162aa1caabb3b41856fba34bf0ca1c2e77da6cac5f7c5fa3e8d07c0480634aa04a38b2a5db07433513710e7b04398e9a3360e1";
+      sha512 = "3c85221edfabe9cfc95a8d73a7435e8a4273293a4ed79d925059f12f7cff87bcdbf6b48779377bbf828fe3cd2ec841c3e0720d69c6c97b5727c27b2d3a08d42c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sv-SE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "1914a95197db1796ca17e8d8a511ef687329ffbdfcb0dddffc4e1963c1251519b0c120340f730a04171be57f353f5c29e7f3a9c1a7b8c92488a3aeff9bd58d55";
+      sha512 = "b88eb668b293a98f17956fcd48af915ac077c3f5c2fa0dad895fa4c05c577f0c56fae5ed2b4eba22518c979ba6af768ed92d8ddbd17e49a96388f36155388e98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ta/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "af327044ee1c8738f5e65a231af3e0ef74e82491b62445e5a9fd2bea7ed4a05451e46d2cb572b95d025c18616ffa662c3668ab6b1770abba124b976050db9e2b";
+      sha512 = "b70452ca9eaaca80a4cba956037e67e236d1663a6a009193a4e78f80bc77f5d2fe77ee385ce6ec27d1356cddd59017741aaa9f78f6c25e2b706064b0e22aeeb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/te/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "51f7975194f153c708e2275992daae1b4435a2e8f159ec344585a9ad759719716fd6d8a1ac10a03dd452faf5a960df2a1b580b74e83df6673a87b562ba6308a8";
+      sha512 = "57e762c6ca3f3c9ea6c6b0088971ff8800203d38ca90bf65801a3d4f84f44e836d7454051e609f3b7bb4a851ba5c57a57d9781b81b872209bca2df3ee23283c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/th/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "02b651d278898a400474ac59f5def40eedd8c2502d13882e3309256780be13dce4374c75f68d98db3a7555451a5b7d2baf5a7add1733e359ad30fcd4122e0a44";
+      sha512 = "4cd5b8a3b6d77f6e3653a4f9a1eaf36a93416f5c0e89c39c97863304227ff33363853d27174a90bc9d5e54c4b7d3c72b3adf2a09b2485655d1d24f7bab96f7a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/tr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "bf1e0b7170a86a058f117dc10f8b3f23139a7f7f1b93ccc91619590b9b1fac56f525f5924d6ab331cfec1e0e2b48bbb88b78ba184f7a88cdb2d9fb8d78753979";
+      sha512 = "1f697f15c169a0ed5595699a20d37a3d6034d4ea2df2aa02dda2dc73b3fc91c07d8c344bfdffac5a4a6c4a44f016c9246dae1169c4ff7fdacfdf9d5093a4e353";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/uk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "aa043dd41d2a3b7e670ac81cc0da3aadb1a461fc6957ce40b53e2f2b37de98a5e04146010f49b6d3a63136efe490bfbbfe4676ea353a161e18f009ac5b760e6d";
+      sha512 = "cc6c67520fa96593cdad128612a291e8b6c78914ddeb7088036743173b99dd3dd94a4670ce9e38e265591e1da95845f448e22eb8f0074877863dbf748f9967dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ur/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "e97b0758d937d9fe31888d4f1c12ce090017a2b9457005d5bebb4eb5b384adc570bf79f7574bf5eb292081763179c16e98d7bb54acdb5f8e494930cb58388035";
+      sha512 = "e22efcb9c9b36059209d40f1bf34bd65307b1319cb6c51a12c99684847228bc8cc139ee0ba7888e87042ac2b5866717e661b4f4e2bbd30f46dad6f18ab5c7df8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/uz/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "0207ed27cd8507fcc35d18602ea45c0a69384800563d5fbb5e11dc02565912fabfd3343910e7ccd5e4b8270f39498886aa9b42a7ff0b46452c5057c4c4388889";
+      sha512 = "e27b755d4af110b3751de25925e95eda62037cdf8236db7587aa47aef099a055b5ddf1bf08f031ffa9c79142ecef49f2045751bb41c18d9fef9e0a2734440612";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/vi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "aa6dc56a32f74543d8b2a382cfd5284a977f1242cb54292f09a46d5a2a7ae7d38b74457a7412355e09f5950d82f095ae3ae0fc4a978511a396524e3e0798e281";
+      sha512 = "33617c205dfc61511df43de79c29ae8bae059e6d0d3bdc868a6965e98822efefa832d6f1ff514676f3531d4b5c89d8fac4da780b85151b05e2e05dd41ada3f1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/xh/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "ac3495cc44f55a5b67cd7f63859349e1433dc6977599a4e2e5195e6920f320732d4f0fe1bb59d4f6124887ae30dce695a120c2427f8b6e6dc5ae33f0ac3f8c39";
+      sha512 = "76ce282b86372019e4467d66ad1025ca6641cd8c5f4bce509def9aedcfc028b491f86cd5149a0496d08d55711578356c21ccdef786f910afe9b8ffa26c2c4c8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/zh-CN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "de166a41754eddc1a6b230b72a649c14c7b0a814c4d72d96c916404cc0330e97a1bff136a618e7dde7069d6d7da9419bd0fa74c005319b3150f0a79cddb73568";
+      sha512 = "1ccf7de81d4dbd19a9499cdfb3f286f86dee4451c5bbc5ce0bfb85d184b351e45b0d9289b609d3eca60ea32a45cbaf2160664511443a6c0d13d144945606ef26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/zh-TW/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "a37b6e0089130c2f9b8b7d45aa09ed3670fe5f35775aa0c4e99b662dcc7f72f7fc20cf97487f1cd154614ef5bb55ce7d911851a0f0c2813f03a82e3f71390701";
+      sha512 = "f645642c10edc2d36bd97bbf1b950710d1b52770717be35fe58b081604a4dba55b5dc417f1553cc6574826ebe7bc3435f0904754f5551f98f93d61023ca2de01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ach/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "788c3814b6d661faf392d9d16ec8c6d709c9d97f21dd5004f3dccab3d776a3394ff5a5b397069b679dd6f41493dbc284502ebb4eaceafcb7ec7064f28ae816e3";
+      sha512 = "58b0df5500016a4c87a60233c8ef2d479937ec002b10ae53ee973b997c8911dcaa77470c8f0e6e3667cad5f2e4f11006a767040b0ffbc33d04b8a937087e9994";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/af/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "9937eeed4840806481a4705235d1316dc7e1330a2046570ff781097ebea5ba4f1f3462c458c90fad163bdaca0226eee541e7475916323ae25b4f554f4bef828a";
+      sha512 = "a9d47c62679e0c24a759812b6b194ae890e4cea6bbca683eb55f016a81eb05c207fef6f61f2ebc6c8f85cfb25d5f71f62b70502355435913094dfcadde81aba6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/an/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "ed447fd2e4391f82ad2d37453429873170a7277ec9fc3ba935dd55d0529b5208a905bf2852758ed23043ca0f63eedf709596f9aef97d1047960951a9cbfca2c8";
+      sha512 = "7b8fb37c1b458c9d04d45b69e3dcd054b14cf6f9bb3faa4c9bb978033e8e7fb67724ed8dfe1bce39b4821d669f9289e7ec3367a826f67ff9be81cbe37267cdf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ar/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a0ac8fb8b489361eb48cf26d0e9b3b9513cc3f76e38dbe23e44399a3c65c68d8094631656373bac46430572dff54c324a322c3ac6eec3419af2ecd273b7f3e38";
+      sha512 = "5ab368033e7281d7bdfc7d27b95cc7d28e8c5528e75ecb49e0b68fbbc02d2e3ff15e5c6c3218e3dd339ab2ea1531e47ecb888f7e379881d953667ebe1de3a1e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ast/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "2efcdac7d506cd1872264e0316bbe02c093f9384301326c8256d2ac6abbd737490a8b93f51a4457c5d4c24485cab5bff149d04bd633164d59b867075c964cdbb";
+      sha512 = "2df1a20c28fe5d114cc1e0b0d95723ddbe4f7da2d38e9ae7a1cb43fb7808968472e32157981c612341d8e9ecf590b8d068f6b84dc3bd2642228b9d659a29e367";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/az/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b48664a259c88ba408797aa597d5580b52cea58f5d4ac8c3b1cf8939bb8bf90024edaefb38626e83dcb566b766a73e8a6739f518f62776f7a27027b0616b7537";
+      sha512 = "fcee266e1263300751f9d3829a41381cffcc82316d419cc5ad739bc67e96826cbdf7324f4cd5cc16aeb0cc3496c5188383810e311f6454b0c4794cb20b4a0703";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/be/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "2e22d3b81946f8ccb95f7431c4505e8120bdf35581708150ec8658fdaecfcac457c2e27d3eff1966ba472ba238b5a145954dc84433c77f626de36897e321c0b9";
+      sha512 = "06f63c9f406e1c0ce2bd6400c30304a664b8728900a52ce1e015682596bf7488501da8dd6a766d54150b81ac287f04a058f110863ac6483c89348ca49fdbde4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bg/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "c41cfa73a86c653948646b15522abf041c82399bfd22ad9c8bb2e2266cc806617238f3852f7f89bc5fbc748d90f28548cf79e86f44703b06bfab36ffa384acb2";
+      sha512 = "ff644c16c203058c37d7baee9d787d4373b3e0a2bca1d25330b11dd6da9fcebee5a93d038c283637783d27a216d062a0db84c462f9d858b35bc2dd26c638d960";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "778d4e60b02ee0f52695c513af3a91e15672397ab60516fe5faa9c0168325ea709314e9b650bc767bc15b721af946925d69e42457f4e821ebf55a5c2dc27b7a2";
+      sha512 = "54a33277a4b10d53cfc8f794ce1ecdf328f83ae99f0dfee6d47f9243c17d83351301e3138121f45928b9db54b2b9e63d0474533ae6644ca874b20405f4acac89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/br/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6477cc04626631888fae079b480475520dda775f5e4d9741b82b6bbe8cd0a74845507047fb91ec1d490db77e7f2098bc7798e367aa6ef0687ffe17aca62b9dcc";
+      sha512 = "9dc72a4327bd02cfcb328bba9731ee90fda96e22ba4c46615ebc3ca0abe19472261386ffaeb06070b1456103090276c1da544fbb4c3ba8cca29a5f296fe6414a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "c51750a16b9da843f9586db8b4c8922a40f946851a52d35b2a52527b6ffcf3ff2535a762168e2af361a374c590d153cdc53cae64521c96ecc51beae88dd00e3f";
+      sha512 = "34d0f109426869a9b6ead4d7509770f4b861590a028aa2228d4e4b508c72cb2be184a3734fc7e71b7fa0318e9b454a95bfb63314f0ee3c8af11339f1a3d15c62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ca/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "3208657a8b81a849bff701a95b04898d32016138ea35f10d1c1a707e53bd66c0f0d94a7e546592c6586d94a7350331bcf20bd78c127bef7f5826c93469727e61";
+      sha512 = "d4d442549316d417b1c013759b64d31b6fe1a55990b02357043528c5985c40dba1edd060cd58bca5d8233eb1a4a6b850bcd6cd297a81c9d6bed8f032538b9a94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cak/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e0b62c344e89a66f25e7989774983c02d0b31f258054cc71e5b1566f0d6a0e2c834a2a6c596a07ec2a74f47bc149e4c302e7d17cfd26dc4b8de4918474d0a5c8";
+      sha512 = "c79a799abe3281b64e654f317de6956a1dedc4049b8c5f98aa41cd12d0d290018e7ab5faf411a777493b8e6e8d761637bad09db75edd0812cf8e57e49ebae4bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cs/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "971ff02141f709092e19e88c21f166dd7f8abee8d7a213a0543902dbe602e5d517ecd028731a49ab5e92cec5abfb084ea5b38824cd2856739dfcb7f8ae2063d7";
+      sha512 = "bcc5a60b5795207cae1ffa2359e7668fa6f09583ea8904a73ccffdb13cbffe312a6f0bee62356fe1533f25d10b592d8ca620942f8d265ab0450a7eb42ba95c17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cy/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "0956b4b06f09dfb714a0a457387f9e39b47f25ba37300c3f7d506ab6cc7e4c87e48992a38f04018efed84fd76d955e0037abb29c9c93210fd06e05cf1f0ce960";
+      sha512 = "221b4186252a507fce2398825039814173e55d767b1221835c0ced80fb19e4108006169009874c76176d7c39f25158cd9f554c7c08a18e1f2aca585c09054293";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/da/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "943b0344ab68dfb317fe1fe11deb4af70224de6c5ed34dad4aa5615497bb169a8f815ed2af4c806cf45caa0c1a4ef6df1a9fa7584ae5d3de65574c15727b138c";
+      sha512 = "947eae9a8a2e3761d5ee5d7d23d5edb2c5977417e0c812528116fe76216b7de6738978fbd561a0e78fa8e47877f880b63db5f92e4987814c69fd683f83b3dc82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/de/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "097ae1d3f44e296402c706782011f87edc2feff98960aee0e4bf180de99be4b066f849907b90d98f4223a5f7475484e1d03294d09a4b97ba094a1548276c004f";
+      sha512 = "78e94aa258713c9d1d1c893d37b79062f6af8b7de49bd70857b77ed8a6eeccb8c6e452b9fcd35f726d504fafee49a7c45cd876ae7e4493bd1c11f13a737fd02b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/dsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "c935a2c8c67a81a064f9441d01bbaf515cd981b7edffaca85b901c8837a51bd76615e17f6ba651c4f00199aded533270a3e3572ae932f113a44e4047e974655d";
+      sha512 = "041797c6567cc399d88bd34846092aa1af2e40d380d9c286e423ea797160e63616bcc3bf611c28e3eb3cfa2136db9db749f32e72141361064a71130db69adc3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/el/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "ae08f0ebf177e0d5a3d1d68037adba15616a300343707b04fbe1e53e369e85d7362a28eae8864391e8463f8812f6d9990a7a56f66b33983fc3561624da79d5b4";
+      sha512 = "432d58b92a720d14b3df6cdaf685e471eef8b1f7b7ff7c9685304d99bb2382f4eb1eb0535105572d472e7887e880ab6cfe18baeb7f1660dcb59c432120dcf41e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-CA/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "5b8169dfec0401822ac49f0b6a83d1730b28658f6767c347047d688fe84e09622bdc0320f70506004be66414206b8aea7de7a5fef942d5697fcde71ae2ed7f74";
+      sha512 = "d7241e3dc44a5f66d7fa39eaf19fb0ba04f67ec1816cefe0dc2721e12df7d73b69d2fe1c7ebb24c2f5957ea3b575452ac6998bb9d9933d5ed39463d846b59d03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-GB/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4a6841b68577dc00131bca9c635243f12ef6df5fd295cf89e9b7aee50abcd765dd08863a49e39e5dee795e1cffde3b48d1719687449d5482f0afbced9dcc8b5b";
+      sha512 = "5b12a9bf265009d1baaadc0707042a4290ba398544249d39ded6f213dbf8274207cc924fe5bd47f416b0923d35559a43724a31e8ab9b5fbb52f0c8749d6441e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-US/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "4ec83e426ef77701c024a31695ca10a12a88600d01aaa5c4a979c83ef5ad4ff2b378012989311da15e986da0e1022e8dbb9bdf0e2dcdf194c4b990db61e9416d";
+      sha512 = "c12dc9983539a597b00115cf1350007f9441c90e281ebc3d0d91c00bf4b260678925f52e4a1409f02f8b56d43f30191bd0eaa1ef29c3000bc3ebf1f527a5f635";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/eo/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "731260894548db91a501d12417449a6fc9aea0485258df16470e8517e82e44270eb273113b1c06ec973031d2dd3f920e510b1ab0b7addc2fd19959eaa41431ed";
+      sha512 = "9429af640db7a461a66e67d7b35239eed02ed9ec5b96718c4337fe3812f93a2039c5c5eb365fc7ca3e502368657f6a33f7318b6594cd3767d0fe72314c4eef8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-AR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "833e51d3ec511302d86599b1e65ae2c551793f7c09397d93665ebb067d9be1b0e6caf2fab67b96d0af70218a913b359271bc8143a080ec671aa1c19762421a7b";
+      sha512 = "92200fa63eb1f034b80a28e45d4223e6a27a7d4f2daf07d9e1966f76927e0e6dc0da996c7528bf2dd87189a2b061adb6e44a540b7af6598923e1fb47eefef7d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-CL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "f60869d77f08d4ec67d1e240cce766429324de937d7ab0e36590684c46dd7ee9d81add5529fc721d028ad21fe1666fb94f6256a8485fd954c946c172a74c7fa1";
+      sha512 = "094dd4ff8ba4c4f5205f43b73afade5a210ac01824c3c9f475cdbfec83bebfc6390b899ffd44c395f379c40baf9254943ed5d15b30676bb5216ae8f40c02aec5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-ES/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "67818179412979b5067fb08cd889ec3036d4270cc322a92b67be0fea402b3fdc22a6ad1eb1c768aa7d9a7f89b0b7f2bada19968903e7f2d85aa4a537cb41a6f4";
+      sha512 = "500400ffc47aebf23b7bc816be356550242b8655b703ddb992c18ae032ac524dc94513a81a05e4a593fd70e753a25c567e4c8089c341e6dbf374897d89c210f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-MX/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "4b281caff272f08ece0e27ebaf7d7ff5ef26b250a6d33e95f59854386bafea8b5e5fed904dd239f2c4c1473c558c81e15de38fbe4555274c468c30aa2da80476";
+      sha512 = "4d674f72fd150d30eb87bfd0bbd716ac93645dd69b0a8eeb5c57648077059436c6b071b4746a8b9104732e48ebbc8797c5981adfdc785500bceb99bb8b2a3190";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/et/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f1d15b73184643b3d47fdb9abbfdc0708f808c804bb287bf892bed370262da4170276675d29e2069737459549f9ff593077b3649ef39920607f61f6a3507cd07";
+      sha512 = "ad4e26c6f7800bea6eec1be23e5964ae880b87e1bcad875c4925916c4b901bf0b4be3643d69a1785bc0bfcb35affccf2394cc2805ab0f2f8022c5bae666b70c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/eu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "0d21e233e25b8200411328987feaa2868a431f3d3702adb2953d72eee46d521cbbf65d2a33e94d1a10b22a2038261137e6124bc843a2447a2895ff9dc17c7ca1";
+      sha512 = "e8091097cfbf737c775e8448e42866bcb167305e4d186b17190f41f45b12554fdf959d55be029c29915f8b3277d8d41192b740a65c218de84707f931f4e55bd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fa/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "27cf9068c191012ffbf32768bcd35b48fdc0d15816f00551e917cc454ad7804094805194d23d7ea216830a91e179b67186627d500f50c0bfdc6449af5a4046e6";
+      sha512 = "b6ea01641fdaa57026f7ad6193cb026c68392952dd3cb7e33f14bfea5762e04eebe23eb042e8b05bdef7a1f6e8bdcd7daf181f621442273f0f6a10f4d74b69a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ff/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "521878b91b8740ad2a7e7607931dba74f5c26e84e1385563d6d2fe6da2228c18cd0bad5379fb5fd41c0b76be4302775b4f02070882dc6c29683fdba6768adeca";
+      sha512 = "293f1d5c58dd55c4a9af1deed28c3e89531df45b00e4ccf7add6e2e28b6eb34752e8eebe045392b1bfdc7a7287422ac8fb8f607822f13c28cbd7114b1a207941";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3a470d7385523a01bcfb443cd462a3c26adf3ed50eb54f0b970f2b084f8bd7a020eb0ffb47c95fa85beb4e25226ed3361f4631d74904fcf2d32c7f15d718b788";
+      sha512 = "5615e699341e9c49388e4db80d9628dc0bdb964a13885f5e5b070fef3c1a397145ad13b5c583305c52d6c1a5f466dfdd10fb97b05924c3220043da08b41121e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "eaaf5b834cc5c71ab901673c0201640d5802773f215062c0472ffadff161fdcb2cfffb70712a8f14b7de2bed06a58f96e795ebe89a8c640e90b13b2bdfa89428";
+      sha512 = "3fb4b9aec3ee90cccd3f2fb34ff0665e68e7b55cb237e1760fbbec481748596f4c61c0e633cd1b5ef6993500f057fff74e983daa14343c820b9e3bed0cc90e2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fy-NL/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "37bbb5b9c608fd08ce33d76e39aab5c02d2f3befa1e73e12cc241be0dbc107e13a3f5418b87e2291afa08f6801fb804b9c7b45126abcba40c45a6839e0d3bdfb";
+      sha512 = "47ab5c06277c1aff27a54e42e01501b6b33dd0452c9ed069d6cae1a19b551459b4988274ace92001a15409964a09beae84b49c356f9005416b2660a3c5b7275c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ga-IE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "09a0b825c831e8dc9bff31c6f9d0c6f08ab56ccd2c680724433dee4af574a0e43604cd1eae54a8728278a7c42d01658e0c511319b1a02ce9e831c96f28fba1e8";
+      sha512 = "0df94004a3443899ee641ba604174c996c03ff091b0e0738f5a61e5e30a2627e2d3ab468e7cd71065c6585f3eb450a9f0d6b9c82f997c8ae81aa9e891adb2dbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gd/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "22f6fcd27ab973d942ebb4fdc6df4855179fd6fe454401f1338ce36fb62ccdd6722c63fcd3e306d5364ef2aec57738112aad005179a01ef4b200f7cb1cd62ca3";
+      sha512 = "2fa916963a8ee51ebe2e4e230efa2bdd36922008276ac6f67de09eea1c44b53070254e232b9713b4c1884e280727609c7e61d169219b8f56652964c7012e85bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "245b8ec2cceb6a4b9b17bd9c50e834994db593614616a3c2b89dad1198107ec36f73544589852c5c11281dc90f3d4dbb5d2364a30afa3e16999d0a054c3dcebd";
+      sha512 = "c4eef282b8e1658ef582c3d3219e283d1c741a00dcc3b3fb6b29494c7d0098ff7574cc92716f798c98a6ce0cb7e8362ab0b48ec1160b62520a5bc5cdf582e99d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6b158020ae5035565b1aaafd211e881d094e3b9077e78fc28e2f380303b8c23b1caa4cd3ea0832201026fceb528a5556dc89f7a7de9298b11184287f1c1dfc45";
+      sha512 = "c6e913c6df1765846191e7979655b038d3a4b12e44812be36876380da49b646b1208119f299818fe4b4ee67f2999f3c5e442be40ec8343a2b6d6b3fcaa6edc05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gu-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "0bcaf3254813905c546fc229fc8dc384003a0814a09b537d3465cd8cd83b1e9cddae0bf9cad48c4900abc3f76d2842b82119699202f37991b52a016cf8feaf2f";
+      sha512 = "348e13f235c3c80b28717571916d2aebb7d0a6865d6d4577f651ed3061dd66bf02a43bdecbda879b69f78ccd9a8e2de8ac96f3abe49b87562fa6c6c398c21b2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/he/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "69b9baffff76a335915324214ce98dfb418b0a66e3f1895d6c4f808be6029d239e665e33ebf563694e7f5b8c733b85acdc8e131a2948c92a4ab33d015eea85d2";
+      sha512 = "d0100433eb4194c415249b1adf984b4f3dbd8a11e4785008086603fdf1a2e6dd8d319e76296d0e5d9f9fcc0033b67f12d062b7ee0f2170c9e74b1cc73d55bdf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hi-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "f6a74baf232baa6602e93ccb83d020958630e169f888594237705f9aa2807d502ec3ce705d5fe55e4f89b1bea44133b11b642b011c15329c380eaf6ae19a5b8b";
+      sha512 = "91807a5b65da4bd3d2c801431cdd5922617433068b85ac4f3c87de9e3b881239c9ffbcd6d426ee4f88a98c4fe706f2a03b105df4b124d9fffc029b158fc15105";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "1e8ec2487dc44daa07aebcf0660d18b7aebb04f469b236d2a8f7a49817d5361bccacc15d9549bc44a5673a35e9f93871da6c4b5f8360ed5e19eb5c4775a07161";
+      sha512 = "3e0d747dd6e79117799fbbdc585c73312c13a21b8ea7c0ae4872b66d4da670267dce1942b350ad00026e3258af9da362e81c59e791820d3341c49ebd0e3816b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hsb/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "bee5a0d34206cbac80e9c54026f5a19630173b7725c9223aa00dbced1ed95010d3995ebc4048d6c32db7ea3a28b25d6f86537e13d3e541103c118f847f199ec6";
+      sha512 = "777ad7021020da8d302192f56e93de358af7deae7a60fe5e9f13a3b3d98779e99c4f23b8c3a801b0154f5ba35528f5800d93167de0fa3d397108df7f7ef23a58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hu/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "dc8fbfaa7143b05fec1a16c83cd3c366925b38ddb0c5c8621d5c4cfd7163d0715cf3a75d675f665f35a6fe47397403f810ce71eabaef93d1e27bd4ded74da70d";
+      sha512 = "651b0a70264ef15320391311ce357e944fc1cc59a7b68875578dee031247ebf8566dd70c566c43f94773751b73e783f1cbdb3cfadd0f9d11c302bcfdcb014d0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hy-AM/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9e7fb55ec4e3f3ad69a89bca9c50048e7abfe35929b1ce5d0454191ae655c7047a41bb6846b3c12d5098f12ababb2bd6e062cb7cc1eb8605e5d4056880288097";
+      sha512 = "a3372d320797626169609e5e2d97a72f8a54cf7bdd106fd41eaf2d8e6ac8cf0615962b3cbea463aa412badb5ac02f7c1c04cf7aad546cac73caa2742e7d985af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ia/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "19ba064d6ec4442291498378ff7db168fe626b912a4f5fe0f7dbd868e0250c958c1189b575315f287c5216842d05963bff10d412f1c5d2850e5f7382b3e94046";
+      sha512 = "3f3925da5a9d5525f4427155061cec77307139ea61eeb532bf475aad3bc47f30af07213d26500ac8a2287bb81d37ad2bd4490626afcfe8839f94287779212612";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/id/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "bdf2a45765ca4b34b35d093b4d8dfa86fae7ec7f54ffee7e52f47e2f25801c5364a1e1174f2f12ff67959d209de8bf423d25bffef7185742af1cc4cb62c499cf";
+      sha512 = "3a698899d82d3a10a7c6c4e2eb61706896c73182f16b1752404a422d2731ad272052618e87bea89455eb2ffa410e138614c2c6285c1089bbc830a0217a0c9cd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/is/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "196940b279e680ee674b5ac0c8d2744cd60310d11345ef067aa7c0ccc8c7cc9713bca2b2deadf728acc90f26d23ab4938b4d79f6744a4e357b943a6d2872a35c";
+      sha512 = "d5cfdea22357a74ab7daead5a2e8b5aa16e454f0d63c569221bcdc71d8960f45780661cafff8c60499fe50dcc49d967600096e1d2f44bc1f7f649cd3f16df8d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/it/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e42447492b421235810d4746a55777d774c488db6e233507c1c3947ece9902a55eb4390d450eabe4369f65033e9620316cdbfa4bc1dcafcc139e61205083f2b8";
+      sha512 = "92da285bcd16df6a1f61f9ad7a57cc7eb867013421d61cee6a5eedf26e2a518a1988b53f6a217048eebbaa78551324a391f9c52e03d475d32eae513a4c9e2296";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ja/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "ff4d87e5c3d0a4de6725c48c455f59cb8ffc3646da8bf16113845a6eaa6cb5f7ad25cdb1ae9a8cd4d099db6c65352bbebdb534643550af0ebc6ffd6efb82ce5d";
+      sha512 = "995903a57a7fc0f41c3737e570d61a1fcf226054d7c11be982d66ecad685aa9fa6ae6ffef93797aee387b3b442fc049f6329b5d88de86e7e809529ccf817947f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ka/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5dc95cbb37f035c32442137f713a9e2cce8057b147bc4f410675948cc21e23cab78dbab97b0374fe0ff35caf9d8562832e244086137c40d88b53c8b85ef0c740";
+      sha512 = "834ba5046a53091f3b24038069fc98f6d40350a401ac811a75ee6053e9bcffa97d8b3210eaaadb748b328b7679c80783bde5cdc1d6340e80b7240174a3b7c140";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kab/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "3d3ef83ab8390f132edc7c574c8daf18946a9a73c9a8348bc4c5a169dd829f634f4ba5c024b91b7598f7f02cafdbf292887bd1d65f657ede7cee9280673246db";
+      sha512 = "75986a7f8dba13177b00a99f219fa1e5262015fb5688dceff96222ec1a2f6ae758aeeee620edc090acfa59a4870dd43ea181dde61a5a7e68e693e59af97d54b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "11b1581c79c38bd6b85afb60547dd755725aec25459c57c3a62f668ee5d59999e2f0e1629f9d50fbb68a04765a8134b991508d9a0ee3fccd320f8ade0fc7c030";
+      sha512 = "8cb2cfe5ba91af61096084aee42dd7f666605bdab54cd7304c6e839765e41e2cee627d34ed65b7162934b60eed448090e5c963813f87bc0805e79e4f92e99523";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/km/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "e28f65d21d1b97fccc46339333465c6f3297ae790883ac78bb32bd3ca18344aae70578addbac7b9660f04fea267354e219d952fac7fb0426350d99f648e13637";
+      sha512 = "77d511c378a386c5567a47d4115fbc5c5b88dc03838a3de838c403f7b2d986b367e5cf43efd93749ac9635436f4ff1827ed3a59345a8897f332963f0cb12496f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kn/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "0297aa868255f4d391254c8210142b4c31ab9a966eb800d09dbe5fe593af42d68c52d45c73c32edf6988da3c7902ee324e4e026648c075ab67b389f2f595b761";
+      sha512 = "51646a4e9ef0a644266a925705e4e5d2f4488697c076f9156862d258bdb4ed2eb6b105d5b9047dfaf574154d4fca750365f86f0693f312f68d8984812997badf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ko/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e5f311b43b253954b5e9e22617dde33d34ee08e03e66be4d95e29d5afc48a755e5f686d769ad4ec12498b5a9c46c47c8284cc7b5b0b923bbdce878263fa28233";
+      sha512 = "d122b9dc0c0d5f4b7d62b3f188558e0db25549cfddef321f54b53c66e704ac895e9c67d3c8970de1f4ba3e7ffdd47bac5a4430000c289fb332c1e3f9d5893b66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lij/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "26cc5ba51d71a0d277ad908cbc145c3e04ba4d090b4a41103e2c3dc610914194c46de3ca5e635f1b944308fd697ccfdd68c703944a1eaf0d072e34926ec85ffb";
+      sha512 = "f1d45f8a8938599b0eab9aca11b1a917b8be86a224ed5e2c2b9bdc3ca0e4532958c6cd3468c17512b718135adb4284074fa2f4f32e851ddaaf72535cff60d58a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lt/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "cfa6be0944df97db783b827df5349a799d67d5369c37508e4d8fcaee5a2e02b7940f54384afadba3ea36a4f3b56ae621d01b35f6d7c7dc8830da34464671c366";
+      sha512 = "c6d7dba3ea655c9c419b5960f7d6bd6c4816a55e835470c1c77ad820fa48fa58a25db12dd26393d0eecc6aa77ee022d27ad4ba42779922a451297a35a65a87fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lv/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "d896152ca7a803bbb80f4108e919addd9a2bb77c78f5a39b521031e703a59fa8874226f87bf2bffc3555620d454b21294839d626c139de6a4ab4639490513268";
+      sha512 = "c5f8b3946e256c9d22b735e65987073776a1b7bfbc80b198e9a026f42b2d6161ea244d748de9948849d9fe3b760b30bb92bab2c459c8d925565f41ef39e916e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/mk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "6a7e88217fae55da91c29f8c895cfcf2732dfae0ca009bfd1af0b0b020b7a3d15f58c6e400e8645a1c675958f67257425fd16a7b45d2ca159bcdacca51a0bbe6";
+      sha512 = "e847e1aceea05139b2f1884298d59bea6a57dc3f33edca3d0175e9137de40d8e9347116951a9e5e9f8acfe43b458bcb8744a404093d1857d0b42f72ffaad90e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/mr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "1a8d3b92619df25154cb7564375e41b3321c67e309cbd89bf05015a856e45a36024e406a36d27214c149f5c38d2bf4cf07b8be72af8d5b9d6ae02c91f68a1a9c";
+      sha512 = "92014b5413076602f711f3c71730ddd462b69bf67fffc104f2b18fd92189ae43a94c368fc4047c43366c3a15fca3cda9d8368631da51bd04f1c24727dec9ca63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ms/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "da5defe18a07f890c53f64ee87926c62c70c23ae568fb18cb15ad9729eb432f141e6f5d3f88336ad3a6c30d6c7ab902ca12a86224470151ea8bdb97956239630";
+      sha512 = "5c5decf31166b853e39b9a830ada9996778ad9331fb7ae21005968c1577daa156f852aab12e21da3cb5cddc55284b8cf0b439c205c0ddbe93b919de19567b7f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/my/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "0eec34d82f3dbe7cc6b4b9292fa90e1bbb547fd225aa15ef3d5cfbca79b1702565f709e4b0d5bdb21b895946856547a676cde13a3aa6076e5d293569fc4d04b4";
+      sha512 = "60f910bc5a9cc7102bc6c9dfe8748e29d9590220acb5ef5c5b25e5c8b7186c6d17093df015df61296ba461c0a1f7dea139a94c4f920cd8cd8d770d0ee03d61ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nb-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "53f2979beec2d9aa4d69e87d3ec708092421f91056c563dd555f6258cd50ac3d0ff70a9857372933ff185a5d22f33c42a400c56e0e834e33e1db6ec8a0e2cbca";
+      sha512 = "3b7702091cffa06e91d5c82c0d18468d09c6df66ce2e0aa84180db7cefc627c1f2dcb9fe889351d265a5b4a0ff49cbffe957a22b7400c8300642e68462e317c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ne-NP/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "2e0bf9610afdb65d9e7bb6605ad2cc55a7e00207cd622650e47e089db1e5bcafcffb4e63d48612b5186d46a933956a23502b0f71a1f4fb02973539b1c0cb5bbb";
+      sha512 = "6c66a05a2cb9d3224beeedc821874634049258e107820f3b1881a1cefc8d084091a418bf6c46400d56fafd7022979f324dde5309e365e06c9ec806a5020ebc0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "5ba83f18d2d642e55b97d260ab85a0df446c82a17fc10fa8d2fb89df00d0ed8943ac99bc07f28fd8db1e6af41200058c1e90822bbffc39205bab81fff00a8c87";
+      sha512 = "6fb7a1357f73852706906386572c1a04237a041890f4bbc6ef5c1a865ba541d6af86eb6b055ada442251e3dd7d4ce30a79ebc50ebffa3850c2bbee44ba866a19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nn-NO/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "2d60bef6c729e82a1864c1c420dfd7bbde8922d93f575fa80d5bade425b10b96ea7ed1f00184ec7960f8553ebd56cc54a2c9645d1517da8db97e03b65b2cc700";
+      sha512 = "cdf167ea3728623fa7d3d9cbc39df02ba32750bfb61ecc9dfc574e9126c7e4b00c9c8fc938a6368d4f501d2b381eaefff9fb3024d4bdaad6f853c924fdc1b2eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/oc/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "67c9724d01749aa132f38a8c5acb7c603b6186b0ff70c693be66dc1c4d5404bed74c8de23bad5e45eebc27e5decfb26733b0c00acd6f2e283780c56d7fa012e2";
+      sha512 = "9e5180bcb7195b7064ea10046f1cd044e6d287ce732be1d6f4c0a3c5adb2a26b951d76e92866a667652616bb7853f5249618220bad09ea2d32b8aa71131d9371";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pa-IN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "9b8495348104147f212246414172030bddfddaffaca9615cf701f210ff410d39a0ee3dc78c6a92fe83a35b32e2b18e528db6b6183a5481f8be20c5b93196ff2b";
+      sha512 = "e0ad213505bad75ce2947b0bd501df174ef4516916bef43e083506721438e83f5a35139d5aa661569ec8d955eab87973995e29ac077c330af53e9647cffbd825";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "426fb10742be943737a8c1288500ff5b678fc2d29bb3e2bbf2d55221fcce4616be4e86cd8e60356b20f0f5bec51bc5242fea076607ecedcbf3b27bddfacc88ce";
+      sha512 = "9e84080936bbf5e7585edae2b3ccdd1d9a825ffcefea7d4399f892e9c2a18fab580928e74671e14dbde3ae0cfb0ad081f6ae3b9cd9ff1df3c778a8d0f399e11d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pt-BR/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "3a288a97dfe69e3fcfa6c48ea4c96a5c5d3cacfb5d6179fa420083961c30ce195d4adad693a981d6409978c938dd6a43f4756d3b62f78fff6f954f917515dc45";
+      sha512 = "b98aa88bf2c9207ab21708c7fb72be8256a0c89df32ed51202c9f24fe232d38285dcf7cb74017ce50e7eee22f091de494793eab15c36ae5724d393f49d70d78c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pt-PT/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "627014dbfe2892da96f76ad180b23126def791bea2a43c431dd418ee6cf4a34edcc352ae710af93f793666aa4e84d88b5b345c341f2b18ad9bdf036797127947";
+      sha512 = "0afdbce1e0c0571a31fd5f90e40bd088a3df479ecb40c851750480e917fa60150d00a35a32083a846640c2c9ed5ee455e1a71ccf2ba226f0fd6899c2e22490b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/rm/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a54cbeb70b2a0d013bc47f9a09cb549a0b9f5352f3a9bf82483a65dbc6f7b57f48d141ceeaaedface0601c0fd9159c2e8b55e21300962b235a36c29682ab8ffb";
+      sha512 = "224c878a035a8c3a5fa6baa45964e676ee33bd5a52273f7da755a36f4d3191fb11eeed10acdfe8e5417eb2ce55fd524206cd8973a1874073d1b1c936a0490f5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ro/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e3b894d8e72ea9fdeb99f40e822e731dbd346a468444de95a6782f8b7b97d6d2b36353ca4c02216662804e5e9843dbe410041a6afa8d51cf1dfc777fbd851216";
+      sha512 = "3c07f89c0b52a0ab59d1820704fcd65c4d90cca95a4cac212b97697c6a25b918cc7cb2d86eabb4e58aa961e868c21ce5350aeee2ff2289b052fbaf9b1f1d461d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ru/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "2c30a6eceef40e9d0f86172f58f7ac38c3d0bae36c9ca3d0bd262ee1995296b06a38daadfe7a57870623b31aca240e4d1685d6c1513cb297f19e533aa4ff9428";
+      sha512 = "747f637a451e584e70414b11a5bbb65cf45a55c4491de0f0877efae6d348cffa3c4442235829474d1609d05749d3f785e17f6dea041a318dc504f795d312a88e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/si/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "c05c7bdaf6e986bfeb99872bc8056c11096e1b961ef418ce88b7a8d386c782fc4b2f8d0d0dafac6fb2c0f68db9e1cd27f323c4d36b16175e1901d8908c7b9f3a";
+      sha512 = "43a5d175b3759863ac557a69c6650bd3d7a1b2fe4747466a5e5d3b8eb5570c5b4d9ac18120ad5a79b768731409f1179fffbc5be9e6c171523ed5e0b71945eae2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "cdb5a13a02f45f599e3cee55c8d17437fb2190aae81fe9248e02af7eabb967945fdb5eae8e5ecf59c8586f5e5ad32acabb78abf50a31823add459e815beebf3b";
+      sha512 = "4c11c5e850d9dfbe8285973acdb85de064b9009df28b974dc482c8138472c8555c6e44718d770f561805a8dc4d600ec77cead4d217d76f412b1128db4dc3d31b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sl/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ef3d0ffaf4eb051a98044057734742c5b615c9e64043af99a1fee36cbd1456494c01f20df8b53c5094b12bb66711e8db4dd7db2223e6a827f9a2c6cdc3fbf55d";
+      sha512 = "b02dc1cbcd8307fd803d477a73c7196fcdf4cc7ce7b250892ed0cba61c2003c63454623a953a0186359e117b0ece427d977561f04d29757d2889236289fa7fe6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/son/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "d430041041f703b7367963dfe58cba49b8ca23a50ac70f2dd315d4f2e4e5afe66a3656af08be4046a88e0a06901da722451f6f20740fec9e65fc53a6ebd4f104";
+      sha512 = "aae03bccc5904c2b50d4bdc4bdbd0995ca8eeba67973bbd5ee5488606c2f0759b88334c500aa2b48edadb2c6ea27b16452db29a6647377de87a6f6d054acf202";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sq/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "34042131464d3e29af4d6f9306f8bf20a77a0a1926ecc297a3b587551efcffec5ccf7df82ebbd9cc25cfa9e4598fd15493a8661d61d1ffa9708bf8d706c5e45b";
+      sha512 = "2c9708666b8226ad9f2c107c3c9c8607942781544a6eb9a050915d5a55712fa5c9bb38a07581e9781c054a4799f4d677788cadaaa30dede88b508771da20cbeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "795dd65257fdf6eb34e822e4ec0b56ad8e1d1536818c7bdae2c4fcd1711fded36ccd168ac22500a071bed37a15e481a4539071b30e9b91159d2ec0f60a428754";
+      sha512 = "b575acaaa5701c18fbb90cc71d6627eeae41a0ac1cf42327843e7c120cb51e7761b54669eda69577ed2c3c8c98ee9be66dba65e914283e50afb058f7b94c3487";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sv-SE/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a905295f59f638d137f729905872aa9da66b035a5bd63d8717043f4a32ba53ada9835fb7aa613ea0b2252a92ed38a404e533d62d7514a13873a68c40c96a02fb";
+      sha512 = "728c09e2feaaee2faebe8bd6a42ac78685c98c5d0065d14ea9d29df1afadb429f9d03519e9256e678f63c29d59f392805ea8843f7df8d25c3d42c557e91feca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ta/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "c996ac6a419097d2d14400cd050dba33e87ffee5059629f15fd4d666d6abdb02351cb241b03a663fadd85f29a328b311e173d4850d59abf4339a367aa22a94c8";
+      sha512 = "5415b52d2270d55c12254ae4cc61cadf0b743cda3ec80f36e8e5ced2bb0599abfa37725994f680165c3803889cc04f218dbd2b89f3011bc41a8f1fe204b1a821";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/te/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "082d663b14641747a927a23ad9c9e135f2179b958f733e2943267a40600a1b3acfe5b132048b3a4e71879ed292793a5592635de9aed547ece695884a129a598c";
+      sha512 = "6361e327a8d71977488d0b6e5d4dfcf9271dc4739b52e31a979bcc686b2a6f326065e88ebafba05e38e6628955690a934c02b510eb5ae0ea15371bc309ae43b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/th/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f3c45ea9333b25094e153faa4e1faefc9497b04bcccff90b514221671d51e0348fe119a091e6a2c1a867c7e3a5727672a1b153f2101ccf56e5bd223ca8af7fe3";
+      sha512 = "883fc0aabee67ca6098a4e860f58018bbdb511aeff8f1ffddf8c012357208dd2156ef0fbea7e92f2f0fc0da8d8a60d913ca638742c2b6511fbb4d943b59cb944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/tr/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "91e70c57b698a6b4782f64c81a4482cd6046885da0a41a7f1d05b96fd4b10b69681fbb43e302f97d2b4939215f815a68b368b8ee70b1443c29d90410374253db";
+      sha512 = "e5f302af1bb937aa0dc0283a97a61588a7ad72dd46f74c0514645edbe23a5c25032a585230709fffe34d3b7e739797e4a2a33c2b2115f4623ab2da9b7c5fda4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/uk/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "217d3d17cca00530179905c5f0c221380af53f03cc01c152e894eee6bcc58d387db244574d23ac62dfdda160f6fd6065c732c863c5684e85ab32d246af381714";
+      sha512 = "4590f2774f1b119bb76c23b65103a635c4c51541fd9ade6ae44d997892f21015c71d8d718697acff6525420d6b2d5352d2f3c4afd3f35841fd7b207260c1ac2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ur/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "527871804b234603c95d06fe4c9d9624610aade70ba3985d37f87125a443fb1efd3afa9370b9ab4dadfbade6cc91ed180e830249b0613d366179733fe5f2c2ac";
+      sha512 = "d559ce617dd2da4bf45eed7a61c79703064f29ca473993fd2df64f8e7006a6026c70e732db66fa33f78e550eaae88da2dd67cfefa85456d7e9e8a1d28e67b5be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/uz/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "35407d10af3148eeb1c62a1e690f5bd83d623afb24151eab254cdd59c19ccdd6f7fe84b9c68136b3f5736fefef31eaaecbf4ee88a4bb38ba93714e6e1a469e96";
+      sha512 = "1770b55e2f8a7119d5395587f9f7d7fdc10f8c3c55f954f62d08a1ec3fa66600cecbe94cc7cd04580c1ba568ce5e839bac52e8c8b3dc654937e91a8a573db358";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/vi/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "edd451320a4bb5d670896abc788ba7d845a9ad2eaf235a8aadb13bace36773ce51f31d41b94c363278a9868eabae84186adf7df5902770f12a476145641924d3";
+      sha512 = "754513e26d09ceff0957a5d520097b600db660657feb1d8484ce046e90e60d37268474df79ebf5a450436b9f6574f0443fb7d647ff0f5b045055591488e4ab67";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/xh/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "dbc83d9d017ab327dd63a6f42e5fbdfb1d5575c848acc6d8610fa937839e18cf84b43df9ecfbf4cdc6e4390ab24f802a3962e1c58bc09c7ae332aea42b7467c8";
+      sha512 = "2e2e353006a2ad5430a201e0b7ed793d439afc1f7f4114258065f58afaa351eaf2be32f3dce1401af350cdc5753fffc13fee856181e51b961d688049c348c3f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/zh-CN/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ca19b51389a339e82332640396cd398ab68651ad3c77fcbc60a6e748400bedd88557a49459e573e02038d69bf95a38eba08760e9cb40d25a0a97354b92cc7052";
+      sha512 = "7b86f1c8b7d81b90f7b72b3eec110257758da38f7f3bca50006a339de5ca1075e06762f07ba29b23a0718c6014ee30564329276098c9f8569487b4831f7b5809";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/zh-TW/firefox-68.0b12.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8c07654fc7a45d3918d2ce9a7732f7b5feb05cda23280385bf363b907b176c6f3414f05324fed9e384c6e5d63d48030234aa3fcc8c12e240266ba1bf89464c16";
+      sha512 = "1f2a59adb5f3e243629f54ceb769e032eb2274990a7f5feb43a0c7f2df8344aea31fff8cb0ab9ea2e220f68548a7266ea052f8c02ef3fc8bbeb0b5917a1c853e";
     }
     ];
 }

From a7279ea9dc2258dcca834983567bb26e8168e021 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 1 Aug 2019 13:23:23 -0700
Subject: [PATCH 070/562] pythonPackages.xmlschema: init at 1.0.13

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

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
new file mode 100644
index 00000000000..c021bde60cd
--- /dev/null
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, elementpath
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.0.13";
+  pname = "xmlschema";
+
+  src = fetchFromGitHub {
+    owner = "sissaschool";
+    repo = "xmlschema";
+    rev = "v${version}";
+    sha256 = "182439gqhlxhr9rdi9ak33z4ffy1w9syhykkckkl6mq050c80qdr";
+  };
+
+  propagatedBuildInputs = [ elementpath ];
+
+  checkInputs = [ pytest ];
+
+  # Ignore broken fixtures, and tests for files which don't exist.
+  # For darwin, we need to explicity say we can't reach network
+  checkPhase = ''
+    substituteInPlace xmlschema/tests/__init__.py \
+      --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #"
+    pytest . \
+      --ignore=xmlschema/tests/test_factory.py \
+      --ignore=xmlschema/tests/test_validators.py \
+      --ignore=xmlschema/tests/test_schemas.py \
+      -k 'not element_tree_import_script'
+  '';
+
+  meta = with lib; {
+    description = "XML Schema validator and data conversion library for Python";
+    homepage = "https://github.com/sissaschool/xmlschema";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c7960565648..d7b317d444b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4949,6 +4949,8 @@ in {
 
   xml2rfc = callPackage ../development/python-modules/xml2rfc { };
 
+  xmlschema = callPackage ../development/python-modules/xmlschema { };
+
   xmltodict = callPackage ../development/python-modules/xmltodict { };
 
   xarray = callPackage ../development/python-modules/xarray { };

From 2fad3c5a740c038019f6ce4c61c75f5b6759b89e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 1 Aug 2019 13:28:44 -0700
Subject: [PATCH 071/562] pythonPackages.sepaxml: 2.0.0 -> 2.1.0

---
 .../python-modules/sepaxml/default.nix        | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix
index deb24a7130a..6e6809663a6 100644
--- a/pkgs/development/python-modules/sepaxml/default.nix
+++ b/pkgs/development/python-modules/sepaxml/default.nix
@@ -1,17 +1,32 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+, lxml
+, pytest
+, text-unidecode
+, xmlschema
+}:
 
 buildPythonPackage rec {
-  version = "2.0.0";
+  version = "2.1.0";
   pname = "sepaxml";
-  disabled = !isPy3k;
+  disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0jhj8fa0lbyaw15q485kyyli9qgrmqr47a6z6pgqm40kwmjghiyc";
+  src = fetchFromGitHub {
+    owner = "raphaelm";
+    repo = "python-sepaxml";
+    rev = version;
+    sha256 = "0lkb0nnyxmwvm6gkwls8w2290b66lwz9bv8p39wwcn7flabviwhj";
   };
 
-  # no tests included in PyPI package
-  doCheck = false;
+  propagatedBuildInputs = [
+    text-unidecode
+    xmlschema
+  ];
+
+  checkInputs = [ pytest lxml ];
+
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/raphaelm/python-sepaxml/;

From 860e49b3327c3cf7ec03d8c59d24062b49c73588 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 1 Aug 2019 14:27:08 -0700
Subject: [PATCH 072/562] python3Packages.fints: 2.1.1 -> 2.2.0

---
 .../python-modules/fints/default.nix          | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix
index 4d9d250815a..f780c76fd6d 100644
--- a/pkgs/development/python-modules/fints/default.nix
+++ b/pkgs/development/python-modules/fints/default.nix
@@ -1,20 +1,36 @@
-{ stdenv, buildPythonPackage, fetchPypi,
-  requests, mt-940, sepaxml, bleach, isPy3k }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
+, bleach
+, mt-940
+, pytest
+, requests
+, sepaxml
+}:
 
 buildPythonPackage rec {
-  version = "2.1.1";
+  version = "2.2.0";
   pname = "fints";
-  disabled = !isPy3k;
+  disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "06p6p0xxw0n10hmf7z4k1l29fya0sja433s6lasjr1bal5asdhaq";
+  src = fetchFromGitHub {
+    owner = "raphaelm";
+    repo = "python-fints";
+    rev = "v${version}";
+    sha256 = "1gx173dzdprf3jsc7dss0xax8s6l2hr02qg9m5c4rksb3dl5fl8w";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'sepaxml==2.0.*' 'sepaxml~=2.0'
+  '';
+
   propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
 
-  # no tests included in PyPI package
-  doCheck = false;
+  checkInputs = [ pytest ];
+
+  # ignore network calls and broken fixture
+  checkPhase = ''
+    pytest . --ignore=tests/test_client.py -k 'not robust_mode'
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/raphaelm/python-fints/;

From 537f3621c6161f11f3afbac0d2a7f70d52919709 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sat, 3 Aug 2019 01:04:12 +0300
Subject: [PATCH 073/562] goldendict: 2018-06-13 -> 2019-08-01

---
 pkgs/applications/misc/goldendict/default.nix | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 42d5d83f7bd..6a5f4c9ce03 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
-, libao, ffmpeg, libeb, lzo, xz, libtiff
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
+, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc
 , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
 
-  name = "goldendict-2018-06-13";
+  name = "goldendict-2019-08-01";
   src = fetchFromGitHub {
     owner = "goldendict";
     repo = "goldendict";
-    rev = "48e850c7ec11d83cba7499f7fdce377ef3849bbb";
-    sha256 = "0i4q4waqjv45hgwillvjik97pg26kwlmz4925djjkx8s6hxgjlq9";
+    rev = "0f951b06a55f3a201891cf645a556e773bda5f52";
+    sha256 = "1d1hn95vhvsmbq9q96l5adn90g0hg25dl01knb4y4v6v9x4yrl2x";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
     qtbase qtsvg qtwebkit qtx11extras qttools
-    libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
+    libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff opencc
   ];
 
-  qmakeFlags = [ "CONFIG+=zim_support" ];
+  qmakeFlags = [
+    "goldendict.pro"
+    "CONFIG+=zim_support"
+    "CONFIG+=chinese_conversion_support"
+  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://goldendict.org/;
     description = "A feature-rich dictionary lookup program";
     platforms = platforms.linux;

From 0172a27043e6d1b3169ba5cdb658113186ff4fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Fri, 2 Aug 2019 17:10:39 +0200
Subject: [PATCH 074/562] xteddy: 2.2 -> 2.2-5 (use debian sources and patches)

---
 pkgs/applications/misc/xteddy/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix
index 6f67ed96c57..6bc492833cc 100644
--- a/pkgs/applications/misc/xteddy/default.nix
+++ b/pkgs/applications/misc/xteddy/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchzip, pkg-config, xorg, imlib2, makeWrapper }:
+{ stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "xteddy-${version}";
-  version = "2.2";
-  src = fetchzip {
-    url = "https://deb.debian.org/debian/pool/main/x/xteddy/xteddy_${version}.orig.tar.gz";
-    sha256 = "0sap4fqvs0888ymf5ga10p3n7n5kr35j38kfsfd7nj0xm4hmcma3";
+  version = "2.2-5";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "games-team";
+    repo = "xteddy";
+    rev = "debian%2F${version}"; # %2F = urlquote("/");
+    sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy";
   };
+
   nativeBuildInputs = [ pkg-config makeWrapper ];
   buildInputs = [ imlib2 xorg.libX11 xorg.libXext ];
 
-  makeFlags = [ "LIBS=-lXext" ];
+  patches = [ "${src}/debian/patches/10_libXext.patch" "${src}/debian/patches/wrong-man-page-section.patch" ];
 
   postPatch = ''
-    sed -i 's/man 1 xteddy/man 6 xteddy/' xteddy.c
     sed -i "s:/usr/games/xteddy:$out/bin/xteddy:" xtoys
     sed -i "s:/usr/share/xteddy:$out/share/xteddy:" xtoys
   '';
@@ -32,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Cuddly teddy bear for your X desktop";
-    homepage = https://weber.itn.liu.se/~stegu/xteddy/;
+    homepage = "https://weber.itn.liu.se/~stegu/xteddy/";
     license = licenses.gpl2;
     maintainers = [ maintainers.xaverdh ];
     platforms = platforms.linux;

From 0ca75bc294d38a420f67307b6de6ac1fd5d93620 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sun, 5 May 2019 18:31:51 -0500
Subject: [PATCH 075/562] curaLulzbot: 15.02.1-1.03-5064 -> 3.6.18

Move Cura Lulzbot Edition to be based on the same generation of the
codebase as the upstream (Ultimaker) branch, away from a many-year-old
legacy tree.

Since prior Lulzbot Edition packaging simply wrapped binaries unpacked
from Debian binary packages, doing this right requires forking the same
dependencies that Lulzbot has branched themselves as well.
---
 pkgs/applications/misc/cura/lulzbot.nix       | 96 ++++++++++---------
 pkgs/applications/misc/curaengine/lulzbot.nix | 26 +++++
 .../python-modules/libarcus/lulzbot.nix       | 33 +++++++
 .../python-modules/libsavitar/lulzbot.nix     | 33 +++++++
 .../python-modules/uranium/lulzbot.nix        | 41 ++++++++
 .../uranium/qt512-support.patch               | 16 ++++
 pkgs/top-level/all-packages.nix               |  8 +-
 pkgs/top-level/python-packages.nix            |  3 +
 8 files changed, 208 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/applications/misc/curaengine/lulzbot.nix
 create mode 100644 pkgs/development/python-modules/libarcus/lulzbot.nix
 create mode 100644 pkgs/development/python-modules/libsavitar/lulzbot.nix
 create mode 100644 pkgs/development/python-modules/uranium/lulzbot.nix
 create mode 100644 pkgs/development/python-modules/uranium/qt512-support.patch

diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix
index f3f1972f6e6..9073c5fae49 100644
--- a/pkgs/applications/misc/cura/lulzbot.nix
+++ b/pkgs/applications/misc/cura/lulzbot.nix
@@ -1,58 +1,66 @@
-{ stdenv, fetchurl, dpkg, bash, python27Packages }:
+{ lib, fetchgit, curaengineLulzbot, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }:
 
 let
-  py = python27Packages;
+  # admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
+  curaBinaryDataVersion = "3.6.18"; # Marlin v2.0.0.144. Keep this accurate wrt. the below.
+  curaBinaryData = fetchgit {
+    url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git;
+    rev = "cdc046494bbfe1f65bfb34659a257eef9a0100a0";
+    sha256 = "0v0s036gxdjiglas2yzw95alv60sw3pq5k1zrrhmw9mxr4irrblb";
+  };
+  curaengine = curaengineLulzbot;
+  libarcus = python3Packages.libarcusLulzbot;
+  uranium = python3Packages.uraniumLulzbot;
+  libsavitar = python3Packages.libsavitarLulzbot;
 in
-stdenv.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
   name = "cura-lulzbot-${version}";
-  version = "15.02.1-1.03-5064";
+  version = "3.6.18";
 
-  src =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb";
-        sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg";
-      }
-    else if stdenv.hostPlatform.system == "i686-linux" then
-      fetchurl {
-        url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb";
-        sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1";
-      }
-    else throw "${name} is not supported on ${stdenv.hostPlatform.system}";
+  src = fetchgit {
+    url = https://code.alephobjects.com/source/cura-lulzbot.git;
+    rev = "71f1ac5a2b9f535175a3858a565930348358a9ca";
+    sha256 = "0by06fpxvdgy858lwhsccbmvkdq67j2s1cz8v6jnrnjrsxk7vzka";
+  };
 
-  python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
-  pythonPath = python_deps;
-  propagatedBuildInputs = python_deps;
-  buildInputs = [ dpkg bash py.wrapPython ];
+  format = "other"; # using cmake to build
+  buildInputs = [ qtbase qtquickcontrols2 ];
+  # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
+  propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitar uranium libarcus ]; # numpy-stl
+  nativeBuildInputs = [ cmake python3Packages.wrapPython ];
 
-  phases = [ "unpackPhase" "installPhase" ];
-  unpackPhase = "dpkg-deb -x ${src} ./";
+  cmakeFlags = [
+    "-DURANIUM_DIR=${uranium.src}"
+    "-DCURA_VERSION=${version}"
+  ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r usr/share $out/share
-    find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \;
-
-    cat <<EOT > $out/bin/cura
-    #!${bash}/bin/bash
-    PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@"
-    EOT
-
-    chmod 555 $out/bin/cura
+  postPatch = ''
+    sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+    sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
   '';
 
-  meta = with stdenv.lib; {
-    description = "3D printing host software for the Lulzbot";
+  preFixup = ''
+    substituteInPlace "$out/bin/cura-lulzbot" --replace 'import cura.CuraApplication' 'import Savitar; import cura.CuraApplication'
+    ln -sT "${curaBinaryData}/cura/resources/firmware" "$out/share/cura/resources/firmware"
+    ln -sT "${uranium}/share/uranium" "$out/share/uranium"
+    ${jq}/bin/jq --arg out "$out" '.build=$out' >"$out/version.json" <<'EOF'
+    ${builtins.toJSON {
+      cura = version;
+      cura_version = version;
+      binarydata = curaBinaryDataVersion;
+      engine = curaengine.version;
+      libarcus = libarcus.version;
+      libsavitar = libsavitar.version;
+      uranium = uranium.version;
+    }}
+    EOF
+  '';
 
-     longDescription = ''
-       Cura LulzBot Edition is a fork of the 3D printing/slicing
-       software from Ultimaker, with changes to support 3D printers
-       from Aleph Objects.
-     '';
-
-    homepage = https://www.lulzbot.com/cura/;
-    license = licenses.agpl3;
+  meta = with lib; {
+    description = "3D printer / slicing GUI built on top of the Uranium framework";
+    homepage = https://code.alephobjects.com/diffusion/CURA/;
+    license = licenses.agpl3;  # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pjones ];
+    maintainers = with maintainers; [ chaduffy ];
   };
 }
diff --git a/pkgs/applications/misc/curaengine/lulzbot.nix b/pkgs/applications/misc/curaengine/lulzbot.nix
new file mode 100644
index 00000000000..0df3e19b318
--- /dev/null
+++ b/pkgs/applications/misc/curaengine/lulzbot.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
+
+stdenv.mkDerivation rec {
+  name = "curaengine-lulzBot-${version}";
+  version = "3.6.18";
+
+  src = fetchgit {
+    url = https://code.alephobjects.com/source/curaengine-lulzbot.git;
+    rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d";
+    sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libarcusLulzbot stb protobuf ];
+
+  cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
+
+  meta = with stdenv.lib; {
+    description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
+    homepage = https://code.alephobjects.com/source/curaengine-lulzbot/;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ chaduffy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/libarcus/lulzbot.nix b/pkgs/development/python-modules/libarcus/lulzbot.nix
new file mode 100644
index 00000000000..589111df78b
--- /dev/null
+++ b/pkgs/development/python-modules/libarcus/lulzbot.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "libarcus";
+  version = "3.6.18";
+  format = "other";
+
+  src = fetchgit {
+    url = https://code.alephobjects.com/source/arcus.git;
+    rev = "c795c0644591703ce04e1fd799fc97b1539031aa";
+    sha256 = "1yap9wbqxbjx3kqyqcsldny4mlcm33ywiwpdjlfgs0wjahfg4ip0";
+  };
+
+  disabled = pythonOlder "3.4.0";
+
+  propagatedBuildInputs = [ sip ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ protobuf ];
+
+  postPatch = ''
+    # To workaround buggy SIP detection which overrides PYTHONPATH
+    sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Communication library between internal components for Ultimaker software";
+    homepage = https://code.alephobjects.com/source/arcus/;
+    license = licenses.lgpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ chaduffy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/libsavitar/lulzbot.nix b/pkgs/development/python-modules/libsavitar/lulzbot.nix
new file mode 100644
index 00000000000..7a1781f62ce
--- /dev/null
+++ b/pkgs/development/python-modules/libsavitar/lulzbot.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
+
+buildPythonPackage rec {
+  pname = "libsavitar-lulzbot";
+  name = "libsavitar-lulzbot";
+  version = "3.6.18";
+  format = "other";
+
+  src = fetchgit {
+    url = https://code.alephobjects.com/source/savitar.git;
+    rev = "988a26d35b2a1d042f8c38938ccda77ab146af7d";
+    sha256 = "146agw3a92azkgs5ahmn2rrck4an78m2r3pcss6ihmb60lx165k7";
+  };
+
+  postPatch = ''
+    # To workaround buggy SIP detection which overrides PYTHONPATH
+    sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
+  '';
+
+  nativeBuildInputs = [ cmake ];
+
+  propagatedBuildInputs = [ sip ];
+
+  disabled = pythonOlder "3.4.0";
+
+  meta = with stdenv.lib; {
+    description = "C++ implementation of 3mf loading with SIP python bindings";
+    homepage = https://github.com/Ultimaker/libSavitar;
+    license = licenses.lgpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ chaduffy ];
+  };
+}
diff --git a/pkgs/development/python-modules/uranium/lulzbot.nix b/pkgs/development/python-modules/uranium/lulzbot.nix
new file mode 100644
index 00000000000..fd95110fd19
--- /dev/null
+++ b/pkgs/development/python-modules/uranium/lulzbot.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
+, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
+
+buildPythonPackage rec {
+  version = "3.6.18";
+  pname = "uranium";
+  name = "uraniumLulzbot";
+  format = "other";
+
+  src = fetchgit {
+    url = https://code.alephobjects.com/diffusion/U/uranium.git;
+    rev = "33df88a7414375ac924ac761113baa48d2ced2b4";
+    sha256 = "109cbv7y105crbrzfp70lmcr9n20ap5c97i5qd46fmxbx86yj7f8";
+  };
+
+  disabled = pythonOlder "3.5.0";
+
+  buildInputs = [ python gettext ];
+  propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ];
+  nativeBuildInputs = [ cmake doxygen ];
+
+  # Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee
+  patches = [ ./qt512-support.patch ];
+
+  postPatch = ''
+    sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+    sed -i \
+     -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \
+     -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \
+     UM/Application.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python framework for building Desktop applications";
+    homepage = https://code.alephobjects.com/diffusion/U/;
+    license = licenses.lgpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ chaduffy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/uranium/qt512-support.patch b/pkgs/development/python-modules/uranium/qt512-support.patch
new file mode 100644
index 00000000000..2c666a98c8f
--- /dev/null
+++ b/pkgs/development/python-modules/uranium/qt512-support.patch
@@ -0,0 +1,16 @@
+diff --git a/UM/Qt/Bindings/i18nCatalogProxy.py b/UM/Qt/Bindings/i18nCatalogProxy.py
+index 7e2bb16c..cec70dd6 100644
+--- a/UM/Qt/Bindings/i18nCatalogProxy.py
++++ b/UM/Qt/Bindings/i18nCatalogProxy.py
+@@ -86,9 +86,9 @@ class i18nCatalogProxy(QObject): # [CodeStyle: Ultimaker code style requires cla
+     #   \todo Move this to a more generic place so more things can use it.
+     def _wrapFunction(self, engine, this_object, function):
+         # JavaScript code that wraps the Python method call in a closure
+-        wrap_js = """function(this_object) {{
++        wrap_js = """(function(this_object) {{
+             return function({args}) {{ return this_object.{function}({args}) }}
+-        }}"""
++        }})"""
+ 
+         # Get the function name and argument list.
+         function_name = function.__name__
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2c1c10f5cf..8e28a4dd65f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20203,14 +20203,14 @@ in
     curaengine = curaengine_stable;
   };
 
-  curaengine = callPackage ../applications/misc/curaengine {
-    inherit (python3.pkgs) libarcus;
-  };
+  curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; };
+  curaengineLulzbot = callPackage ../applications/misc/curaengine/lulzbot.nix { inherit (python3.pkgs) libarcusLulzbot; };
+
   cura = qt5.callPackage ../applications/misc/cura { };
 
   curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
 
-  curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };
+  curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot.nix { };
 
   curaByDagoma = callPackage ../applications/misc/curabydagoma { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e957fe5746c..62586866c26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3238,6 +3238,7 @@ in {
   fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
 
   libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
+  libarcusLulzbot = callPackage ../development/python-modules/libarcus/lulzbot.nix { inherit (pkgs) protobuf; };
 
   libcloud = callPackage ../development/python-modules/libcloud { };
 
@@ -3258,6 +3259,7 @@ in {
   };
 
   libsavitar = callPackage ../development/python-modules/libsavitar { };
+  libsavitarLulzbot = callPackage ../development/python-modules/libsavitar/lulzbot.nix { };
 
   libplist = disabledIf isPy3k
     (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
@@ -5537,6 +5539,7 @@ in {
   twilio = callPackage ../development/python-modules/twilio { };
 
   uranium = callPackage ../development/python-modules/uranium { };
+  uraniumLulzbot = callPackage ../development/python-modules/uranium/lulzbot.nix { };
 
   uuid = callPackage ../development/python-modules/uuid { };
 

From 3d90e873d8b3adf48de9acd0d9596bdfc8e24f80 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:08:18 -0400
Subject: [PATCH 076/562] netsurf.libcss: 0.6.0 -> 0.9.0

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

diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
index e97452249bc..55538925abd 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libcss";
-  version = "0.6.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf";
+    sha256 = "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a5980dfa0159e8234a12de79f4c63e1e80c4c8c6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:08:39 -0400
Subject: [PATCH 077/562] netsurf.libdom: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix
index 50a6dadadb5..de92219e7f9 100644
--- a/pkgs/applications/misc/netsurf/libdom/default.nix
+++ b/pkgs/applications/misc/netsurf/libdom/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libdom";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1kk6qbqagx5ypiy9kf0059iqdzyz8fqaw336vzhb5gnrzjw3wv4a";
+    sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d99a97c9a31f4dd4be6457a0070d98ac57c8f984 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:08:56 -0400
Subject: [PATCH 078/562] netsurf.libhubbub: 0.3.3 -> 0.3.6

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

diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix
index 71519687151..03ee66fc598 100644
--- a/pkgs/applications/misc/netsurf/libhubbub/default.nix
+++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libhubbub";
-  version = "0.3.3";
+  version = "0.3.6";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86";
+    sha256 = "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1c60e5c3c617d97b04def99e9d405f5a34a2a187 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:09:12 -0400
Subject: [PATCH 079/562] netsurf.libnsbmp: 0.1.3 -> 0.1.5

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

diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
index 7e99f8f5b86..b0fb18c89b1 100644
--- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libnsbmp";
-  version = "0.1.3";
+  version = "0.1.5";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0gmvzw1whh7553d6s98vr4ri2whjwrgggcq1z5b160gwjw20mzyy";
+    sha256 = "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 60e3b3ddafc3556e587a5fb19057f40f20367b68 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:09:35 -0400
Subject: [PATCH 080/562] netsurf.libnsfb: 0.1.4 -> 0.2.1

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

diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix
index 24235f43a11..29b0a7867db 100644
--- a/pkgs/applications/misc/netsurf/libnsfb/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libnsfb";
-  version = "0.1.4";
+  version = "0.2.1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl";
+    sha256 = "09qag9lgn5ahanbcyf2rvfmsz15vazfwnl8xpn8f1iczd44b0bv0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6750af20311152beba5bd76bf58991ca0453f25c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:10:06 -0400
Subject: [PATCH 081/562] netsurf.libnsgif: 0.1.3 -> 0.2.1

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

diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix
index 836bfd5f3e0..4de882243fe 100644
--- a/pkgs/applications/misc/netsurf/libnsgif/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libnsgif";
-  version = "0.1.3";
+  version = "0.2.1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "1a4z45gh0fw4iybf34fig725av25h31ffk0azi0snzh4130cklnk";
+    sha256 = "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 722ed66c8f81a19ff1e8f51ee7f061f1a9147c03 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:10:26 -0400
Subject: [PATCH 082/562] netsurf.libnsutils: 0.0.2 -> 0.0.5

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

diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix
index 1e8dbe27137..3eaa882cb73 100644
--- a/pkgs/applications/misc/netsurf/libnsutils/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libnsutils";
-  version = "0.0.2";
+  version = "0.0.5";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "03p4xmd08yhj70nyj7acjccmmshs59lv4n4zsqpsn5lgkwa23lzy";
+    sha256 = "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 884f7f9a56021e5ecab235dbb61c7e0edbdb6ec7 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:10:40 -0400
Subject: [PATCH 083/562] netsurf.libparserutils: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix
index ed9433b9f57..ea9d7c9ea85 100644
--- a/pkgs/applications/misc/netsurf/libparserutils/default.nix
+++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libparserutils";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5";
+    sha256 = "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj";
   };
 
   buildInputs = [ buildsystem perl ];

From d87f5099f0c3fd038d1780a5560d2128df7bdee8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:10:56 -0400
Subject: [PATCH 084/562] netsurf.libutf8proc: 1.3.1 -> 2.4.0-1

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

diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
index a905f3a12a8..2144ccd3303 100644
--- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix
+++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libutf8proc";
-  version = "1.3.1";
+  version = "2.4.0-1";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0xf659y3c6ikjnip47r30wv796a34d71p6qhc4xjs64iqszm1sbq";
+    sha256 = "0wn409laqaqlqnz2d77419b5rya99vvc696vj187biy1i5livaq1";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e286d97a49954d3b2f0bba7ffdd476412d549405 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:11:15 -0400
Subject: [PATCH 085/562] netsurf.libwapcaplet: 0.3.0 -> 0.4.2

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

diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
index 509cbeb4503..a234af740f3 100644
--- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
+++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "netsurf-${libname}-${version}";
   libname = "libwapcaplet";
-  version = "0.3.0";
+  version = "0.4.2";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
-    sha256 = "0cs1dd2afjgc3wf5gqg434hv6jdabrp9qvlpl4dp53nhkyfywna3";
+    sha256 = "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86";
   };
 
   buildInputs = [ buildsystem ];

From af982f6f3734aeac2fd88ddb43583a9b7340b379 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:11:41 -0400
Subject: [PATCH 086/562] netsurf.nsgenbind: 0.3 -> 0.7

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

diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index 971e16848ae..f343a886283 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "netsurf-nsgenbind-${version}";
-  version = "0.3";
+  version = "0.7";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz";
-    sha256 = "16xsazly7gxwywmlkf2xix9b924sj3skhgdak7218l0nc62a08gg";
+    sha256 = "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq";
   };
 
   buildInputs = [ buildsystem flex bison ];

From cec6c83595e000749a064b1bb8618025af2f4eee Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 20:12:39 -0400
Subject: [PATCH 087/562] netsurf: 3.5 -> 3.9

---
 .../misc/netsurf/browser/default.nix            | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 1b800f65434..63cf88d0829 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
-, libxml2, libidn, perl, nettools, perlPackages
+, libxml2, libidn, perl, nettools, perlPackages, xxd
 , libXcursor, libXrandr, makeWrapper
 , uilib ? "framebuffer"
 , buildsystem
@@ -14,21 +14,28 @@
 , libnsgif
 , libnsutils
 , libutf8proc
+, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
 
   name = "netsurf-${version}";
-  version = "3.5";
+  version = "3.9";
 
   # UI libs incldue Framebuffer, and gtk
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
-    sha256 = "1k0x8mzgavfy7q9kywl6kzsc084g1xlymcnsxi5v6jp279nsdwwq";
+    sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+    xxd
+  ] ++ stdenv.lib.optionals (uilib == "gtk") [
+    wrapGAppsHook
+  ];
+
   buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl
     nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL
     buildsystem
@@ -63,7 +70,7 @@ stdenv.mkDerivation rec {
     cmd=$(case "${uilib}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac)
     cp $cmd $out/bin/netsurf
     wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${uilib}/res
-    tar -hcf - ${uilib}/res | (cd $out/share/Netsurf/ && tar -xvpf -)
+    tar -hcf - frontends/${uilib}/res | (cd $out/share/Netsurf/ && tar -xvpf -)
   '';
 
   meta = with stdenv.lib; {

From df952a21ef6d6af402f42c60cbf75b954e822a1c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 21:06:10 -0400
Subject: [PATCH 088/562] netsurf.libnslog: init at 0.1.2

---
 .../misc/netsurf/libnslog/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libnslog/default.nix

diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/misc/netsurf/libnslog/default.nix
new file mode 100644
index 00000000000..497630c9aa6
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libnslog/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, bison, flex
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libnslog";
+  version = "0.1.2";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd";
+  };
+
+  nativeBuildInputs = [ pkgconfig bison flex ];
+  buildInputs = [
+    buildsystem
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.netsurf-browser.org/;
+    description = "NetSurf Parametric Logging Library";
+    license = licenses.mit;
+    maintainers = [ maintainers.samueldr ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6903fc15ef1..cdaf88dbc0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4265,6 +4265,8 @@ in
 
     libparserutils = callPackage ../applications/misc/netsurf/libparserutils { };
 
+    libnslog = callPackage ../applications/misc/netsurf/libnslog { };
+
     libcss = callPackage ../applications/misc/netsurf/libcss { };
 
     libhubbub = callPackage ../applications/misc/netsurf/libhubbub { };

From 08cde7620d92612c0a922c253c639b11b5551fe6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 21:06:31 -0400
Subject: [PATCH 089/562] netsurf.libsvgtiny: init at 0.1.7

---
 .../misc/netsurf/libsvgtiny/default.nix       | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libsvgtiny/default.nix

diff --git a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix
new file mode 100644
index 00000000000..9a4f922c2b6
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, gperf
+, buildsystem
+, libdom
+, libhubbub
+, libparserutils
+, libwapcaplet
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libsvgtiny";
+  version = "0.1.7";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c";
+  };
+
+  nativeBuildInputs = [ pkgconfig gperf ];
+  buildInputs = [
+    buildsystem
+    libdom
+    libhubbub
+    libparserutils
+    libwapcaplet
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.netsurf-browser.org/;
+    description = "NetSurf SVG decoder";
+    license = licenses.mit;
+    maintainers = [ maintainers.samueldr ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdaf88dbc0a..3b00a90b106 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4281,6 +4281,8 @@ in
 
     libnsutils = callPackage ../applications/misc/netsurf/libnsutils { };
 
+    libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { };
+
     libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { };
 
     browser = callPackage ../applications/misc/netsurf/browser { };

From c405588b7c531829569017657cbc5e4a0cba5213 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 21:06:59 -0400
Subject: [PATCH 090/562] netsurf.libnspsl: init at 0.1.5

---
 .../misc/netsurf/libnspsl/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/netsurf/libnspsl/default.nix

diff --git a/pkgs/applications/misc/netsurf/libnspsl/default.nix b/pkgs/applications/misc/netsurf/libnspsl/default.nix
new file mode 100644
index 00000000000..f0abbdc049a
--- /dev/null
+++ b/pkgs/applications/misc/netsurf/libnspsl/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig
+, buildsystem
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "netsurf-${libname}-${version}";
+  libname = "libnspsl";
+  version = "0.1.5";
+
+  src = fetchurl {
+    url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz";
+    sha256 = "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    buildsystem
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.netsurf-browser.org/;
+    description = "NetSurf Public Suffix List - Handling library";
+    license = licenses.mit;
+    maintainers = [ maintainers.samueldr ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b00a90b106..e3189e414ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4283,6 +4283,8 @@ in
 
     libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { };
 
+    libnspsl = callPackage ../applications/misc/netsurf/libnspsl { };
+
     libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { };
 
     browser = callPackage ../applications/misc/netsurf/browser { };

From 268100414f1171bc5e0a04769a812fed7b15bc07 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 24 Jul 2019 21:24:08 -0400
Subject: [PATCH 091/562] netsurf: enables more first-party libraries

---
 pkgs/applications/misc/netsurf/browser/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 63cf88d0829..fb5d1179e5c 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -1,18 +1,22 @@
 { stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
 , libxml2, libidn, perl, nettools, perlPackages, xxd
 , libXcursor, libXrandr, makeWrapper
+, libwebp
 , uilib ? "framebuffer"
 , buildsystem
 , nsgenbind
 , libnsfb
 , libwapcaplet
 , libparserutils
+, libnslog
 , libcss
 , libhubbub
 , libdom
 , libnsbmp
 , libnsgif
+, libsvgtiny
 , libnsutils
+, libnspsl
 , libutf8proc
 , wrapGAppsHook
 }:
@@ -38,17 +42,21 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl
     nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL
+    libwebp
     buildsystem
     nsgenbind
     libnsfb
     libwapcaplet
     libparserutils
+    libnslog
     libcss
     libhubbub
     libdom
     libnsbmp
     libnsgif
+    libsvgtiny
     libnsutils
+    libnspsl
     libutf8proc
  ];
 

From 7fef2245382e0ba1df265a15f025a6bf81f06e57 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 2 Aug 2019 21:48:07 -0400
Subject: [PATCH 092/562] netsurf: backport patch resolving SSL issue

---
 pkgs/applications/misc/netsurf/browser/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index fb5d1179e5c..e9178c3796e 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
 , libxml2, libidn, perl, nettools, perlPackages, xxd
 , libXcursor, libXrandr, makeWrapper
 , libwebp
@@ -33,6 +33,15 @@ stdenv.mkDerivation rec {
     sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
   };
 
+  patches = [
+    # GTK: prefer using curl's intrinsic defaults for CURLOPT_CA*
+    (fetchpatch {
+	  name = "0001-GTK-prefer-using-curl-s-intrinsic-defaults-for-CURLO.patch";
+      url = "http://source.netsurf-browser.org/netsurf.git/patch/?id=87177d8aa109206d131e0d80a2080ce55dab01c7";
+      sha256 = "08bc60pc5k5qpckqv21zgmgszj3rpwskfc84shs8vg92vkimv2ai";
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     xxd

From e7903f2087d730a48d778193fba56a32a0033243 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 2 Aug 2019 19:00:25 -0700
Subject: [PATCH 093/562] pythonPackages.paramiko: 2.4.2 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index a1ecced51eb..7ea4a5ee533 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "paramiko";
-  version = "2.4.2";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a8975a7df3560c9f1e2b43dc54ebd40fd00a7017392ca5445ce7df409f900fcb";
+    sha256 = "0h9hb2kp07zdfbanad527ll90n9ji7isf7m39jyp0sr21pxfvcpl";
   };
 
   checkInputs = [ pytest mock pytest-relaxed ];

From d53399e1b31dc79a003e569d27900466a0b313c9 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 2 Aug 2019 22:03:10 -0400
Subject: [PATCH 094/562] netsurf: only wrap one time for GTK build

---
 pkgs/applications/misc/netsurf/browser/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index e9178c3796e..db39e97018a 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -86,10 +86,17 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin $out/share/Netsurf/${uilib}
     cmd=$(case "${uilib}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac)
     cp $cmd $out/bin/netsurf
-    wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${uilib}/res
     tar -hcf - frontends/${uilib}/res | (cd $out/share/Netsurf/ && tar -xvpf -)
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set NETSURFRES $out/share/Netsurf/${uilib}/res
+    )
+  '' + stdenv.lib.optionalString (uilib != "gtk") ''
+    wrapProgram $out/bin/netsurf "''${gappsWrapperArgs[@]}"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.netsurf-browser.org/;
     description = "Free opensource web browser";

From 53d094bc8b2b8dc05a7834100cee4367ef720fe6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 3 Aug 2019 00:27:36 -0400
Subject: [PATCH 095/562] netsurf: Removes unneeded things

Also fixes native build inputs
---
 pkgs/applications/misc/netsurf/browser/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index db39e97018a..55cb329fbe9 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
-, libxml2, libidn, perl, nettools, perlPackages, xxd
 , libXcursor, libXrandr, makeWrapper
 , libwebp
+, libxml2, libidn, perl, perlPackages, xxd
 , uilib ? "framebuffer"
-, buildsystem
 , nsgenbind
 , libnsfb
 , libwapcaplet
@@ -26,8 +25,6 @@ stdenv.mkDerivation rec {
   name = "netsurf-${version}";
   version = "3.9";
 
-  # UI libs incldue Framebuffer, and gtk
-
   src = fetchurl {
     url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz";
     sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp";
@@ -43,16 +40,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    perl
+    perlPackages.HTMLParser
     pkgconfig
     xxd
   ] ++ stdenv.lib.optionals (uilib == "gtk") [
     wrapGAppsHook
   ];
 
-  buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl
-    nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL
+  buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn
+    libXcursor libXrandr makeWrapper SDL
     libwebp
-    buildsystem
     nsgenbind
     libnsfb
     libwapcaplet
@@ -78,7 +76,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=$(out)"
-    "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
     "TARGET=${uilib}"
   ];
 

From a0fe9f401dc1487162bcb4ed4686a303712b1a8b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 3 Aug 2019 00:54:18 -0400
Subject: [PATCH 096/562] netsurf: cleanup derivation + reformat

---
 .../misc/netsurf/browser/default.nix          | 98 ++++++++-----------
 1 file changed, 42 insertions(+), 56 deletions(-)

diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 55cb329fbe9..0bb86fdca95 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -1,25 +1,33 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, openssl, curl, gtk2, check, SDL
-, libXcursor, libXrandr, makeWrapper
-, libwebp
-, libxml2, libidn, perl, perlPackages, xxd
+{ stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook
+
+# Buildtime dependencies.
+
+, check, pkgconfig, xxd
+
+# Runtime dependencies.
+
+, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2
+, openssl, perl, perlPackages
+
+# uilib-specific dependencies
+
+, gtk2 # GTK 2
+, SDL  # Framebuffer
+
+# Configuration
+
 , uilib ? "framebuffer"
-, nsgenbind
-, libnsfb
-, libwapcaplet
-, libparserutils
-, libnslog
-, libcss
-, libhubbub
-, libdom
-, libnsbmp
-, libnsgif
-, libsvgtiny
-, libnsutils
-, libnspsl
-, libutf8proc
-, wrapGAppsHook
+
+# Netsurf-specific dependencies
+
+, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif
+, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc
+, libwapcaplet, nsgenbind
 }:
 
+let
+  inherit (stdenv.lib) optional optionals;
+in
 stdenv.mkDerivation rec {
 
   name = "netsurf-${version}";
@@ -40,60 +48,38 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    makeWrapper
     perl
     perlPackages.HTMLParser
     pkgconfig
     xxd
-  ] ++ stdenv.lib.optionals (uilib == "gtk") [
-    wrapGAppsHook
-  ];
+  ]
+  ++ optional (uilib == "gtk") wrapGAppsHook
+  ;
 
-  buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn
-    libXcursor libXrandr makeWrapper SDL
-    libwebp
-    nsgenbind
-    libnsfb
-    libwapcaplet
-    libparserutils
-    libnslog
-    libcss
-    libhubbub
-    libdom
-    libnsbmp
-    libnsgif
-    libsvgtiny
-    libnsutils
-    libnspsl
+  buildInputs = [ 
+    check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl
+    # Netsurf-specific libraries
+    nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss
+    libhubbub libdom libnsbmp libnsgif libsvgtiny libnsutils libnspsl
     libutf8proc
- ];
+  ]
+  ++ optionals (uilib == "framebuffer") [ expat SDL ]
+  ++ optional (uilib == "gtk") gtk2
+  ;
 
   preConfigure = ''
     cat <<EOF > Makefile.conf
-    override NETSURF_GTK_RESOURCES := $out/share/Netsurf/${uilib}/res
+    override NETSURF_GTK_RES_PATH  := $out/share/
     override NETSURF_USE_GRESOURCE := YES
     EOF
   '';
 
   makeFlags = [
-    "PREFIX=$(out)"
+    "PREFIX=${placeholder "out"}"
     "TARGET=${uilib}"
   ];
 
-  installPhase = ''
-    mkdir -p $out/bin $out/share/Netsurf/${uilib}
-    cmd=$(case "${uilib}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac)
-    cp $cmd $out/bin/netsurf
-    tar -hcf - frontends/${uilib}/res | (cd $out/share/Netsurf/ && tar -xvpf -)
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --set NETSURFRES $out/share/Netsurf/${uilib}/res
-    )
-  '' + stdenv.lib.optionalString (uilib != "gtk") ''
-    wrapProgram $out/bin/netsurf "''${gappsWrapperArgs[@]}"
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://www.netsurf-browser.org/;
     description = "Free opensource web browser";

From af70ce28731393dfd1151d7109689ada4708033e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 1 Aug 2019 15:23:27 -0700
Subject: [PATCH 097/562] pythonPackages.simplejson: 3.16.0 -> 3.16.1

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

diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 9e80830f438..abd4854c73f 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -1,18 +1,20 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , stdenv
 , pytest
 }:
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.16.0";
+  version = "3.16.1";
   doCheck = !stdenv.isDarwin;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq";
   };
 
   # Package does not need pytest, but its a bit easier debugging.

From 257c6529b1d6feefe118e150b3ed15c9cf005aa0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Aug 2019 07:52:10 +0200
Subject: [PATCH 098/562] Revert "pythonPackages.simplejson: 3.16.0 -> 3.16.1"

Mass-rebuild, should go to staging.

This reverts commit af70ce28731393dfd1151d7109689ada4708033e.
---
 .../python-modules/simplejson/default.nix            | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index abd4854c73f..9e80830f438 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -1,20 +1,18 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , stdenv
 , pytest
 }:
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.16.1";
+  version = "3.16.0";
   doCheck = !stdenv.isDarwin;
 
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5";
   };
 
   # Package does not need pytest, but its a bit easier debugging.

From 658c0f0ce9ff56b76f1ad459d44c570c49f8a508 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Aug 2019 08:13:38 +0200
Subject: [PATCH 099/562] python38: 3.8.0b2 -> 3.8.0b3

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

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 42fcae5e179..b3b506783cd 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -104,9 +104,9 @@ in {
       major = "3";
       minor = "8";
       patch = "0";
-      suffix = "b2";
+      suffix = "b3";
     };
-    sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl";
+    sha256 = "03wq85pkpr9j56k3zg6whahc5park1pzshbakl7y50lzrkpq2ynd";
     inherit (darwin) CF configd;
     inherit passthruFun;
   };

From 58e0c7b8ced63971b3bb4e65f0592e06655b83bc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 26 Jul 2019 16:27:30 +0000
Subject: [PATCH 100/562] coqPackages.coquelicot: 3.0.2 -> 3.0.3

Ensures compatibility with Coq 8.10
---
 .../coq-modules/coquelicot/default.nix        | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index e316a8b792d..3b916b5e40b 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -1,10 +1,23 @@
 { stdenv, fetchurl, which, coq, ssreflect }:
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-coquelicot-3.0.2";
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/37523/coquelicot-3.0.2.tar.gz";
+let param =
+  if stdenv.lib.versionAtLeast coq.coq-version "8.8"
+  then {
+    version = "3.0.3";
+    uid = "38105";
+    sha256 = "0y52lqx1jphv6fwf0d702vzprxmfmxggnh1hy3fznxyl4isfpg4j";
+  } else {
+    version = "3.0.2";
+    uid = "37523";
     sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w";
+  }
+; in
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-coquelicot-${param.version}";
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/coquelicot-${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
   nativeBuildInputs = [ which ];
@@ -24,7 +37,7 @@ stdenv.mkDerivation {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ];
   };
 
 }

From dc5584adeabc4ca369ec98107778e4ab4758152f Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Sat, 3 Aug 2019 00:51:17 -0700
Subject: [PATCH 101/562] matomo: 3.9.1 -> 3.10.0 (#64848)

* matomo: 3.9.1 -> 3.10.0
---
 pkgs/servers/web-apps/matomo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 17cb8be739f..9c1e01745a8 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, php }:
 
 stdenv.mkDerivation rec {
-  name = "matomo-${version}";
-  version = "3.9.1";
+  pname = "matomo";
+  version = "3.10.0";
 
   src = fetchurl {
     url = "https://builds.matomo.org/matomo-${version}.tar.gz";
-    sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp";
+    sha256 = "1mzqn2wh63ffzv6436cr8shl40nlj8sazsj2j37lx9pkz89n2wjz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     cp -ra * $out/share/
     # tmp/ is created by matomo in PIWIK_USER_PATH
     rmdir $out/share/tmp
-    # config/ needs to be copied to PIWIK_USER_PATH anyway
-    mv $out/share/config $out/
+    # config/ needs to be accessed by PIWIK_USER_PATH anyway
+    ln -s $out/share/config $out/
 
     makeWrapper ${php}/bin/php $out/bin/matomo-console \
       --add-flags "$out/share/console"

From c40512654cb8480ba14e0e2e18d0533df25b33e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 3 Aug 2019 11:03:21 +0200
Subject: [PATCH 102/562] drawio: 10.9.5 -> 11.1.1

Changelog:

https://github.com/jgraph/drawio-desktop/releases/tag/v11.1.1
---
 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 a6c067bc6eb..02af754a72c 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 = "10.9.5";
+  version = "11.1.1";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
-    sha256 = "13687d5bfxj7wlbh5j13pvxvs69whlg820wllk3pb1xb3syynlpn";
+    sha256 = "1jibkxx00rma641c3xr7720qj9slqsvhbpi7nawi6f2f91gzyc10";
   };
 
   nativeBuildInputs = [

From 6600dd177be265044f0caba8b5beb3dbc7e3be1a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Aug 2019 04:20:00 -0500
Subject: [PATCH 103/562] twitterBootstrap3: drop

Bootstrap 3 has reached EOL in July 24, 2019. See: https://blog.getbootstrap.com/2019/07/24/lts-plan/
---
 pkgs/development/web/twitter-bootstrap/3.nix | 26 --------------------
 pkgs/top-level/all-packages.nix              |  4 +--
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 pkgs/development/web/twitter-bootstrap/3.nix

diff --git a/pkgs/development/web/twitter-bootstrap/3.nix b/pkgs/development/web/twitter-bootstrap/3.nix
deleted file mode 100644
index 71cda3d3d9f..00000000000
--- a/pkgs/development/web/twitter-bootstrap/3.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "bootstrap-${version}";
-  version = "3.4.1";
-
-  src = fetchurl {
-    url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip";
-    sha256 = "0bnrxyryl4kyq250k4n2lxgkddfs9lxhqd6gq8x3kg9wfz7r75yl";
-  };
-
-  buildInputs = [ unzip ];
-
-  dontBuild = true;
-  installPhase = ''
-    mkdir $out
-    cp -r * $out/
-  '';
-
-  meta = {
-    description = "Front-end framework for faster and easier web development";
-    homepage = https://getbootstrap.com/;
-    license = stdenv.lib.licenses.mit;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9235c30ffb..1a2a88705d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6481,9 +6481,7 @@ in
     libX11 = xorg.libX11;
   };
 
-  twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/3.nix {};
-  twitterBootstrap4 = callPackage ../development/web/twitter-bootstrap {};
-  twitterBootstrap = twitterBootstrap3;
+  twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
 
   txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; };
 

From f8a50fcca314e03feafcc15039f91fb829292fb1 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Fri, 2 Aug 2019 18:58:47 +0200
Subject: [PATCH 104/562] litecli: 1.0.0 -> 1.1.0

Fixes the tests.
---
 pkgs/development/tools/database/litecli/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix
index cbf1af44057..8881bce1a38 100644
--- a/pkgs/development/tools/database/litecli/default.nix
+++ b/pkgs/development/tools/database/litecli/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "litecli";
-  version = "1.0.0";
+  version = "1.1.0";
 
   # Python 2 won't have prompt_toolkit 2.x.x
   # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
@@ -10,15 +10,9 @@ python3Packages.buildPythonApplication rec {
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0s5a6r5q09144cc5169snwis5i2jrh3z2g4mw9wi2fsjxyhgpwq5";
+    sha256 = "0cqil2cmnbw0jvb14v6kbr7l9yarfgy253cbb8v9znp0l4qfs7ra";
   };
 
-  # fixes tests https://github.com/dbcli/litecli/pull/53
-  postPatch = ''
-    substituteInPlace litecli/main.py \
-      --replace 'except FileNotFoundError:' 'except (FileNotFoundError, OSError):'
-  '';
-
   propagatedBuildInputs = with python3Packages; [
     cli-helpers
     click

From eeb029c27522164c914e2b831f66204d3f85718e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 3 Aug 2019 11:54:07 +0200
Subject: [PATCH 105/562] Revert "spotify: 1.0.96.181 -> 1.1.10.546" (#65833)

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index f7b24aa2824..77aa7994994 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
 , glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
-, at-spi2-atk, at-spi2-core, apulse
+, at-spi2-atk
 }:
 
 let
@@ -10,22 +10,20 @@ let
   # If an update breaks things, one of those might have valuable info:
   # https://aur.archlinux.org/packages/spotify/
   # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.1.10.546.ge08ef575-19";
+  version = "1.0.96.181.gf6bc1b6b-12";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
   # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "36";
+  rev = "30";
 
 
   deps = [
     alsaLib
-    apulse
     atk
     at-spi2-atk
-    at-spi2-core
     cairo
     cups
     curl
@@ -74,7 +72,7 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f";
+    sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];
@@ -136,8 +134,6 @@ stdenv.mkDerivation {
       librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
       wrapProgram $out/share/spotify/spotify \
         --prefix LD_LIBRARY_PATH : "$librarypath" \
-        --prefix LD_LIBRARY_PATH : "${apulse}/lib/apulse" \
-        --set APULSE_PLAYBACK_DEVICE plug:dmix \
         --prefix PATH : "${gnome3.zenity}/bin"
 
       # fix Icon line in the desktop file (#48062)
@@ -162,7 +158,7 @@ stdenv.mkDerivation {
     homepage = https://www.spotify.com/;
     description = "Play music from the Spotify music service";
     license = licenses.unfree;
-    maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau angristan ];
+    maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ];
     platforms = [ "x86_64-linux" ];
   };
 }

From ab9a1eb009d7f378376694393eb05196b7fc4d0e Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Sat, 3 Aug 2019 12:36:11 +0200
Subject: [PATCH 106/562] jetbrains.datagrip: 2019.1.4 -> 2019.2.1

---
 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 eb6bbabdea4..8e2ee8b51e2 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.1.4"; /* updated by script */
+    version = "2019.2.1"; /* 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 = "0zjcn71fgngkvsixgimzm5afwjbd8zf14zzm6barap4pwp5xx0hb"; /* updated by script */
+      sha256 = "0va5dcvjxq7mlkz0di5zl1ra5gv6cls3wy40fvkpm2vlirg0m31s"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";

From 6ef1949187505a8a956d95594082ec6496ae89e7 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Sat, 3 Aug 2019 12:37:02 +0200
Subject: [PATCH 107/562] jetbrains.ruby-mine: 2019.1.2 -> 2019.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 8e2ee8b51e2..844999b0366 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2019.1.2"; /* updated by script */
+    version = "2019.2"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "1zhci8nkywv66bwc6hbyh4h3x61qhv2fbmfb5gkw9znkk1qa0q6v"; /* updated by script */
+      sha256 = "1f4mdarmh7m9jq432d0s9jds9288g0zgpxnlpmx12i26vvq8kykd"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";

From 48a72e1979a3868b0164ba28897a554ade182a84 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 3 Aug 2019 12:43:33 +0200
Subject: [PATCH 108/562] vimPlugins: update (#65834)

---
 pkgs/misc/vim-plugins/generated.nix | 138 ++++++++++++++--------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 41c73577df7..7ad6283c930 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2019-07-30";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "8f5ecf01200f82d12d452992a92c23fcf9e0f0e8";
-      sha256 = "0yb9d1wh5b1g53bg5rjwf84m140rpsdb6i5rnp28a1w24330vxhg";
+      rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857";
+      sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj";
     };
   };
 
@@ -182,12 +182,12 @@ let
 
   calendar-vim = buildVimPluginFrom2Nix {
     pname = "calendar-vim";
-    version = "2019-07-20";
+    version = "2019-07-30";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "cf9ddfe0eb36a4d57a1240735360385e3ed5534c";
-      sha256 = "0504wl874fr0lzv48l8khfrx4l59c6bklndvrgmf5xj9ppz72hza";
+      rev = "f8ba659ba6a094d000f355807efb71f7975d10f0";
+      sha256 = "16np6mkmn7h4rx9471yqy4k89m6w9v1gz1cyphlwn90gzm8f97xz";
     };
   };
 
@@ -314,12 +314,12 @@ let
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2019-05-24";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "2393c9860927e91874f6d13174cc1edeec758d9c";
-      sha256 = "1szq2nr3gppza2rq8b6kh4a8f3h831gzbnbnv45ycrcyplb4w2sy";
+      rev = "6a4b1485dbbd1e4bbc18a03beaeebe3cc6018e8f";
+      sha256 = "1nd9fph6yvg1n7cabd5li9qxs3b2g0v3q7qq1n1xmp3n49c5m0nr";
     };
   };
 
@@ -391,12 +391,12 @@ let
 
   coc-lists = buildVimPluginFrom2Nix {
     pname = "coc-lists";
-    version = "2019-07-22";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-lists";
-      rev = "24e00e54ca8f4e38303f02927694d09d0ddc0287";
-      sha256 = "0wjhdp4nym3f56h5bi923q46vp7c5d611fywamzva5sv5raainxq";
+      rev = "999865c6bd3745689d1eb4009b9b706cb5a68617";
+      sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy";
     };
   };
 
@@ -545,12 +545,12 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2019-07-21";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "f8ed02524da46c71e5c3b79e0707cbc6d66666f5";
-      sha256 = "1w7lz287b322zan6rqimcmypaf9vq3x0ix1ka9s63qzgnpwg7g1i";
+      rev = "8daf0e45d513ab3b9eb91e126e50c48b901d8cf9";
+      sha256 = "1zf75zahvcq5kcrpn5m69i0sj3dv4g2m8x3jffjqnx3cnirm42r4";
     };
   };
 
@@ -622,12 +622,12 @@ let
 
   command-t = buildVimPluginFrom2Nix {
     pname = "command-t";
-    version = "2019-06-28";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      rev = "4f86fcb812b07a3d691d4b617e093b001a6ad839";
-      sha256 = "06i02632q6rkq7xljfn70shlfb301l31sv8pd738anshf8qwkfff";
+      rev = "02a22d27e1c4671db32b0ded1fa2bb861c16d14c";
+      sha256 = "0aj9lnrd0v4296c8rwy4bp73dah0lx298yi6ybz3rma2gx9xss6c";
       fetchSubmodules = true;
     };
   };
@@ -788,12 +788,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2019-07-28";
+    version = "2019-08-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "00ce66260291d059386f1aac6ef707e6dbd0c13f";
-      sha256 = "174d78f5xxx2i040xqm8qmm8px3w06wnwcgmcvb0jjpy3blj2v3a";
+      rev = "85fa3ed3b430df61d1b8aeb8772162acfebc1f46";
+      sha256 = "1m7y3ph51wxcm3yasdg3ajxwm4bqdjq7ajg5c4f3d3xf8f2nkl87";
     };
   };
 
@@ -901,12 +901,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2019-07-29";
+    version = "2019-08-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "3267781440f62dc5070d9a8a2d25d926b0266403";
-      sha256 = "1w22b251l6wg9s90npvj04b45fyjh1rl60g7s9l5c44iqxc8aamw";
+      rev = "e8cab49ac99a5bb45e16a4bf24bb697163e7beaf";
+      sha256 = "1g03ybsjv7j5iad34bax949s29lxi89cs5i3g9h0ypg4if1c0g53";
     };
   };
 
@@ -1013,12 +1013,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2019-07-29";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "9db4ff975d5745aaa33ed52b6025dd24112b1007";
-      sha256 = "04lkw240kcsrc15qydxkbg57wqr41k530zc8pzxicr6axby6xjgc";
+      rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73";
+      sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn";
     };
   };
 
@@ -1477,12 +1477,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2019-07-25";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "f2a1f47c85a1341895c20e6dbc3a9440804eec1b";
-      sha256 = "0048c83fpf5snpwj913rsx7h8giymbb9k5ssjfaxcl8jfz3j6qdc";
+      rev = "d589eb55305043955e65df8f326580f06e4533c9";
+      sha256 = "0fvj8p5dh0gg9kxnn6shfyb84jmvv5f6wvh6fa0cgycy7xl1jrrk";
     };
   };
 
@@ -1675,12 +1675,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2019-07-28";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "673f9d571134299951250535402ac32ad713f8d5";
-      sha256 = "1jvyb6rdfd60c36vyxpkfh4cbwk8v6bhqpk5i384a6gxc7577f0v";
+      rev = "528b5e47ec9c29fbbd470f2af71b8ad994a96bdb";
+      sha256 = "09cq8a4ryhxvnpjvpbm0dq22ccqfmym59avxr4c0ablx1sqy9lhy";
     };
   };
 
@@ -1719,12 +1719,12 @@ let
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2019-07-21";
+    version = "2019-08-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "25dbe4ac607580fa05940dae24e544147d0bafeb";
-      sha256 = "19vbk47mxa7j4bznk4vbxqzlscbk9kfqrsp6ja6x6bv7xvnhs8wm";
+      rev = "c5b182d5831f298bde1d6ce9bf28ada62fb61157";
+      sha256 = "0diq8yhrs0359sajzd07ri0f985lgkl5959284pbjhv3r8vm22rc";
     };
   };
 
@@ -2137,12 +2137,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2019-07-26";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "18fef3b61ce18ad262ca014d11496457d8574df7";
-      sha256 = "0iwc4fjvrif2sdgmzp392lyr7q2n8c2kdwvdpam7q16cql0va1ry";
+      rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50";
+      sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf";
     };
   };
 
@@ -3094,12 +3094,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-07-26";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "8e046e365fb74309f2504e9a3bcb2234e17a371b";
-      sha256 = "074k4rf568489g2rw0vaf7al20qgwpsvm3pd5jh102ibqc5m3xp8";
+      rev = "c58708e820252d594541a86e31fbc95ec8d37e3e";
+      sha256 = "0py41f0dkvx95w8hb3a2cys981x8nz4a0nn3hs7rjv3z0brrsxfx";
     };
   };
 
@@ -3215,12 +3215,12 @@ let
 
   vim-fireplace = buildVimPluginFrom2Nix {
     pname = "vim-fireplace";
-    version = "2019-07-30";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fireplace";
-      rev = "76b4a30d6dfdb7f7e81a934a91c6810c6acf7787";
-      sha256 = "1pdf3r8an21fbh7pixmijw9m7fgkqfbwwgzbplaz3j6d123wqq4n";
+      rev = "5886fd272a7957fa2791c567866c7fc2b4dec73c";
+      sha256 = "11ygf520p7s7fj7gv1pnzv62ywa2afbm5kbkipbdwwnd4m90amzk";
     };
   };
 
@@ -3281,12 +3281,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2019-07-29";
+    version = "2019-08-03";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "a3ab24f68148c838597567e9cb88b81427f5ea60";
-      sha256 = "0kxagcy8sk98f89jgisnii03w4phpsggp9ypydcc66djpkygd8bv";
+      rev = "e5a6a8c5256c8afe2c607f8566e4ef35c43b5de2";
+      sha256 = "165vgx5h1qmkbir30a1hd5mym2d09wz0q556cwhipmypkyfnfzcp";
     };
   };
 
@@ -3358,12 +3358,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2019-07-30";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "8e9293f729cf13f21b6e5b48b5982492d5e5f655";
-      sha256 = "016zyh8j6i2d0qwcb7mw1cmcbp0i23sjf63crgmm00g645bn2cx8";
+      rev = "974fd4367cd327a075b79f6d9d7b71f3e84d7a4c";
+      sha256 = "1q8k9rgy191d502jl654nvlmh2nd5m2lq03l5ldyi2y6cgrd5k8d";
     };
   };
 
@@ -3810,12 +3810,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2019-07-30";
+    version = "2019-08-02";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "2cdd275bcc85962d3e8bbc2864210c7ed78019a9";
-      sha256 = "0y01kk0wbf419srp3g27078lc69czfdb2mnxmjff7kam1f9krzfv";
+      rev = "ad9d2bd0582419e902bc402545da397634202ed0";
+      sha256 = "12b46vcc8kw6nhp177vs8b4lwh0nd34a74j5vfa2wd5d3mhqz5j8";
     };
   };
 
@@ -4118,12 +4118,12 @@ let
 
   vim-projectionist = buildVimPluginFrom2Nix {
     pname = "vim-projectionist";
-    version = "2019-07-19";
+    version = "2019-07-29";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "e07013ac9ed5ff998c62f5fe12800eb31b083f12";
-      sha256 = "1bmcw4pawniwn01gvcxd98wp7pksd9ncqmiajvxb2pgnanpl5dk8";
+      rev = "94001f00825c36fab63b9f3ca47a204111e561a2";
+      sha256 = "0pppaavma07c3lxqlbk8cghdsirncxng52mjmv5qk8yar8kxqvbr";
     };
   };
 
@@ -4173,12 +4173,12 @@ let
 
   vim-racer = buildVimPluginFrom2Nix {
     pname = "vim-racer";
-    version = "2019-04-21";
+    version = "2019-07-30";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
-      rev = "4649e13a1f5a9c31781db570ac7de97e57dc0b3c";
-      sha256 = "07ywhrlhh5vvxrnwac05q75a0vjrmhdjvcql88qrxwg88na6db7i";
+      rev = "539e38c6ec0f747a9116452fe9ebd062222b89a3";
+      sha256 = "19kfhm32mspwvnvfl96hzl67h9jcmzwwl92c37rw38pqpnm1sy1l";
     };
   };
 
@@ -4690,12 +4690,12 @@ let
 
   vim-vue = buildVimPluginFrom2Nix {
     pname = "vim-vue";
-    version = "2019-07-29";
+    version = "2019-08-01";
     src = fetchFromGitHub {
       owner = "posva";
       repo = "vim-vue";
-      rev = "da6395c56b20514add2d9c8b0283aaabb96e54b1";
-      sha256 = "01r96pwamdnma9vbqvrrqy91sa18d3g8w85izaacfcfibh7q87bk";
+      rev = "fcdc2d25d19edf5f0dcf87bc2c5c7327190bf59b";
+      sha256 = "1lryy3kqihgm3sql686z3irwsr96ka0vj10bqfsdmjzk05h87yhb";
     };
   };
 
@@ -4822,12 +4822,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2019-07-30";
+    version = "2019-08-03";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "35292b2f4b29300102db97db2c5d4c82add1711f";
-      sha256 = "0y4z9zpl2fg9dwzzz697nq1iw2jxxdc1gzbak77fdkbywx7lpymy";
+      rev = "b2385ed9016442a27c8ce028ab566de864ee1910";
+      sha256 = "0q2w8jhnpfzr49bqpmgya31w55pi7zvr41ar6maqchqi9fns25gf";
     };
   };
 
@@ -4932,12 +4932,12 @@ let
 
   xptemplate = buildVimPluginFrom2Nix {
     pname = "xptemplate";
-    version = "2017-12-06";
+    version = "2019-07-31";
     src = fetchFromGitHub {
       owner = "drmingdrmer";
       repo = "xptemplate";
-      rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3";
-      sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p";
+      rev = "e8c0d74b1308415dfebadaf58ba94b2d34aecec2";
+      sha256 = "0x3c9f3vpkwnmshbmwg4lddivssx6s4f3b3px6nf4cxd0lbm4j9l";
     };
   };
 

From 7c8e7aaa4dcf30d24750e63ac8fa3dcc08b9ea70 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 2 Aug 2019 12:10:00 +0200
Subject: [PATCH 109/562] runwayml: init at 0.8.1

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

diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix
new file mode 100644
index 00000000000..6fa8efbf68c
--- /dev/null
+++ b/pkgs/applications/graphics/runwayml/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, fetchurl
+, appimageTools
+, symlinkJoin
+}:
+
+let
+  pname = "runwayml";
+  version = "0.8.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage";
+    sha256 = "0pqnlwk804cly2x9kph39g9ps5dv75ybi2v1fgrvmhk3wbmwmpb0";
+    name="${pname}-${version}.AppImage";
+  };
+
+  binary = appimageTools.wrapType2 {
+    name = "${pname}";
+    inherit src;
+  };
+  # we only use this to extract the icon
+  appimage-contents = appimageTools.extractType2 {
+    inherit name src;
+  };
+
+in
+  symlinkJoin {
+    inherit name;
+    paths = [ binary ];
+
+    postBuild = ''
+      mkdir -p $out/share/pixmaps/ $out/share/applications
+      cp ${appimage-contents}/usr/share/icons/hicolor/1024x1024/apps/runway.png $out/share/pixmaps/runway.png
+      sed 's:Exec=AppRun:Exec=runwayml:' ${appimage-contents}/runway.desktop > $out/share/applications/runway.desktop
+    '';
+
+  meta = with lib; {
+    description = "Machine learning for creators";
+    homepage = https://runwayml.com/;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ prusnak ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b082ccf7c9..ffba555b289 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24572,4 +24572,6 @@ in
   kube3d =  callPackage ../applications/networking/cluster/kube3d {};
 
   zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
+
+  runwayml = callPackage ../applications/graphics/runwayml {};
 }

From 47c63da51d09cc26ef1cc7ddadd56a7a7b28c833 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Sat, 3 Aug 2019 13:18:40 +0200
Subject: [PATCH 110/562] yubikey-personalization-gui: use qt wrapped
 mkDerivation

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

diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 405ff745baa..5b0ad830b19 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
+{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "yubikey-personalization-gui-3.1.25";
 
   src = fetchurl {

From 14e3ee4860be2d1828501ceb60cc5ac1102a3399 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 3 Aug 2019 07:11:47 -0400
Subject: [PATCH 111/562] flare: 1.10 -> 1.11

---
 pkgs/games/flare/default.nix | 2 +-
 pkgs/games/flare/engine.nix  | 4 ++--
 pkgs/games/flare/game.nix    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix
index 5ae656d1fc1..28d8a17638a 100644
--- a/pkgs/games/flare/default.nix
+++ b/pkgs/games/flare/default.nix
@@ -1,7 +1,7 @@
 { lib, buildEnv, callPackage, makeWrapper }:
 
 buildEnv {
-  name = "flare-1.10";
+  name = "flare-1.11";
 
   paths = [
     (callPackage ./engine.nix {})
diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix
index 8b620835f85..526951921db 100644
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flare-engine";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fm7jmxl86h8199nazdi9ivsrhcv9gcymhz1l5c6l2f4d0aqdqiq";
+    sha256 = "1j6raymz128miq517h9drks4gj79dajw3lsr0msqxz0z3zm6cc4n";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix
index b10d7dfedb0..6a231a5ff7d 100644
--- a/pkgs/games/flare/game.nix
+++ b/pkgs/games/flare/game.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flare-game";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lfra4ww8za08vcgza2jvh3jrwi6zryk4ljyj32lpp9v4ws9hdh4";
+    sha256 = "18m2qfbbaqklm20gnr7wzrwbmylp1jh781a4p1dq0hymqcg92x5l";
   };
 
   nativeBuildInputs = [ cmake ];

From 567f5beb1deb4eaaac227ad93452e1e0c3945ae0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 2 Aug 2019 14:49:18 -0700
Subject: [PATCH 112/562] pythonPackages.jsonpickle: 1.1 -> 1.2

---
 .../development/python-modules/jsonpickle/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix
index a6ef8e3e1fb..d21864d2682 100644
--- a/pkgs/development/python-modules/jsonpickle/default.nix
+++ b/pkgs/development/python-modules/jsonpickle/default.nix
@@ -1,18 +1,21 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "jsonpickle";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1";
+    sha256 = "16xj4r31pnd90slax5mmd5wps5s73wp9mn6sy9nhkl5ih7bj5sfk";
   };
 
-  doCheck = false;
+  checkInputs = [ pytest ];
+
+  checkPhase = "pytest tests/jsonpickle_test.py";
 
   meta = {
     description = "Python library for serializing any arbitrary object graph into JSON";
@@ -20,4 +23,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
   };
 
-}
\ No newline at end of file
+}

From 3c1458c065c2fd94021b24b1cc2ad2308eb1fd7f Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 3 Aug 2019 08:12:24 -0400
Subject: [PATCH 113/562] flare: add darwin support

---
 pkgs/games/flare/default.nix    | 4 ++--
 pkgs/games/flare/engine.nix     | 5 +++--
 pkgs/top-level/all-packages.nix | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix
index 28d8a17638a..551276b1b25 100644
--- a/pkgs/games/flare/default.nix
+++ b/pkgs/games/flare/default.nix
@@ -1,10 +1,10 @@
-{ lib, buildEnv, callPackage, makeWrapper }:
+{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:
 
 buildEnv {
   name = "flare-1.11";
 
   paths = [
-    (callPackage ./engine.nix {})
+    (callPackage ./engine.nix { inherit Cocoa; })
     (callPackage ./game.nix {})
   ];
 
diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix
index 526951921db..74f983c6441 100644
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf }:
+{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, Cocoa }:
 
 stdenv.mkDerivation rec {
   pname = "flare-engine";
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ];
+  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]
+    ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
   meta = with stdenv.lib; {
     description = "Free/Libre Action Roleplaying Engine";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d4295586fa..1b9e3dad000 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2997,7 +2997,9 @@ in
 
   flannel = callPackage ../tools/networking/flannel { };
 
-  flare = callPackage ../games/flare { };
+  flare = callPackage ../games/flare {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 

From 292b922ef2112e3398505bc544823fdcda94349e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 3 Aug 2019 14:39:52 +0200
Subject: [PATCH 114/562] androidStudioPackages.beta: 3.5.0.18 -> 3.5.0.19

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 63c6d26df8e..794a881090c 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "090rc307mfm0yw4h592l9307lq4aas8zq0ci49csn6kxhds8rsrm";
   };
   betaVersion = {
-    version = "3.5.0.18"; # "Android Studio 3.5 RC 1"
-    build = "191.5717577";
-    sha256Hash = "1p0w7xrfk33m1wvwnc3s3s7w9rm8wn9b3bjn566w2qpjv5ngdkn3";
+    version = "3.5.0.19"; # "Android Studio 3.5 RC 2"
+    build = "191.5763348";
+    sha256Hash = "0z7mjpk0cqwk4ysd3cdsahlg70ax90353qvvag9wgyzl2x2sr6d2";
   };
   latestVersion = { # canary & dev
     version = "3.6.0.3"; # "Android Studio 3.6 Canary 3"

From 854b43404f5c3a62ca1aeafc34a6860980fb3dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 3 Aug 2019 14:31:19 +0200
Subject: [PATCH 115/562] wire-desktop: fixup evaluation on other platforms

version (i.e. name) is evaluated strictly before meta.platforms, apparently,
so let's simply hack around that, so we may eventually fix the tarball job.
---
 .../networking/instant-messengers/wire-desktop/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 67d4e480110..69b8ae9ee0c 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -18,7 +18,7 @@ let
   version = {
     "x86_64-linux" = "3.9.2895";
     "x86_64-darwin" = "3.9.2943";
-  }.${system};
+  }.${system} or "";
 
   sha256 = {
     "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5";

From d80de1b135cf098d8acd134385400fe3956a59e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 3 Aug 2019 14:36:55 +0200
Subject: [PATCH 116/562] jvmci8: fix evaluation on darwin

It's not my aim to fix the build, just unblock eval and thus the tarball job.
---
 pkgs/development/compilers/graalvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index b47f94fdf9a..be03e1aeeed 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -273,9 +273,9 @@ in rec {
       if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
       EOF
     '';
+    postFixup = openjdk.postFixup or null;
     dontStrip = true; # stripped javac crashes with "segmentaion fault"
     inherit (openjdk) meta;
-    inherit (openjdk) postFixup;
   };
 
   graalvm8 = stdenv.mkDerivation rec {

From da66614cb05b20172c068603c010f32536e6b6a4 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 25 Jul 2019 23:40:43 +0000
Subject: [PATCH 117/562] rednotebook: fix "Namespace Gtk not available" error

gobject-introspection setup hook looks at the packages at $hostOffset to
populate GI_TYPELIB_PATH. We need gtk3 to be there.
---
 pkgs/applications/editors/rednotebook/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 1b53bb7e7f0..8e118c9e9ac 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -30,6 +30,10 @@ buildPythonApplication rec {
     "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   ];
 
+  # Until gobject-introspection in nativeBuildInputs is supported.
+  # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643
+  strictDeps = false;
+
   meta = with lib; {
     homepage = http://rednotebook.sourceforge.net/;
     description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";

From f45a34ad06a60230432396cbff5ff28c9223aa2c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 3 Aug 2019 09:40:20 -0400
Subject: [PATCH 118/562] fwupd: wrap programs needed in PATH

---
 .../linux/firmware/fwupd/default.nix          | 13 +++--
 .../linux/firmware/fwupd/fix-paths.patch      | 52 -------------------
 2 files changed, 6 insertions(+), 59 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index a60417d8e23..e0d70b5d43e 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -39,12 +39,7 @@ in stdenv.mkDerivation rec {
   ];
 
   patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      inherit flashrom efibootmgr bubblewrap;
-      tpm2_tools = "${tpm2-tools}";
-    })
-
+    ./fix-paths.patch
     ./add-option-for-installation-sysconfdir.patch
 
     # installed tests are installed to different output
@@ -77,7 +72,11 @@ in stdenv.mkDerivation rec {
   # doCheck = true;
 
   preFixup = ''
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+      # See programs reached with fu_common_find_program_in_path in source
+      --prefix PATH : "${stdenv.lib.makeBinPath [ flashrom efibootmgr bubblewrap tpm2-tools ]}"
+    )
   '';
 
   mesonFlags = [
diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
index 51adef2e787..9efd7b8d6ab 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/fix-paths.patch
@@ -17,55 +17,3 @@ index 0cbb6f41..d757a81a 100755
 -    echo 'Creating stateful directory'
 -    mkdir -p ${DESTDIR}${LOCALSTATEDIR}/lib/fwupd
  #fi
-diff --git a/plugins/flashrom/fu-plugin-flashrom.c b/plugins/flashrom/fu-plugin-flashrom.c
-index 598e0c42..a0a2c4a7 100644
---- a/plugins/flashrom/fu-plugin-flashrom.c
-+++ b/plugins/flashrom/fu-plugin-flashrom.c
-@@ -52,7 +52,7 @@ fu_plugin_startup (FuPlugin *plugin, GError **error)
- 	g_autoptr(GError) error_local = NULL;
-
- 	/* we need flashrom from the host system */
--	data->flashrom_fn = fu_common_find_program_in_path ("flashrom", &error_local);
-+	data->flashrom_fn = fu_common_find_program_in_path ("@flashrom@/bin/flashrom", &error_local);
-
- 	/* search for devices */
- 	hwids = fu_plugin_get_hwids (plugin);
-diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c
-index 9293715c..e2e77c58 100644
---- a/plugins/uefi/fu-plugin-uefi.c
-+++ b/plugins/uefi/fu-plugin-uefi.c
-@@ -416,7 +416,7 @@ fu_plugin_update (FuPlugin *plugin,
- 	fu_plugin_add_report_metadata (plugin, "MissingCapsuleHeader", str);
-
- 	/* record boot information to system log for future debugging */
--	efibootmgr_path = fu_common_find_program_in_path ("efibootmgr", NULL);
-+	efibootmgr_path = fu_common_find_program_in_path ("@efibootmgr@/bin/efibootmgr", NULL);
- 	if (efibootmgr_path != NULL) {
- 		if (!g_spawn_command_line_sync ("efibootmgr -v",
- 						&boot_variables, NULL, NULL, error))
-diff --git a/plugins/uefi/fu-uefi-pcrs.c b/plugins/uefi/fu-uefi-pcrs.c
-index 5c7e5239..01acbf7f 100644
---- a/plugins/uefi/fu-uefi-pcrs.c
-+++ b/plugins/uefi/fu-uefi-pcrs.c
-@@ -147,7 +147,7 @@ fu_uefi_pcrs_setup (FuUefiPcrs *self, GError **error)
- 		/* old name, then new name */
- 		argv0 = fu_common_find_program_in_path ("tpm2_listpcrs", NULL);
- 		if (argv0 == NULL)
--			argv0 = fu_common_find_program_in_path ("tpm2_pcrlist", error);
-+			argv0 = fu_common_find_program_in_path ("@tpm2_tools@/bin/tpm2_pcrlist", error);
- 		if (argv0 == NULL)
- 			return FALSE;
- 		if (!fu_uefi_pcrs_setup_tpm20 (self, argv0, error))
-diff --git a/src/fu-common.c b/src/fu-common.c
-index bd6faeef..45ba2a60 100644
---- a/src/fu-common.c
-+++ b/src/fu-common.c
-@@ -436,7 +436,7 @@ fu_common_firmware_builder (GBytes *bytes,
- 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- 	/* find bwrap in the path */
--	bwrap_fn = fu_common_find_program_in_path ("bwrap", error);
-+	bwrap_fn = fu_common_find_program_in_path ("@bubblewrap@/bin/bwrap", error);
- 	if (bwrap_fn == NULL)
- 		return NULL;
-

From 3ab32ee8f63b90ebb2c662a0429cab55d7595a97 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Tue, 18 Jun 2019 19:01:38 -0700
Subject: [PATCH 119/562] framac: 18 -> 19 and update why3

---
 .../science/logic/why3/configure.patch        | 11 +++
 .../science/logic/why3/default.nix            | 33 +++++--
 .../science/logic/why3/with-provers.nix       | 30 ++++++
 .../tools/analysis/frama-c/default.nix        | 96 +++++++++----------
 .../tools/analysis/frama-c/dynamic.diff       | 12 ---
 pkgs/top-level/all-packages.nix               |  2 +-
 6 files changed, 112 insertions(+), 72 deletions(-)
 create mode 100644 pkgs/applications/science/logic/why3/configure.patch
 create mode 100644 pkgs/applications/science/logic/why3/with-provers.nix
 delete mode 100644 pkgs/development/tools/analysis/frama-c/dynamic.diff

diff --git a/pkgs/applications/science/logic/why3/configure.patch b/pkgs/applications/science/logic/why3/configure.patch
new file mode 100644
index 00000000000..3eebf3cf165
--- /dev/null
+++ b/pkgs/applications/science/logic/why3/configure.patch
@@ -0,0 +1,11 @@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -4029,7 +4029,6 @@ fi
+ 
+ if test "$USEOCAMLFIND" = yes; then
+    OCAMLFINDLIB=$(ocamlfind printconf stdlib)
+-   OCAMLFIND=$(which ocamlfind)
+    if test "$OCAMLFINDLIB" != "$OCAMLLIB"; then
+    USEOCAMLFIND=no;
+    echo "but your ocamlfind is not compatible with your ocamlc:"
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index a3b369ad54a..bd538dc6c75 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, ocamlPackages, coq }:
+{ callPackage, fetchurl, stdenv
+, ocamlPackages, coqPackages, rubber, hevea, emacs }:
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
@@ -9,14 +10,34 @@ stdenv.mkDerivation rec {
     sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348";
   };
 
-  buildInputs = (with ocamlPackages; [
-      ocaml findlib num lablgtk ocamlgraph zarith menhir ]) ++
-    stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocamlPackages.ocaml ) [
-      coq ocamlPackages.camlp5
-    ];
+  buildInputs = with ocamlPackages; [
+    ocaml findlib ocamlgraph zarith menhir
+    # Compressed Sessions
+    # Emacs compilation of why3.el
+    emacs
+    # Documentation
+    rubber hevea
+    # GUI
+    lablgtk
+    # WebIDE
+    js_of_ocaml js_of_ocaml-ppx
+    # Coq Support
+    coqPackages.coq coqPackages.flocq ocamlPackages.camlp5
+  ];
+
+  propagatedBuildInputs = with ocamlPackages; [ camlzip num ];
+
+  enableParallelBuilding = true;
+
+  # Remove unnecessary call to which
+  patches = [ ./configure.patch ];
+
+  configureFlags = [ "--enable-verbose-make" ];
 
   installTargets = [ "install" "install-lib" ];
 
+  passthru.withProvers = callPackage ./with-provers.nix {};
+
   meta = with stdenv.lib; {
     description = "A platform for deductive program verification";
     homepage    = "http://why3.lri.fr/";
diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix
new file mode 100644
index 00000000000..3528dbd3a64
--- /dev/null
+++ b/pkgs/applications/science/logic/why3/with-provers.nix
@@ -0,0 +1,30 @@
+{ stdenv, makeWrapper, runCommand, symlinkJoin, why3 }:
+provers:
+let configAwkScript = runCommand "why3-conf.awk" { inherit provers; }
+    ''
+      for p in $provers; do
+        for b in $p/bin/*; do
+          BASENAME=$(basename $b)
+          echo "/^command =/{ gsub(\"$BASENAME\", \"$b\") }" >> $out
+        done
+      done
+      echo '{ print }' >> $out
+    '';
+in stdenv.mkDerivation {
+  name = "${why3.name}-with-provers";
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildInputs = [ why3 makeWrapper ] ++ provers;
+
+  buildPhase = ''
+      mkdir -p $out/share/why3/
+      why3 config --detect-provers -C $out/share/why3/why3.conf
+      awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf
+  '';
+
+  installPhase = ''
+      mkdir -p $out/bin
+      makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf"
+  '';
+}
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 29a19022094..5f6b894f984 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -1,87 +1,77 @@
-{ stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz
-, ltl2ba, coq, why3, autoconf
+{ lib, stdenv, fetchurl, makeWrapper, writeText
+, autoconf, ncurses, graphviz, doxygen
+, ocamlPackages, ltl2ba, coq, why3,
 }:
 
 let
   mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
-  ocamlpath = "${mkocamlpath ocamlPackages.apron}:${mkocamlpath ocamlPackages.mlgmpidl}";
+  runtimeDeps = with ocamlPackages; [
+    apron
+    biniou
+    camlzip
+    easy-format
+    menhir
+    mlgmpidl
+    num
+    ocamlgraph
+    why3
+    yojson
+    zarith
+  ];
+  ocamlpath = lib.concatMapStringsSep ":" mkocamlpath runtimeDeps;
 in
 
 stdenv.mkDerivation rec {
   name    = "frama-c-${version}";
-  version = "18.0";
-  slang   = "Argon";
+  version = "19.0";
+  slang   = "Potassium";
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
-    sha256 = "0a88k2mhafj7pz3dzgsqkrc9digkxpnvr9jqq9nbzwq8qr02bca2";
+    sha256 = "190n1n4k0xbycz25bn0d2gnfxd8w6scz3nlixl7w2k2jvpqlcs3n";
+
   };
 
-  why2 = fetchurl {
-    url    = "http://why.lri.fr/download/why-2.40.tar.gz";
-    sha256 = "0h1mbpxsgwvf3pbl0qbg22j6f4v1ffka24ap1ajbjk9b1yb3ali8";
-  };
+  preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
 
   nativeBuildInputs = [ autoconf makeWrapper ];
 
   buildInputs = with ocamlPackages; [
-    ncurses ocaml findlib ltl2ba ocamlgraph
-    lablgtk coq graphviz zarith why3 apron
+    ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip
+    lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen
   ];
 
+  enableParallelBuilding = true;
 
-  # Experimentally, the build segfaults with high core counts
-  enableParallelBuilding = false;
-
-  unpackPhase = ''
-    tar xf $src
-    tar xf $why2
-  '';
-
-  buildPhase = ''
-    cd frama*
-    ./configure --prefix=$out
-    # It is not parallel safe
-    make
-    make install
-    cd ../why*
-    FRAMAC=$out/bin/frama-c ./configure --prefix=$out
-    make
-    make install
+  fixupPhase = ''
     for p in $out/bin/frama-c{,-gui};
     do
       wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath}
     done
   '';
 
-  # Enter frama-c directory before patching
-  prePatch = ''cd frama*'';
-  patches = [ ./dynamic.diff ];
-  postPatch = ''
-    # strip absolute paths to /usr/bin
-    for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/
-      substituteInPlace $file  --replace '/usr/bin/' ""
-    done
+  # Allow loading of external Frama-C plugins
+  setupHook = writeText "setupHook.sh" ''
+    addFramaCPath () {
+      if test -d "''$1/lib/frama-c/plugins"; then
+        export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
+        export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
+      fi
 
-    substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba'
+      if test -d "''$1/lib/frama-c"; then
+        export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c"
+      fi
 
-    cd ../why*
+      if test -d "''$1/share/frama-c/"; then
+        export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
+      fi
 
-    substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3'    
-    substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c"
-    substituteInPlace ./jc/jc_make.ml --replace ' why-dp '       " $out/bin/why-dp "
-    substituteInPlace ./jc/jc_make.ml --replace "?= why@\n"      "?= $out/bin/why@\n"
-    substituteInPlace ./jc/jc_make.ml --replace ' gwhy-bin@'     " $out/bin/gwhy-bin@"
-    substituteInPlace ./jc/jc_make.ml --replace ' why3 '         " ${why3}/bin/why3 "
-    substituteInPlace ./jc/jc_make.ml --replace ' why3ide '      " ${why3}/bin/why3ide "
-    substituteInPlace ./jc/jc_make.ml --replace ' why3replayer ' " ${why3}/bin/why3replayer "
-    substituteInPlace ./jc/jc_make.ml --replace ' why3ml '       " ${why3}/bin/why3ml "
-    substituteInPlace ./jc/jc_make.ml --replace ' coqdep@'       " ${coq}/bin/coqdep@"
-    substituteInPlace ./jc/jc_make.ml --replace 'coqc'           " ${coq}/bin/coqc"
-    substituteInPlace ./frama-c-plugin/register.ml --replace ' jessie ' " $out/bin/jessie "
-    cd ..
+    }
+
+    addEnvHooks "$targetOffset" addFramaCPath
   '';
 
+
   meta = {
     description = "An extensible and collaborative platform dedicated to source-code analysis of C software";
     homepage    = http://frama-c.com/;
diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff
deleted file mode 100644
index 737cad0cda4..00000000000
--- a/pkgs/development/tools/analysis/frama-c/dynamic.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/kernel_services/plugin_entry_points/dynamic.ml	2016-05-30 16:15:22.000000000 +0200
-+++ b/src/kernel_services/plugin_entry_points/dynamic.ml	2016-10-13 18:25:31.000000000 +0200
-@@ -270,7 +270,8 @@
-   load_path :=
-     List.fold_right (add_dir ~user:true) path
-       (List.fold_right (add_dir ~user:false) Config.plugin_dir []);
--  let findlib_path = String.concat ":" !load_path in
-+  let findlib_path = String.concat ":" (!load_path @
-+    try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in
-   Klog.debug ~dkey "setting findlib path to %s" findlib_path;
-   Findlib.init ~env_ocamlpath:findlib_path ()
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b082ccf7c9..f9235c30ffb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23079,7 +23079,7 @@ in
 
   veriT = callPackage ../applications/science/logic/verit {};
 
-  why3 = callPackage ../applications/science/logic/why3 {};
+  why3 = callPackage ../applications/science/logic/why3 { };
 
   workcraft = callPackage ../applications/science/logic/workcraft {};
 

From 2255e9a6bad482406fe25de1993aba4309744740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 25 Feb 2019 15:40:06 +0100
Subject: [PATCH 120/562] python.pkgs.sip: 4.19.13 -> 4.19.14

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

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 2b034897a78..90ac836dcc8 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = sip-module;
-  version = "4.19.13";
+  version = "4.19.14";
   format = "other";
 
   disabled = isPyPy;
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/sip/sip-${version}/sip-${version}.tar.gz";
-    sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3";
+    url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
+    sha256 = "11xgs3rf5qh5qh459biwnc2j5y08jps3j0p6hcgi7f63pifpdwqf";
   };
 
   configurePhase = ''

From 03a820d3ea3fa7fd45842de74f7ba748e3604083 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Aug 2019 11:46:44 +0200
Subject: [PATCH 121/562] pythonPackages.sip: 4.19.14 -> 4.19.18

---
 .../python-modules/sip/default.nix            | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 90ac836dcc8..cb1575f9349 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,25 +2,38 @@
 
 buildPythonPackage rec {
   pname = sip-module;
-  version = "4.19.14";
+  version = "4.19.18";
   format = "other";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
-    sha256 = "11xgs3rf5qh5qh459biwnc2j5y08jps3j0p6hcgi7f63pifpdwqf";
+    sha256 = "07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0";
   };
 
   configurePhase = ''
     ${python.executable} ./configure.py \
       --sip-module ${sip-module} \
-      -d $out/lib/${python.libPrefix}/site-packages \
+      -d $out/${python.sitePackages} \
       -b $out/bin -e $out/include
   '';
 
   enableParallelBuilding = true;
 
+  installCheckPhase = let
+    modules = [
+      sip-module
+      "sipconfig"
+    ];
+    imports = lib.concatMapStrings (module: "import ${module};") modules;
+  in ''
+    echo "Checking whether modules can be imported..."
+    PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}"
+  '';
+
+  doCheck = true;
+
   meta = with lib; {
     description = "Creates C++ bindings for Python modules";
     homepage    = "http://www.riverbankcomputing.co.uk/";

From c3839deddd3077ab7423bc3ce4f18e4d3aee78e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 25 Feb 2019 15:41:02 +0100
Subject: [PATCH 122/562] python.pkgs.pyqt5: 5.11.3 -> 5.13.0

This upgrades pyqt5 and fixes the build. Note that the QtWebEngine
module is split into `pyqtwebengine` by upstream and us.

If your application gives an error that a Qt module is missing, then
that is most likely because it was not included when building pyqt5.
The solution is to simply add it here to the `(native)BuildInputs`.
Don't forget to add an import check. We should include all the modules
(except qtwebkit) that are needed.
---
 pkgs/development/python-modules/pyqt/5.x.nix | 93 +++++++++++++++++---
 1 file changed, 80 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 288f35f2352..5791299bdc1 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,10 @@
 { lib, fetchurl, pythonPackages, pkgconfig
-, qmake, lndir, qtbase, qtsvg, qtwebengine, dbus
+, dbus
+, qmake, lndir
+, qtbase
+, qtsvg
+, qtdeclarative
+, qtwebchannel
 , withConnectivity ? false, qtconnectivity
 , withWebKit ? false, qtwebkit
 , withWebSockets ? false, qtwebsockets
@@ -9,29 +14,61 @@ let
 
   inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
 
-  sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; };
+  sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
+    # If we install sip in another folder, then we need to create a __init__.py as well
+    # if we want to be able to import it with Python 2.
+    # Python 3 could rely on it being an implicit namespace package, however,
+    # PyQt5 we made an explicit namespace package so sip should be as well.
+    postInstall = ''
+      cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
+      from pkgutil import extend_path
+      __path__ = extend_path(__path__, __name__)
+      EOF
+    '';
+  });
 
 in buildPythonPackage rec {
-  pname = "PyQt";
-  version = "5.11.3";
+  pname = "pyqt";
+  version = "5.13.0";
   format = "other";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9";
+    url = "https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5_gpl-${version}.tar.gz";
+    sha256 = "1ydgdz28f1v17qqz3skyv26k5l0w63fr4dncc5xm49jr2gjzznqc";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig qmake lndir sip ];
-
-  buildInputs = [ dbus sip ];
-
-  propagatedBuildInputs = [ qtbase qtsvg qtwebengine dbus-python ]
-    ++ lib.optional (!isPy3k) enum34
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+    lndir
+    sip
+    qtbase
+    qtsvg
+    qtdeclarative
+    qtwebchannel
+  ]
     ++ lib.optional withConnectivity qtconnectivity
     ++ lib.optional withWebKit qtwebkit
-    ++ lib.optional withWebSockets qtwebsockets;
+    ++ lib.optional withWebSockets qtwebsockets
+  ;
+
+  buildInputs = [
+    dbus
+    qtbase
+    qtsvg
+    qtdeclarative
+  ]
+    ++ lib.optional withConnectivity qtconnectivity
+    ++ lib.optional withWebKit qtwebkit
+    ++ lib.optional withWebSockets qtwebsockets
+  ;
+
+  propagatedBuildInputs = [
+    dbus-python
+    sip
+  ] ++ lib.optional (!isPy3k) enum34;
 
   patches = [
     # Fix some wrong assumptions by ./configure.py
@@ -39,6 +76,10 @@ in buildPythonPackage rec {
     ./pyqt5-fix-dbus-mainloop-support.patch
   ];
 
+  passthru = {
+    inherit sip;
+  };
+
   configurePhase = ''
     runHook preConfigure
 
@@ -62,8 +103,34 @@ in buildPythonPackage rec {
     for i in $out/bin/*; do
       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
     done
+
+    # Let's make it a namespace package
+    cat << EOF > $out/${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 withConnectivity "PyQt5.QtConnectivity"
+    ;
+    imports = lib.concatMapStrings (module: "import ${module};") modules;
+  in ''
+    echo "Checking whether modules can be imported..."
+    ${python.interpreter} -c "${imports}"
+  '';
+
+  doCheck = true;
+
   enableParallelBuilding = true;
 
   meta = with lib; {

From 497f1a00f13e608d1c3363a94c649a00a18ba0bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 25 Feb 2019 17:21:32 +0100
Subject: [PATCH 123/562] python.pkgs.pyqtwebengine: init at 5.12.1

5.13.0 is available, however, it assumes qt 5.13 is used and fails
to build due to a missing QWebEngineNotification class.
---
 .../python-modules/pyqtwebengine/default.nix  | 89 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +
 2 files changed, 93 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyqtwebengine/default.nix

diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
new file mode 100644
index 00000000000..7d745aa9e10
--- /dev/null
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -0,0 +1,89 @@
+{ lib, fetchurl, pythonPackages, pkgconfig
+, qmake, qtbase, qtsvg, qtwebengine
+}:
+
+let
+
+  inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34;
+  inherit (pyqt5) sip;
+
+in buildPythonPackage rec {
+  pname = "pyqtwebengine";
+  version = "5.12.1";
+  format = "other";
+
+  src = fetchurl {
+    url = "https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine_gpl-${version}.tar.gz";
+    sha256 = "0wylkd7fh2g27y3710rpxmj9wx0wpi3z7qbv6khiddm15rkh81w6";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+    sip
+    qtbase
+    qtsvg
+    qtwebengine
+  ];
+
+  buildInputs = [
+    sip
+    qtbase
+    qtsvg
+    qtwebengine
+  ];
+
+  propagatedBuildInputs = [ pyqt5 ]
+    ++ lib.optional (!isPy3k) enum34;
+
+  configurePhase = ''
+    runHook preConfigure
+
+    mkdir -p "$out/share/sip/PyQt5"
+
+    # FIXME: Without --no-dist-info, I get
+    #     unable to create /nix/store/yv4pzx3lxk3lscq0pw3hqzs7k4x76xsm-python3-3.7.2/lib/python3.7/site-packages/PyQtWebEngine-5.12.dist-info
+    ${python.executable} configure.py -w \
+      --destdir="$out/${python.sitePackages}/PyQt5" \
+      --no-dist-info \
+      --apidir="$out/api/${python.libPrefix}" \
+      --sipdir="$out/share/sip/PyQt5" \
+      --pyqt-sipdir="${pyqt5}/share/sip/PyQt5" \
+      --stubsdir="$out/${python.sitePackages}/PyQt5"
+
+    runHook postConfigure
+  '';
+
+  postInstall = ''
+    # Let's make it a namespace package
+    cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
+    EOF
+  '';
+
+  installCheckPhase = let
+    modules = [
+      "PyQt5.QtWebEngine"
+      "PyQt5.QtWebEngineWidgets"
+    ];
+    imports = lib.concatMapStrings (module: "import ${module};") modules;
+  in ''
+    echo "Checking whether modules can be imported..."
+    PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} ${python.interpreter} -c "${imports}"
+  '';
+
+  doCheck = true;
+
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Python bindings for Qt5";
+    homepage    = http://www.riverbankcomputing.co.uk;
+    license     = licenses.gpl3;
+    platforms   = platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e55e933961..0896322e510 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -949,6 +949,10 @@ in {
   */
   pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };
 
+  pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine {
+    pythonPackages = self;
+  };
+
   pysc2 = callPackage ../development/python-modules/pysc2 { };
 
   pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; };

From 2912844728ec253c84d6c4254a55be00525a0698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 25 Feb 2019 17:23:21 +0100
Subject: [PATCH 124/562] qutebrowser: add pyqtwebengine to
 propagatedBuildInputs

---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 03a5aa7bfe2..5283d2e3c5d 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -46,7 +46,7 @@ in python3Packages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python3Packages; [
-    pyyaml pyqt5 jinja2 pygments
+    pyyaml pyqt5 pyqtwebengine jinja2 pygments
     pypeg2 cssutils pyopengl attrs
     # scripts and userscripts libs
     tldextract beautifulsoup4

From e65102bde72df182707298133e69513a1a79a9d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Aug 2019 14:13:13 +0200
Subject: [PATCH 125/562] pythonPackages.spyder-kernels: 0.4.4 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index a3aaa942a9b..206b0799b4a 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "0.4.4";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g3754s71cnh7kygps6gbzrhs5gb47p3pblr7hcvxk1mzl3xw94r";
+    sha256 = "7e124fad5203b748005e952cf33b44695dbb9d92f5e0dc5443e7ca0db817f400";
   };
 
   propagatedBuildInputs = [

From 888b8c819e4b7683d9ce833601d44459425c0bce Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Aug 2019 14:13:33 +0200
Subject: [PATCH 126/562] pythonPackages.spyder: 3.3.4 -> 3.3.6 and fix with
 pyqt5 5.13

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

diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 406cd6e8627..7222f18d5f9 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -1,21 +1,23 @@
 { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
-  spyder-kernels, qtpy, pyzmq, chardet }:
+  spyder-kernels, qtpy, pyzmq, chardet
+, pyqtwebengine
+}:
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "3.3.4";
+  version = "3.3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra";
+    sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
   };
 
   propagatedBuildInputs = [
     jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
     numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
-    pygments qtpy pyzmq chardet
+    pygments qtpy pyzmq chardet pyqtwebengine
   ];
 
   # There is no test for spyder
@@ -35,6 +37,7 @@ buildPythonPackage rec {
     # remove dependency on pyqtwebengine
     # this is still part of the pyqt 5.11 version we have in nixpkgs
     sed -i /pyqtwebengine/d setup.py
+    substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
   '';
 
   # Create desktop item

From 33a876e61955e641bd805b187bf164df60e15644 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 3 Aug 2019 14:13:45 +0200
Subject: [PATCH 127/562] anki: fix with pyqtwebengine

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

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 7cd9212c5a8..2530202a565 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -7,7 +7,7 @@
 , lame
 , mplayer
 , libpulseaudio
-, pyqt5
+, pyqtwebengine
 , decorator
 , beautifulsoup4
 , sqlalchemy
@@ -83,7 +83,7 @@ buildPythonApplication rec {
     outputs = [ "out" "doc" "man" ];
 
     propagatedBuildInputs = [
-      pyqt5 sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
+      pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
       markdown
     ]
       ++ lib.optional plotsSupport matplotlib

From 76188dad03c934d4223b7d497e412163529630de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 13:13:27 +0200
Subject: [PATCH 128/562] LTS Haskell 13.30

---
 .../haskell-modules/configuration-hackage2nix.yaml       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ee519f903ca..006cc3922e7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 13.27
+  # LTS Haskell 13.30
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -345,6 +345,7 @@ default-package-overrides:
   - bzlib ==0.5.0.5
   - bzlib-conduit ==0.3.0.1
   - c2hs ==0.28.6
+  - Cabal ==2.4.1.0
   - cabal2spec ==2.2.2.1
   - cabal-doctest ==1.0.6
   - cabal-rpm ==0.12.6
@@ -901,6 +902,7 @@ default-package-overrides:
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
   - hashtables ==1.2.3.3
+  - haskeline ==0.7.5.0
   - haskell-gi ==0.21.5
   - haskell-gi-base ==0.21.5
   - haskell-gi-overloading ==1.0
@@ -1375,6 +1377,7 @@ default-package-overrides:
   - mono-traversable ==1.0.11.0
   - mono-traversable-instances ==0.1.0.0
   - mountpoints ==1.0.2
+  - mtl ==2.2.2
   - mtl-compat ==0.2.2
   - mtl-prelude ==2.0.3.1
   - multiarg ==0.30.0.10
@@ -1500,6 +1503,7 @@ default-package-overrides:
   - parallel-io ==0.3.3
   - paripari ==0.6.0.0
   - parseargs ==0.2.0.9
+  - parsec ==3.1.13.0
   - parsec-class ==1.0.0.0
   - parsec-numbers ==0.1.0
   - parsec-numeric ==0.1.0.0
@@ -1913,6 +1917,7 @@ default-package-overrides:
   - statistics ==0.15.0.0
   - stb-image-redux ==0.2.1.2
   - step-function ==0.2
+  - stm ==2.5.0.0
   - stm-chans ==3.0.0.4
   - stm-conduit ==4.0.1
   - stm-delay ==0.1.1.1
@@ -2021,6 +2026,7 @@ default-package-overrides:
   - testing-feat ==1.1.0.0
   - testing-type-modifiers ==0.1.0.1
   - texmath ==0.11.2.2
+  - text ==1.2.3.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.5.1
   - text-conversions ==0.3.0
@@ -2277,6 +2283,7 @@ default-package-overrides:
   - xdg-basedir ==0.2.2
   - xeno ==0.3.5.1
   - xenstore ==0.1.1
+  - xhtml ==3000.2.2.1
   - xls ==0.1.2
   - xlsx ==0.7.2
   - xlsx-tabular ==0.2.2.1

From 12d815161abd4554482fc6dcad2443391c07667b Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 23 Jul 2019 13:54:20 +0200
Subject: [PATCH 129/562] hackage2nix: Unmark discord-haskell as broken

https://github.com/NixOS/nixpkgs/issues/58987
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 006cc3922e7..7f0d761b07e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4036,7 +4036,6 @@ broken-packages:
   - dirtree
   - discogs-haskell
   - discord-gateway
-  - discord-haskell
   - discord-hs
   - discord-rest
   - discord-types

From 4a8831e38b307e80051757ab04e4e391f5bab97b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 13:08:24 +0200
Subject: [PATCH 130/562] haskell2nix: update list of broken builds to fix
 evaluation on Hydra

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7f0d761b07e..6eeade90a07 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2434,6 +2434,7 @@ package-maintainers:
     - funcmp
     - git-annex
     - hackage-db
+    - haskell-ci
     - hledger
     - hledger-interest
     - hledger-ui
@@ -2798,6 +2799,7 @@ broken-packages:
   - apelsin
   - api-builder
   - api-tools
+  - api-yoti
   - apiary
   - apiary-authenticate
   - apiary-clientsession
@@ -2894,6 +2896,7 @@ broken-packages:
   - atomic-primops-vector
   - atomo
   - ats-format
+  - ats-pkg
   - ats-setup
   - ats-storable
   - attic-schedule
@@ -2963,7 +2966,9 @@ broken-packages:
   - azurify
   - b9
   - babylon
+  - backblaze-b2-hs
   - backdropper
+  - backstop
   - backtracking-exceptions
   - backward-state
   - bag
@@ -3010,6 +3015,7 @@ broken-packages:
   - bdcs-api
   - beam
   - beam-newtype-field
+  - beam-postgres
   - beam-th
   - beamable
   - beautifHOL
@@ -3178,6 +3184,7 @@ broken-packages:
   - blunt
   - BNFC-meta
   - bno055-haskell
+  - board-games
   - bogre-banana
   - bolt
   - boltzmann-brain
@@ -3190,11 +3197,13 @@ broken-packages:
   - boolexpr
   - boombox
   - boomslang
+  - boots
   - borel
   - boring-window-switcher
   - bot
   - bounded-array
   - bowntz
+  - box
   - braid
   - brain-bleep
   - Bravo
@@ -3326,6 +3335,7 @@ broken-packages:
   - call-haskell-from-anything
   - camfort
   - campfire
+  - canon
   - canonical-filepath
   - canonical-json
   - canteven-http
@@ -3420,6 +3430,9 @@ broken-packages:
   - checked
   - Checked
   - checkmate
+  - chell
+  - chell-hunit
+  - chell-quickcheck
   - chessIO
   - chevalier-common
   - chiasma
@@ -3750,6 +3763,7 @@ broken-packages:
   - crf-chain2-generic
   - crf-chain2-tiers
   - critbit
+  - criterion-compare
   - criterion-plus
   - criterion-to-html
   - criu-rpc
@@ -3870,6 +3884,7 @@ broken-packages:
   - data-type
   - data-util
   - data-variant
+  - database-id-groundhog
   - database-study
   - datadog
   - datadog-tracing
@@ -3981,8 +3996,11 @@ broken-packages:
   - dgim
   - dgs
   - dhall-check
+  - dhall-lsp-server
   - dhall-nix
+  - dhall-to-cabal
   - dhcp-lease-parser
+  - dhrun
   - dia-base
   - dia-functions
   - diagrams-boolean
@@ -4198,6 +4216,7 @@ broken-packages:
   - effect-handlers
   - effect-stack
   - effin
+  - egison
   - egison-quote
   - egison-tutorial
   - ehaskell
@@ -4238,6 +4257,7 @@ broken-packages:
   - entangle
   - EntrezHTTP
   - entwine
+  - enum-text-rio
   - EnumContainers
   - enumerate
   - enumerate-function
@@ -4506,6 +4526,7 @@ broken-packages:
   - FM-SBLEX
   - fmark
   - FModExRaw
+  - fmt-for-rio
   - fn-extra
   - foldl-incremental
   - foldl-statistics
@@ -4635,6 +4656,7 @@ broken-packages:
   - gact
   - game-probability
   - gameclock
+  - gamgee
   - Gamgine
   - gamma
   - Ganymede
@@ -4749,6 +4771,7 @@ broken-packages:
   - ghcjs-promise
   - ghcjs-xhr
   - ghclive
+  - ghcprofview
   - ght
   - gi-cairo-again
   - gi-dbusmenu
@@ -4762,7 +4785,12 @@ broken-packages:
   - gi-gstpbutils
   - gi-gsttag
   - gi-gstvideo
+  - gi-gtk
+  - gi-gtk-declarative
+  - gi-gtk-declarative-app-simple
+  - gi-gtk-hs
   - gi-gtkosxapplication
+  - gi-gtksource
   - gi-handy
   - gi-notify
   - gi-ostree
@@ -4770,6 +4798,7 @@ broken-packages:
   - gi-poppler
   - gi-secret
   - gi-soup
+  - gi-vte
   - gi-wnck
   - gi-xlib
   - giak
@@ -4951,6 +4980,7 @@ broken-packages:
   - gtfs
   - gtk-serialized-event
   - gtk-sni-tray
+  - gtk-strut
   - gtk-toy
   - gtk2hs-hello
   - gtk2hs-rpn
@@ -5115,6 +5145,7 @@ broken-packages:
   - hArduino
   - hardware-edsl
   - HaRe
+  - harg
   - hark
   - harmony
   - HarmTrace
@@ -5518,6 +5549,7 @@ broken-packages:
   - hjson-query
   - hjsonpointer
   - hjsonschema
+  - hjugement-cli
   - HJVM
   - hkgr
   - hlatex
@@ -6005,8 +6037,10 @@ broken-packages:
   - identifiers
   - idiii
   - idna2008
+  - idris
   - IDynamic
   - ieee-utils
+  - iexcloud
   - ifcxt
   - IFS
   - ig
@@ -6329,6 +6363,8 @@ broken-packages:
   - ks-test
   - KSP
   - ktx
+  - kubernetes-client
+  - kubernetes-client-core
   - kure
   - kure-your-boilerplate
   - KyotoCabinet
@@ -6345,6 +6381,7 @@ broken-packages:
   - lambda-calculator
   - lambda-canvas
   - lambda-devs
+  - lambda-options
   - lambda-toolbox
   - lambda2js
   - lambdaBase
@@ -6746,6 +6783,7 @@ broken-packages:
   - marxup
   - masakazu-bot
   - MASMGen
+  - massiv-test
   - master-plan
   - matchers
   - math-grads
@@ -6797,6 +6835,7 @@ broken-packages:
   - mellon-gpio
   - mellon-web
   - melody
+  - membrain
   - memcache-conduit
   - memcache-haskell
   - memcached-binary
@@ -7146,6 +7185,7 @@ broken-packages:
   - network-netpacket
   - network-protocol-xmpp
   - network-rpca
+  - network-run
   - network-server
   - network-service
   - network-simple
@@ -7322,6 +7362,7 @@ broken-packages:
   - optional
   - options-time
   - optparse-applicative-simple
+  - optparse-enum
   - orc
   - orchestrate
   - OrchestrateDB
@@ -7377,6 +7418,7 @@ broken-packages:
   - pang-a-lambda
   - pangraph
   - panpipe
+  - pantry
   - pantry-tmp
   - papa-export
   - papa-implement
@@ -7425,6 +7467,7 @@ broken-packages:
   - pasta
   - pastis
   - pasty
+  - patat
   - patches-vector
   - Pathfinder
   - pathfindingcore
@@ -7659,6 +7702,7 @@ broken-packages:
   - postgresql-named
   - postgresql-query
   - postgresql-simple-bind
+  - postgresql-simple-named
   - postgresql-simple-queue
   - postgresql-simple-sop
   - postgresql-simple-typed
@@ -7985,8 +8029,10 @@ broken-packages:
   - Referees
   - refh
   - reflection-extras
+  - reflex
   - reflex-animation
   - reflex-backend-wai
+  - reflex-basic-host
   - reflex-dom-svg
   - reflex-gloss
   - reflex-gloss-scene
@@ -8110,6 +8156,8 @@ broken-packages:
   - rfc1413-server
   - rhythm-game-tutorial
   - RichConditional
+  - ridley
+  - ridley-extras
   - riemann
   - riff
   - ring-buffer
@@ -8269,6 +8317,7 @@ broken-packages:
   - scotty-binding-play
   - scotty-blaze
   - scotty-fay
+  - scotty-form
   - scotty-format
   - scotty-hastache
   - scotty-resource
@@ -8779,6 +8828,7 @@ broken-packages:
   - statsd-client
   - statsdi
   - stb-image-redux
+  - stc-lang
   - stdata
   - stdf
   - stdio
@@ -8808,6 +8858,7 @@ broken-packages:
   - StrappedTemplates
   - stratum-tool
   - stratux
+  - stratux-demo
   - stratux-http
   - stratux-types
   - stratux-websockets
@@ -8902,6 +8953,7 @@ broken-packages:
   - symantic-cli
   - symantic-http-test
   - symantic-lib
+  - symantic-xml
   - symengine
   - symengine-hs
   - sync
@@ -9023,6 +9075,7 @@ broken-packages:
   - terminal-punch
   - terminal-text
   - termination-combinators
+  - termonad
   - termplot
   - terntup
   - terrahs
@@ -9193,6 +9246,7 @@ broken-packages:
   - trace-function-call
   - traced
   - tracetree
+  - tracing
   - tracker
   - traction
   - tracy
@@ -9214,6 +9268,8 @@ broken-packages:
   - translatable-intset
   - translate
   - translate-cli
+  - trasa-extra
+  - trasa-th
   - travis
   - travis-meta-yaml
   - trawl
@@ -9392,6 +9448,7 @@ broken-packages:
   - unsequential
   - unused
   - uom-plugin
+  - up
   - update-nix-fetchgit
   - Updater
   - uploadcare
@@ -9411,6 +9468,7 @@ broken-packages:
   - urldecode
   - UrlDisp
   - urldisp-happstack
+  - urlpath
   - URLT
   - urn
   - urn-random
@@ -9495,6 +9553,7 @@ broken-packages:
   - verilog
   - versioning
   - versioning-servant
+  - vflow-types
   - vfr-waypoints
   - vgrep
   - vhd
@@ -9688,6 +9747,7 @@ broken-packages:
   - writer-cps-lens
   - writer-cps-monads-tf
   - writer-cps-morph
+  - ws
   - wsdl
   - wsedit
   - wss-client
@@ -9708,6 +9768,7 @@ broken-packages:
   - wxSimpleCanvas
   - wxturtle
   - wyvern
+  - X
   - x-dsp
   - X11-extras
   - X11-rm
@@ -9814,6 +9875,7 @@ broken-packages:
   - yate
   - yavie
   - yaya
+  - yaya-hedgehog
   - yaya-unsafe
   - ycextra
   - yeller

From 2b4d44573a641b5711d28c47fd3b5b277ca4a3ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jul 2019 02:30:39 +0200
Subject: [PATCH 131/562] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-1-g6d6ded8 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bd2ec34f885123ac8346bc650365565bc197ca05.
---
 .../haskell-modules/hackage-packages.nix      | 3880 +++++++++++++----
 1 file changed, 3020 insertions(+), 860 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1bfeac57840..84a35340d60 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -636,8 +636,8 @@ self: {
      }:
      mkDerivation {
        pname = "AbortT-transformers";
-       version = "1.0.1.2";
-       sha256 = "1skqp7zmh7vzrfhfnc6mn125xmqz2p0c8pmaccxynga9623dmsb2";
+       version = "1.0.1.3";
+       sha256 = "14bv2bmd6fi1kf0id3ah7gfabbqzbpahws6zy11ji6h3j29pwk8y";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -2664,8 +2664,8 @@ self: {
        pname = "Cabal";
        version = "2.4.1.0";
        sha256 = "151mrrd9sskghvlwmj32da5gafwqj6sv9xz9fmp84b7vm4nr0skk";
-       revision = "1";
-       editedCabalFile = "1dvs2i0kfk8rji9wbrv7y0iydbif9jzg4c7rmaa6lxg8hp7mij2n";
+       revision = "2";
+       editedCabalFile = "04kg5xh8yabmp1ymk32gw2r66l76338rsglq8i4j2913bhq23vwa";
        setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -2954,8 +2954,8 @@ self: {
      }:
      mkDerivation {
        pname = "ChasingBottoms";
-       version = "1.3.1.5";
-       sha256 = "0hfk2cb9da5fvr96x8lzij93yl3rvax2id9a8gihd5j5aq4kxx30";
+       version = "1.3.1.6";
+       sha256 = "17lw2mdzrn2f4w0byfdkyd7h7pcnjzv3n3giapcjg6bza5xjqfbd";
        libraryHaskellDepends = [
          base containers mtl QuickCheck random syb
        ];
@@ -11761,8 +11761,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "LParse";
-       version = "0.3.0.0";
-       sha256 = "0nl76ycq608p2wm61pqn64wmq5aqmnwc9p8k4mvx8zwqw06jqlmm";
+       version = "0.3.1.0";
+       sha256 = "1fw5s0688d5x2i2qarac2r96pj13b2fhla0212fzwlsgpbmg7g8z";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "A continuation-based parser library";
@@ -13319,17 +13319,17 @@ self: {
      }) {};
 
   "Monadoro" = callPackage
-    ({ mkDerivation, ansi-terminal, base, process, time }:
+    ({ mkDerivation, ansi-terminal, base, doctest, time }:
      mkDerivation {
        pname = "Monadoro";
-       version = "0.1.2.0";
-       sha256 = "1bqaiarr5gv42xl8fww67iryyh1mscwdkgcahdc988y19ag8a4j9";
+       version = "0.2.1.1";
+       sha256 = "0f7swjf5lr7w7gld46l74plc2x79v6dbq5zmsglpk1x8k7vpfj79";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ ansi-terminal base process time ];
-       executableHaskellDepends = [ ansi-terminal base process time ];
-       testHaskellDepends = [ ansi-terminal base process time ];
-       description = "A minimalistic CLI Pomodoro timer, based on a library of the same purpose";
+       libraryHaskellDepends = [ ansi-terminal base time ];
+       executableHaskellDepends = [ ansi-terminal base time ];
+       testHaskellDepends = [ ansi-terminal base doctest time ];
+       description = "A minimalistic CLI Pomodoro timer";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -15301,12 +15301,17 @@ self: {
      }:
      mkDerivation {
        pname = "Persistence";
-       version = "1.1.4.2";
-       sha256 = "0lvzzcmsmpmsj63ysf3ad6a2v14cf61daz767fxkcf7b7cl50cjp";
+       version = "2.0";
+       sha256 = "0iwkvplldy6sznp33n5w5ink312cg6shh3qg98canz6j6hrspa8y";
+       revision = "1";
+       editedCabalFile = "063rizxqn44pzblj2nxyk3ia2zymryrqq55n081g21aih38n8xlr";
        libraryHaskellDepends = [
          base containers maximal-cliques parallel vector
        ];
-       description = "Quickly detect clusters and holes in data";
+       testHaskellDepends = [
+         base containers maximal-cliques parallel vector
+       ];
+       description = "A versatile library for topological data analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -17518,27 +17523,28 @@ self: {
      }) {};
 
   "ShellCheck" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , directory, mtl, parsec, process, QuickCheck, regex-tdfa
+    ({ mkDerivation, aeson, array, base, bytestring, Cabal, containers
+     , deepseq, Diff, directory, filepath, mtl, parsec, process
+     , QuickCheck, regex-tdfa
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.6.0";
-       sha256 = "1xkxrn1j5qvh2pxm0cnjpqqqsvwr7xy8pk31cwbh8r879nrrzrzn";
+       version = "0.7.0";
+       sha256 = "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
-         aeson base bytestring containers directory mtl parsec process
-         QuickCheck regex-tdfa
+         aeson array base bytestring containers deepseq Diff directory
+         filepath mtl parsec process QuickCheck regex-tdfa
        ];
        executableHaskellDepends = [
-         aeson base bytestring containers directory mtl parsec QuickCheck
-         regex-tdfa
+         aeson array base bytestring containers deepseq Diff directory
+         filepath mtl parsec QuickCheck regex-tdfa
        ];
        testHaskellDepends = [
-         aeson base bytestring containers directory mtl parsec QuickCheck
-         regex-tdfa
+         aeson array base bytestring containers deepseq Diff directory
+         filepath mtl parsec QuickCheck regex-tdfa
        ];
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
@@ -18868,12 +18874,17 @@ self: {
      }:
      mkDerivation {
        pname = "TeX-my-math";
-       version = "0.201.1.1";
-       sha256 = "064ram3i1a59ypd8i3wnp7x9vbkc8zawby52676y4pfkqvddnhnm";
+       version = "0.201.2.0";
+       sha256 = "1dg06lqh2x9smq6hbcn2gyh2qll9z7v4gbd1ipvf2isdwxc201vk";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base decimal-literals dumb-cas hashable haskell-src-meta HaTeX
          template-haskell text unordered-containers vector-space void
        ];
+       executableHaskellDepends = [
+         base directory filepath HaTeX process text
+       ];
        testHaskellDepends = [
          base directory dumb-cas filepath haskell-src-meta HaTeX process
          template-haskell text
@@ -20407,6 +20418,21 @@ self: {
        broken = true;
      }) {};
 
+  "X" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, text, text-short }:
+     mkDerivation {
+       pname = "X";
+       version = "0.2.0.0";
+       sha256 = "1p03ah2qi694kcbwb7gk2cypj6p42c6ajn51wpak96p9vmpp5a4r";
+       libraryHaskellDepends = [
+         base bytestring deepseq text text-short
+       ];
+       description = "A light-weight XML library";
+       license = "BSD-3-Clause AND GPL-3.0-or-later";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "X11" = callPackage
     ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
      , libXrandr, libXrender, libXScrnSaver
@@ -24872,8 +24898,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "alist";
-       version = "0.1.1.7";
-       sha256 = "1kklhgksg0lvl4v80y82c5zsfwrr7nbdb8sl64529589sfrsrpsw";
+       version = "0.1.2.7";
+       sha256 = "0ydq2sxyfgij0rf54i3ajj4hdqjawhcdsgi822yrkq86xjvsxc4w";
        libraryHaskellDepends = [ base ];
        description = "lists with O(1) append";
        license = stdenv.lib.licenses.bsd3;
@@ -28715,14 +28741,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-athena_7_1_2" = callPackage
+  "antiope-athena_7_2_2" = callPackage
     ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base
      , lens, resourcet, text, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.1.2";
-       sha256 = "19xh9cm859r3p5n0plpwddp4zkgr3sg74xx8m4zv160xi3dggjia";
+       version = "7.2.2";
+       sha256 = "1a5mp3s22qv41p9cgiyz6gc96kwz9f9wwx8v4dr1jjgslmlik4m1";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -28740,8 +28766,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.1.2";
-       sha256 = "0k6zn6nhl5b92qjbaxlm1fk21k4anhlm1p86ggydnw8alh9r2lwc";
+       version = "7.2.2";
+       sha256 = "188p6b4mzj513ylkjlf9z3cra6qdv6x0ar4fc1hjs1waggng0b9d";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -28771,7 +28797,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-core_7_1_2" = callPackage
+  "antiope-core_7_2_2" = callPackage
     ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
      , bytestring, exceptions, generic-lens, hedgehog, hspec
      , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet
@@ -28779,8 +28805,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "7.1.2";
-       sha256 = "0i3gwc07hkl50abkk80jnjkp6iixn6hr6q2h1kj206d6cigjx0cn";
+       version = "7.2.2";
+       sha256 = "0j27bd5f9zkx0qhsl9zam7rzvprcb5075rm174gr77gmf4lqraaa";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring exceptions
          generic-lens http-client http-types lens mtl resourcet text
@@ -28817,17 +28843,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-dynamodb_7_1_2" = callPackage
-    ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb
+  "antiope-dynamodb_7_2_2" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , antiope-core, base, generic-lens, lens, text, unliftio-core
      , unordered-containers
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "7.1.2";
-       sha256 = "0g74fg6fclmrfjkhgqyhq95l967bhjah6rk0davrbd3dfandr612";
+       version = "7.2.2";
+       sha256 = "19a41njxa09sf1qlc9zmy65nmwp02lcn0q0dk5gwqkpmjjf5ah3s";
        libraryHaskellDepends = [
-         amazonka amazonka-core amazonka-dynamodb antiope-core base
+         aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
        ];
        testHaskellDepends = [
@@ -28861,7 +28887,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-messages_7_1_2" = callPackage
+  "antiope-messages_7_2_2" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
      , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens
      , lens-aeson, monad-loops, network-uri, scientific, text
@@ -28869,8 +28895,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "7.1.2";
-       sha256 = "0y2dwf0sbay4dm9ns11k2qpjqmgnvxswmd508bwf52305avi97vc";
+       version = "7.2.2";
+       sha256 = "0vdp8kkqv4g3lkjvwhg4yyb8rjwphjp4gjmx0b6910jwizhslqwf";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring generic-lens lens
          lens-aeson monad-loops network-uri text unliftio-core
@@ -28891,8 +28917,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.1.2";
-       sha256 = "0cp9yizvibhi7bwm22z62gx8hv3cm1vbpbv70a0ws4k2i2cq8yrr";
+       version = "7.2.2";
+       sha256 = "006jr3kdyvfzyabxr4zc4kf9sm8pkaca572whdxwpnfpz0m54k0j";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -28929,7 +28955,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-s3_7_1_2" = callPackage
+  "antiope-s3_7_2_2" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-messages, attoparsec, base, bytestring
      , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec
@@ -28938,8 +28964,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "7.1.2";
-       sha256 = "1z85kn6675r54f1hnfn6g0yhg7cjfka32h913qnljd7qmb6ikhhs";
+       version = "7.2.2";
+       sha256 = "14lmkkr86n8h7iqkjvc5sxmccxi3fv97kgljb8m8fl35fxcwd1j8";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages attoparsec base bytestring conduit conduit-extra
@@ -28976,15 +29002,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-sns_7_1_2" = callPackage
+  "antiope-sns_7_2_2" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
      , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog
      , lens, text, time, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "7.1.2";
-       sha256 = "14mq13q6gvg8r3dm329xzbbxlxxx0p5r5gyyqglpqfmdi5dy9948";
+       version = "7.2.2";
+       sha256 = "10wbf6pmws8gway4i7z55z7xi2az5xzb65yj0q1qc86vxbchnxkk";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base bytestring
          generic-lens lens text time unliftio-core
@@ -29021,7 +29047,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-sqs_7_1_2" = callPackage
+  "antiope-sqs_7_2_2" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
      , bytestring, conduit, generic-lens, hedgehog, hspec
      , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl
@@ -29030,8 +29056,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "7.1.2";
-       sha256 = "0gpg340nwnni7ybzcq82i7p3j61gw1120209s9ziyqfrlbs7r976";
+       version = "7.2.2";
+       sha256 = "0qjnwrc23zav84s4ffqi2g97yrfpkxmzm981ik6h5fsi7f6wzj0n";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
          generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -29047,6 +29073,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "antiope-swf" = callPackage
+    ({ mkDerivation, amazonka-swf, base, hedgehog, hspec
+     , hw-hspec-hedgehog, lens, text
+     }:
+     mkDerivation {
+       pname = "antiope-swf";
+       version = "7.2.2";
+       sha256 = "1shw4sw0nfrkdcjjin3nq63igfalywz03w171v5knn2kx6xwf4yy";
+       libraryHaskellDepends = [ amazonka-swf base lens text ];
+       testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "antiprimes" = callPackage
     ({ mkDerivation, base, hspec, primes }:
      mkDerivation {
@@ -29274,6 +29314,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs_0_8_1" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, linear, mtl
+     , QuickCheck, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "apecs";
+       version = "0.8.1";
+       sha256 = "10m3lbfg97psnk3z2ml1q9g2ymwa2fnsknrh6ggp9k5c7mskslv0";
+       libraryHaskellDepends = [
+         array base containers mtl template-haskell vector
+       ];
+       testHaskellDepends = [ base containers linear QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion linear ];
+       description = "Fast Entity-Component-System library for game programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apecs-gloss" = callPackage
     ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
      , linear
@@ -29289,6 +29347,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs-gloss_0_2_1" = callPackage
+    ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
+     , linear
+     }:
+     mkDerivation {
+       pname = "apecs-gloss";
+       version = "0.2.1";
+       sha256 = "0v1nagzwhb1l9wfjl4yp3ymbhbpjcrwrih2y8cxkzws5wxgbbnvg";
+       libraryHaskellDepends = [
+         apecs apecs-physics base containers gloss linear
+       ];
+       description = "Simple gloss renderer for apecs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apecs-physics" = callPackage
     ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
      , template-haskell, vector
@@ -29305,6 +29379,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs-physics_0_4_0" = callPackage
+    ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
+     , template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "apecs-physics";
+       version = "0.4.0";
+       sha256 = "0yqylgsl2n0fsb73qdvl1iinazfzzx64683jp37sr2dm8jpys3lc";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         apecs base containers inline-c linear template-haskell vector
+       ];
+       description = "2D physics for apecs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apecs-physics-gloss" = callPackage
     ({ mkDerivation, apecs, apecs-physics, base, gloss }:
      mkDerivation {
@@ -29322,8 +29413,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs-stm";
-       version = "0.1.1";
-       sha256 = "0d0l48fynsk84y2ifb004dpr39s2hdcwrgfp1ds3qff6784sh66b";
+       version = "0.1.2";
+       sha256 = "0wq20ibki20xccp7gvajzfmp90m9vr0sdx55m3ni91j76bsswqg8";
        libraryHaskellDepends = [
          apecs base containers list-t stm stm-containers template-haskell
          vector
@@ -29403,8 +29494,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-monobank";
-       version = "0.1.2.0";
-       sha256 = "0n9nj6cfszp2wz003sn0xk9533pawlv3afk5p96l6id964dpcdhb";
+       version = "0.1.3.0";
+       sha256 = "0ajp0wv3nkv2db9bx68mq67ag46s2b26p80fx9ypw8nqhnkddg0g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29471,6 +29562,28 @@ self: {
        broken = true;
      }) {};
 
+  "api-yoti" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, crypto-pubkey-openssh, crypto-pubkey-types
+     , crypto-simple, cryptonite, directory, hashable, memory, mtl, pem
+     , text, time, transformers, wreq
+     }:
+     mkDerivation {
+       pname = "api-yoti";
+       version = "0.1.0.0";
+       sha256 = "1c2jb9qzfzkcbcxabc7xvqc6npdm23dglpd9zqic7wafm7jdmf0s";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring containers
+         crypto-pubkey-openssh crypto-pubkey-types crypto-simple cryptonite
+         directory hashable memory mtl pem text time transformers wreq
+       ];
+       testHaskellDepends = [ base bytestring text ];
+       description = "Api bindings for Yoti services";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "apiary" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, bytestring-lexing, case-insensitive
@@ -30815,8 +30928,8 @@ self: {
      }:
      mkDerivation {
        pname = "arithmetic";
-       version = "1.2";
-       sha256 = "0yipdx61ky9db46fy2cbal4qc9y94arkcj4z1dj28bx7j7fnmvzk";
+       version = "1.3";
+       sha256 = "09zfwp38ydg7gzivym6k4aid93jm78g1dad04zd0g6zsqb8gpcvb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32608,8 +32721,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.5.17";
-       sha256 = "0ss71fn4d1grasgm1rvg7y4sngfnhsknmf6gxby0yvwfm95fi8aj";
+       version = "3.2.5.18";
+       sha256 = "16v3308zap5jhpd9xsvjdgp28330iscaikdl76jqf5jhb175pxzr";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32628,6 +32741,8 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -33777,6 +33892,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_4_5_1" = 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.1";
+       sha256 = "1a7ykj2c8bk7y8iaac1076sp4c4qzxh37d97w0xv63srmy7l1r8s";
+       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
+         template-haskell text tf-random transformers unordered-containers
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers gauge hashable mtl random
+         raw-strings-qq text transformers unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avwx" = callPackage
     ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
      , parsers, pretty-show, text
@@ -34758,6 +34908,8 @@ self: {
        pname = "b-tree";
        version = "0.1.4";
        sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg";
+       revision = "1";
+       editedCabalFile = "106vsqgv7545p0rky073sd7viidbg4zy3fzlb39r9irbl3p3giih";
        libraryHaskellDepends = [
          base binary bytestring containers directory errors exceptions
          filepath lens mmap mtl pipes pipes-interleave transformers vector
@@ -34840,6 +34992,40 @@ self: {
        broken = true;
      }) {};
 
+  "backblaze-b2-hs" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, conduit, containers, cryptonite, formatting
+     , http-client, http-types, protolude, req, req-conduit, scientific
+     , tasty, tasty-hunit, text, time, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "backblaze-b2-hs";
+       version = "0.1.0.0";
+       sha256 = "18xpjz3w9yw79732xiz8278gbd1v9vg534l0h9azg0wwhd8vbh7j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         containers cryptonite formatting http-client http-types protolude
+         req req-conduit scientific text time unliftio unliftio-core
+       ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         containers cryptonite formatting http-client http-types protolude
+         req req-conduit scientific text time unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         containers cryptonite formatting http-client http-types protolude
+         req req-conduit scientific tasty tasty-hunit text time unliftio
+         unliftio-core
+       ];
+       description = "A client library to access Backblaze B2 cloud storage in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "backdropper" = callPackage
     ({ mkDerivation, base, directory, haskell98, hslogger, old-time
      , process, random
@@ -34880,6 +35066,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "backstop" = callPackage
+    ({ mkDerivation, base, directory, filepath, HUnit, mtl, process
+     , QuickCheck, unix
+     }:
+     mkDerivation {
+       pname = "backstop";
+       version = "1.3.0.352";
+       sha256 = "1790n52amkvwlm92rh6i6rxfxbw2n2cfam2sf0cx4yf160jxvyj3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath mtl process unix
+       ];
+       executableHaskellDepends = [
+         base directory filepath mtl process unix
+       ];
+       testHaskellDepends = [
+         base filepath HUnit process QuickCheck unix
+       ];
+       description = "Backstop a target directory by source directories";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "backtracking-exceptions" = callPackage
     ({ mkDerivation, base, either, free, kan-extensions, mtl
      , semigroupoids, semigroups, transformers
@@ -35531,6 +35742,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base-unicode-symbols_0_2_4_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-unicode-symbols";
+       version = "0.2.4.2";
+       sha256 = "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23";
+       libraryHaskellDepends = [ base ];
+       description = "Unicode alternatives for common functions and operators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base16-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim }:
      mkDerivation {
@@ -35756,6 +35979,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basement_0_0_11" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "basement";
+       version = "0.0.11";
+       sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "Foundation scrap box of array & string";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "basen-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck }:
      mkDerivation {
@@ -36437,6 +36672,8 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -36666,17 +36903,25 @@ self: {
 
   "bench-show" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv
-     , directory, filepath, mwc-random, split, statistics, text
+     , directory, filepath, mwc-random, optparse-applicative
+     , optparse-simple, semigroups, split, statistics, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "bench-show";
-       version = "0.2.2";
-       sha256 = "12fi59j9a98n4q6gjvjsf0hjc2rsy33b7kzjiqxy5wzh8isciaa4";
+       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;
@@ -38822,7 +39067,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) wlc;};
+     }) {wlc = null;};
 
   "bindings-yices" = callPackage
     ({ mkDerivation, base, gmp, yices }:
@@ -39178,8 +39423,8 @@ self: {
      }:
      mkDerivation {
        pname = "birch-beer";
-       version = "0.1.4.0";
-       sha256 = "0vmyp13lxppkar2lgkc231kx7am0h8p2gq6m0swzaz3ra64yh39c";
+       version = "0.1.4.2";
+       sha256 = "02q89rp7f12vf257f2m7g34qwv15027k7gsm4yq95blhi4c5rbg0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39913,21 +40158,21 @@ self: {
      }) {};
 
   "bitvec" = callPackage
-    ({ mkDerivation, base, HUnit, primitive, QuickCheck
-     , quickcheck-classes, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector
+    ({ mkDerivation, base, gauge, ghc-prim, primitive
+     , quickcheck-classes, tasty, tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "bitvec";
-       version = "0.2.0.1";
-       sha256 = "0mgmf60gy3nzp66mf4bydls46bddk76rz40zkdfp0hhsspasia9b";
-       libraryHaskellDepends = [ base primitive vector ];
+       version = "1.0.0.0";
+       sha256 = "0m33q70h513iiiwv7w45p4zz7jkf00p5kjy9x3ds6y2rk4di4vl2";
+       libraryHaskellDepends = [ base ghc-prim primitive vector ];
        testHaskellDepends = [
-         base HUnit primitive QuickCheck quickcheck-classes test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
+         base primitive quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base gauge vector ];
        description = "Unboxed bit vectors";
-       license = stdenv.lib.licenses.publicDomain;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -41113,33 +41358,36 @@ self: {
      }) {};
 
   "board-games" = callPackage
-    ({ mkDerivation, array, base, cgi, containers, criterion, html
-     , httpd-shed, network-uri, non-empty, QuickCheck, random
-     , transformers, utility-ht
+    ({ mkDerivation, array, base, cgi, containers, criterion
+     , enummapset, html, httpd-shed, network-uri, non-empty, parallel
+     , QuickCheck, random, transformers, utility-ht
      }:
      mkDerivation {
        pname = "board-games";
-       version = "0.2.1";
-       sha256 = "1gsbk1m58f82b1ic0fv1ygslz4lyxxdl0a849q5hl4qbl9s7rbqb";
+       version = "0.3";
+       sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base cgi containers html non-empty random transformers
-         utility-ht
+         array base cgi containers enummapset html non-empty QuickCheck
+         random transformers utility-ht
        ];
        executableHaskellDepends = [
          array base cgi containers html httpd-shed network-uri non-empty
          random transformers utility-ht
        ];
        testHaskellDepends = [
-         array base containers non-empty QuickCheck random transformers
-         utility-ht
+         array base containers enummapset non-empty QuickCheck random
+         transformers utility-ht
        ];
        benchmarkHaskellDepends = [
-         base containers criterion non-empty utility-ht
+         base containers criterion enummapset non-empty parallel QuickCheck
+         random transformers utility-ht
        ];
        description = "Three games for inclusion in a web server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bogocopy" = callPackage
@@ -41612,6 +41860,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "boots" = callPackage
+    ({ mkDerivation, base, data-default, exceptions, fast-logger, hspec
+     , microlens, monad-logger, mtl, salak, salak-yaml, text
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "boots";
+       version = "0.0.3";
+       sha256 = "1glf3hq3vqa3rd115ym7jy5jmwx8mzqbidj875274safg8n552rm";
+       libraryHaskellDepends = [
+         base data-default exceptions fast-logger microlens monad-logger mtl
+         salak salak-yaml text unliftio-core
+       ];
+       testHaskellDepends = [
+         base data-default exceptions fast-logger hspec microlens
+         monad-logger mtl salak salak-yaml text unliftio-core
+       ];
+       description = "Boot application by plugins";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "bootstrap-types" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -41899,6 +42170,43 @@ self: {
        broken = true;
      }) {};
 
+  "box" = callPackage
+    ({ mkDerivation, async, attoparsec, base, concurrency
+     , contravariant, data-default, dejafu, doctest, exceptions, flow
+     , foldl, generic-lens, lens, mmorph, pipes, profunctors, protolude
+     , random, stm, streaming, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "box";
+       version = "0.0.1.2";
+       sha256 = "11g3ig1n1myfgcfvp6gkn5lyr2gdzj4zpginwmjac1c599xiyf8i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async attoparsec base concurrency contravariant data-default dejafu
+         exceptions flow foldl generic-lens lens mmorph pipes profunctors
+         protolude random stm streaming text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         async attoparsec base concurrency contravariant data-default dejafu
+         exceptions flow foldl generic-lens lens mmorph pipes profunctors
+         protolude random stm streaming text time transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         async attoparsec base concurrency contravariant data-default dejafu
+         doctest exceptions flow foldl generic-lens lens mmorph pipes
+         profunctors protolude random stm streaming text time transformers
+         transformers-base
+       ];
+       description = "boxes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "box-tuples" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -43488,7 +43796,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bv-little_1_0_1" = callPackage
+  "bv-little_1_1_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
      , keys, mono-traversable, mono-traversable-keys, primitive
      , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck
@@ -43496,8 +43804,8 @@ self: {
      }:
      mkDerivation {
        pname = "bv-little";
-       version = "1.0.1";
-       sha256 = "1as21xhzrzcqmrqybczwxhh81avgkmdgn7hhk534dxv6csd7jyp6";
+       version = "1.1.0";
+       sha256 = "1cpmwmd6gig0gggbr197cjpp0ykaj30jniqq3r5lsv644wizkg6r";
        libraryHaskellDepends = [
          base deepseq hashable integer-gmp keys mono-traversable
          mono-traversable-keys primitive QuickCheck text-show
@@ -43569,12 +43877,12 @@ self: {
      }) {};
 
   "byte-order" = callPackage
-    ({ mkDerivation, base, primitive }:
+    ({ mkDerivation, base, primitive, primitive-unaligned }:
      mkDerivation {
        pname = "byte-order";
-       version = "0.1.0.0";
-       sha256 = "1g0bqx4xzv9y5shjn4wbnrrskahrmybzm1sw1kryyn5z8w7srw34";
-       libraryHaskellDepends = [ base primitive ];
+       version = "0.1.1.0";
+       sha256 = "09j6gkvg1nv05dga46cyxsgnf5ksqbnnsz9nf36xg0vw6c352w7s";
+       libraryHaskellDepends = [ base primitive primitive-unaligned ];
        testHaskellDepends = [ base primitive ];
        description = "Portable big-endian and little-endian conversions";
        license = stdenv.lib.licenses.bsd3;
@@ -43677,15 +43985,15 @@ self: {
        broken = true;
      }) {};
 
-  "bytestring_0_10_8_2" = callPackage
+  "bytestring_0_10_10_0" = callPackage
     ({ mkDerivation, base, byteorder, deepseq, directory, dlist
      , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "bytestring";
-       version = "0.10.8.2";
-       sha256 = "0fjc5ybxx67l0kh27l6vq4saf88hp1wnssj5ka90ii588y76cvys";
+       version = "0.10.10.0";
+       sha256 = "1h94lyyn4fpklm25dsazj9za08m0vz9irafpza90h9j5wx4qpndq";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        testHaskellDepends = [
          base byteorder deepseq directory dlist ghc-prim HUnit mtl
@@ -44552,8 +44860,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cache";
-       version = "1.0.1.0";
-       sha256 = "0x013n44ppwm6vh9n9wch8hki2g3pr2bahngymdm7vd6628jpshz";
+       version = "1.0.1.1";
+       sha256 = "1yb3wvjqqmkm4aysfyx4zf1z88453ywfc4czb4zvghfdgd95d0rx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45129,6 +45437,8 @@ self: {
        pname = "cabal-rpm";
        version = "0.12.6";
        sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns";
+       revision = "1";
+       editedCabalFile = "0wfj9gcygm1c9fy86973ybs8ww8g6fn3l7f5v2kvs28204g8i18g";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45148,6 +45458,8 @@ self: {
        pname = "cabal-rpm";
        version = "0.13.3";
        sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4";
+       revision = "1";
+       editedCabalFile = "1ngw9afzplbz4q707nak9zcjmk9fdynw0jvis4lgjq02y4i14hj6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46348,15 +46660,29 @@ self: {
        broken = true;
      }) {};
 
+  "can-i-haz" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, should-not-typecheck }:
+     mkDerivation {
+       pname = "can-i-haz";
+       version = "0.1.0.0";
+       sha256 = "1nsbw6k550n5vc2d17463sjci8a8k2f09519gp8hmdj19a9dlnc7";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq hspec should-not-typecheck ];
+       description = "Generic implementation of the Has pattern";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "canon" = callPackage
     ({ mkDerivation, arithmoi, array, base, containers, random }:
      mkDerivation {
        pname = "canon";
-       version = "0.1.1.1";
-       sha256 = "0z2s4bk6xs9p2lgg7r70nhr6igvw3z5iarc29slsg0cv9w4232c1";
+       version = "0.1.1.2";
+       sha256 = "181c09kh76104b23hf52b049cc6clww1y9kffw1f0hnkxhds9n84";
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -46373,21 +46699,22 @@ self: {
      }) {};
 
   "canonical-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, parsec
-     , pretty, QuickCheck, tasty, tasty-quickcheck, unordered-containers
-     , vector
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, parsec, pretty, QuickCheck, tasty, tasty-quickcheck
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "canonical-json";
-       version = "0.5.0.1";
-       sha256 = "1r52f69afsnl6kmn0h2rl6wp21jjain4kz6123a1haacfm2f2hwj";
+       version = "0.6.0.0";
+       sha256 = "0lb847hvgkn49g6rvmavk14brvvpiy6q5fswk3cm9rc53hbq02zz";
        libraryHaskellDepends = [
-         base bytestring containers parsec pretty
+         base bytestring containers deepseq parsec pretty
        ];
        testHaskellDepends = [
-         aeson base bytestring QuickCheck tasty tasty-quickcheck
+         aeson base bytestring containers QuickCheck tasty tasty-quickcheck
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47661,6 +47988,19 @@ self: {
        broken = true;
      }) {};
 
+  "category_0_2_4_1" = callPackage
+    ({ mkDerivation, alg, base, transformers }:
+     mkDerivation {
+       pname = "category";
+       version = "0.2.4.1";
+       sha256 = "0gliy1frgpgyzq3vkin315ylpklfc6dvg0vd93hz8f9m3js6dm48";
+       libraryHaskellDepends = [ alg base transformers ];
+       description = "Categorical types and classes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "category-extras" = callPackage
     ({ mkDerivation, adjunctions, bifunctors, categories, comonad
      , comonad-extras, comonad-transformers, comonads-fd, contravariant
@@ -47894,6 +48234,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cborg_0_2_2_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base-orphans
+     , base16-bytestring, base64-bytestring, bytestring, containers
+     , deepseq, fail, ghc-prim, half, integer-gmp, primitive, QuickCheck
+     , random, scientific, tasty, tasty-hunit, tasty-quickcheck, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "cborg";
+       version = "0.2.2.0";
+       sha256 = "1rdnvy0w17s70ikmbyrnwax5rvqh19l95sh8i7ipgxi23z1r0bp1";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq ghc-prim half integer-gmp
+         primitive text
+       ];
+       testHaskellDepends = [
+         aeson array base base-orphans base16-bytestring base64-bytestring
+         bytestring deepseq fail half QuickCheck random scientific tasty
+         tasty-hunit tasty-quickcheck text vector
+       ];
+       description = "Concise Binary Object Representation (CBOR)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cborg-json" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, cborg, scientific, text
      , unordered-containers, vector
@@ -49232,6 +49597,8 @@ self: {
        ];
        description = "A simple and intuitive library for automated testing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chell-hunit" = callPackage
@@ -49243,6 +49610,8 @@ self: {
        libraryHaskellDepends = [ base chell HUnit ];
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chell-quickcheck" = callPackage
@@ -49254,6 +49623,8 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chessIO" = callPackage
@@ -49724,23 +50095,24 @@ self: {
 
   "chronos" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , criterion, deepseq, hashable, HUnit, old-locale, primitive
-     , QuickCheck, semigroups, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, thyme, time, torsor, vector
+     , criterion, deepseq, doctest, hashable, HUnit, old-locale
+     , primitive, QuickCheck, semigroups, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, thyme
+     , time, torsor, vector
      }:
      mkDerivation {
        pname = "chronos";
-       version = "1.0.5";
-       sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz";
-       revision = "3";
-       editedCabalFile = "13gjxvybjkgw0qs1vi45b7vs4d2lbh7l76kl8m99dd13dvvb49qf";
+       version = "1.0.6";
+       sha256 = "07z79acmr8768m31knr9r90x0f8xabdkvvyd7y0bv7061562fvdz";
+       revision = "1";
+       editedCabalFile = "156f61rp421x1hisdiq1m7nbaaq4hczfv66v9g94blv3a48rjwzz";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock hashable primitive
          semigroups text torsor vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text
+         attoparsec base bytestring doctest HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text torsor
        ];
        benchmarkHaskellDepends = [
          attoparsec base bytestring criterion deepseq old-locale QuickCheck
@@ -50540,8 +50912,8 @@ self: {
      }:
      mkDerivation {
        pname = "clang-pure";
-       version = "0.2.0.4";
-       sha256 = "13c03zj15xx8hq6gqvq62dfqz936mrrz34irk7bqyi0sbhqgrjn1";
+       version = "0.2.0.5";
+       sha256 = "0s84q6qdym02xvva3iq559kmhwzb08slip69h4cvvc6a7lqmaj37";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal inline-c process ];
@@ -53477,8 +53849,8 @@ self: {
        pname = "colour-space";
        version = "0.1.4.0";
        sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq";
-       revision = "1";
-       editedCabalFile = "1n9n76g9zjp1i02f964dlfy65m978m8whbcivd063pf1acp9njax";
+       revision = "2";
+       editedCabalFile = "0qldxm84rk344h4wgk3bqsxfhkmvj8psm0sqgfnjh34a4fy5hjzg";
        libraryHaskellDepends = [
          base colour constrained-categories JuicyPixels linear
          linearmap-category manifolds semigroups vector-space
@@ -53529,6 +53901,23 @@ self: {
        broken = true;
      }) {};
 
+  "columnar" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, enum-text
+     , fmt, lens, possibly, rio, template-haskell, text, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "columnar";
+       version = "1.0.0.0";
+       sha256 = "0qf5fbd9cwc22npww4qsjaj7rxdy2r3rjm19w23a9shqvgc2l6av";
+       libraryHaskellDepends = [
+         base bytestring cassava containers enum-text fmt lens possibly rio
+         template-haskell text time unordered-containers vector
+       ];
+       description = "A CSV toolkit based on cassava and enum-text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "com" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -56746,6 +57135,8 @@ self: {
        pname = "constrained-categories";
        version = "0.4.0.0";
        sha256 = "1wq4ivkgxbwxxrfk5lwn2psbbiaq87dr8zf1z9b9yhw2hi75lsgw";
+       revision = "1";
+       editedCabalFile = "0f96xmq5j03f9ks9cjlgbc5wq0azdbrbj2lh3kr3ybz658dli3j7";
        libraryHaskellDepends = [
          base contravariant semigroups tagged trivial-constraint void
        ];
@@ -56923,8 +57314,8 @@ self: {
      }:
      mkDerivation {
        pname = "constraints-deriving";
-       version = "1.0.4.0";
-       sha256 = "1a78bb8gld07g5m9lwg6phdx3i87pmlk47hic2vbpi9n68kl055v";
+       version = "1.1.0.0";
+       sha256 = "15rspwn8i2rwmqsxb505087ars0i10licwj4adsgm89ajhgrqvp9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -57241,17 +57632,22 @@ self: {
 
   "contiguous" = callPackage
     ({ mkDerivation, base, deepseq, primitive, primitive-unlifted
-     , QuickCheck, quickcheck-instances, vector
+     , QuickCheck, quickcheck-classes, quickcheck-instances, random
+     , random-shuffle, vector, weigh
      }:
      mkDerivation {
        pname = "contiguous";
-       version = "0.4.0.1";
-       sha256 = "1hs9jvl9zzy7jdbxna0aw8nbq3af327xfgb0cgzwmp55iwpjn9rn";
+       version = "0.5";
+       sha256 = "0nz3ssh0zc8rs67mk8fmc8plvbjac6mlxdmzk9fw8sj2vx2ssisq";
        libraryHaskellDepends = [
          base deepseq primitive primitive-unlifted
        ];
        testHaskellDepends = [
-         base primitive QuickCheck quickcheck-instances vector
+         base primitive QuickCheck quickcheck-classes quickcheck-instances
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         base primitive random random-shuffle weigh
        ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -58087,6 +58483,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "core-data" = 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.0.0";
+       sha256 = "1lzvs99qqw8nvgqqz080zdsxl5vdxdmnffxl8s26c7p41izycp5n";
+       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;
+     }) {};
+
   "core-haskell" = callPackage
     ({ mkDerivation, base, haskeline, haskell-src-exts, hint }:
      mkDerivation {
@@ -58104,6 +58518,44 @@ self: {
        broken = true;
      }) {};
 
+  "core-program" = callPackage
+    ({ mkDerivation, async, base, bytestring, chronologique, core-data
+     , core-text, directory, exceptions, hashable, hourglass, mtl
+     , prettyprinter, prettyprinter-ansi-terminal, safe-exceptions, stm
+     , template-haskell, terminal-size, text, text-short, transformers
+     , unix
+     }:
+     mkDerivation {
+       pname = "core-program";
+       version = "0.2.0.0";
+       sha256 = "13907wk5p8yc31wf7s3w6an8g2b5j8pp0k196l5fh90c5dadizys";
+       libraryHaskellDepends = [
+         async base bytestring chronologique core-data core-text directory
+         exceptions hashable hourglass mtl prettyprinter
+         prettyprinter-ansi-terminal safe-exceptions stm template-haskell
+         terminal-size text text-short transformers unix
+       ];
+       description = "Opinionated Haskell Interoperability";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "core-text" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable
+     , prettyprinter, prettyprinter-ansi-terminal, template-haskell
+     , text, text-short
+     }:
+     mkDerivation {
+       pname = "core-text";
+       version = "0.2.0.0";
+       sha256 = "1rkbz43vnjv8vv68xh98qcp59lmahw4sdpfnhvgrh92wj0namifk";
+       libraryHaskellDepends = [
+         base bytestring deepseq fingertree hashable prettyprinter
+         prettyprinter-ansi-terminal template-haskell text text-short
+       ];
+       description = "A text type based on a finger tree over UTF-8 fragments";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "corebot-bliki" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , directory, filepath, filestore, http-types, monads-tf, pandoc
@@ -58545,24 +58997,25 @@ self: {
      }) {};
 
   "cpkg" = callPackage
-    ({ mkDerivation, base, binary, bytestring, bzlib, containers, cpphs
-     , dhall, dir-traverse, directory, filemanip, filepath, hashable
-     , hspec, hspec-megaparsec, http-client, http-client-tls, libarchive
-     , lzma, megaparsec, microlens, mtl, network-uri
-     , optparse-applicative, prettyprinter, process, recursion, tar
-     , temporary, text, zip-archive, zlib
+    ({ mkDerivation, base, binary, bytestring, bzlib
+     , composition-prelude, containers, cpphs, dhall, dir-traverse
+     , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec
+     , http-client, http-client-tls, libarchive, lzma, megaparsec
+     , microlens, mtl, network-uri, optparse-applicative, prettyprinter
+     , process, recursion, tar, temporary, text, zip-archive, zlib
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.1.0";
-       sha256 = "0wwfdw4qvgf25zych8pvknx99pr4zrxknyi80laqx7b7w5l0rnvc";
+       version = "0.2.3.1";
+       sha256 = "0nw1h6zgx3dizx92nwzdf9ny8bzyfa2n28lpv34xvw38fz9yq16w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring bzlib containers dhall dir-traverse
-         directory filemanip filepath hashable http-client http-client-tls
-         libarchive lzma megaparsec microlens mtl network-uri prettyprinter
-         process recursion tar temporary text zip-archive zlib
+         base binary bytestring bzlib composition-prelude containers dhall
+         dir-traverse directory filemanip filepath hashable http-client
+         http-client-tls libarchive lzma megaparsec microlens mtl
+         network-uri prettyprinter process recursion tar temporary text
+         zip-archive zlib
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
@@ -58815,7 +59268,7 @@ self: {
        broken = true;
      }) {};
 
-  "cql-io_1_1_0" = callPackage
+  "cql-io_1_1_1" = callPackage
     ({ mkDerivation, async, auto-update, base, bytestring, containers
      , cql, cryptonite, data-default-class, Decimal, exceptions
      , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network
@@ -58825,10 +59278,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql-io";
-       version = "1.1.0";
-       sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw";
-       revision = "1";
-       editedCabalFile = "0zxc28i4c26qi6xpgsyhn0f539ni6wv6c1pixh056bzm9pwp60d7";
+       version = "1.1.1";
+       sha256 = "1zg199ifkqh1ba335vqp0jlm4sn5ybjxap4qymb54bylhwj0vzcp";
        libraryHaskellDepends = [
          async auto-update base bytestring containers cql cryptonite
          data-default-class exceptions hashable HsOpenSSL iproute lens mtl
@@ -59526,6 +59977,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "criterion-compare" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams
+     , clay, colour, containers, data-default, filepath, lens, lucid
+     , optparse-applicative, text, vector
+     }:
+     mkDerivation {
+       pname = "criterion-compare";
+       version = "0.1.0.0";
+       sha256 = "034cm3hap9x6cwp44hrd03b09mifcm076a9pn3lgql5ardx91yl7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring cassava Chart Chart-diagrams clay colour containers
+         data-default filepath lens lucid optparse-applicative text vector
+       ];
+       description = "A simple tool for visualising differences in Criterion benchmark results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "criterion-measurement" = callPackage
     ({ mkDerivation, aeson, base, base-compat, binary, containers
      , deepseq, vector
@@ -62546,8 +63018,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
-       version = "0.1.2.2";
-       sha256 = "1aibiml1vs983lbxq18zcn9h11k3zjrxpsx4rxssqdjwni1kg9yi";
+       version = "0.1.2.3";
+       sha256 = "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
@@ -64042,6 +64514,34 @@ self: {
        broken = true;
      }) {};
 
+  "database-id-class" = callPackage
+    ({ mkDerivation, aeson, base }:
+     mkDerivation {
+       pname = "database-id-class";
+       version = "0.1.0.1";
+       sha256 = "0zm053ll1vwd5gdwq4p3zpl9f010q894nk3djaad3ry4y2mirsc4";
+       libraryHaskellDepends = [ aeson base ];
+       description = "Class for types with a database id";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "database-id-groundhog" = callPackage
+    ({ mkDerivation, aeson, base, database-id-class, groundhog
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "database-id-groundhog";
+       version = "0.1.0.1";
+       sha256 = "16q90lzxjbisfdvcl4lbjlfmn02xnscsxkv9hm35xw9z8q19zlsx";
+       libraryHaskellDepends = [
+         aeson base database-id-class groundhog template-haskell
+       ];
+       description = "HasId/Groundhog interop";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "database-migrate" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, directory
      , either, filepath, lens, postgresql-simple, text, time
@@ -64113,6 +64613,8 @@ self: {
        pname = "datadog-tracing";
        version = "1.5.1";
        sha256 = "1jjgavp9winbl2gyix61y30myvzhvzb500l2zwcb087cqzy7z6nb";
+       revision = "2";
+       editedCabalFile = "1mb0g3lddphaki1q946dpayhjdma9g0xcx55wdmksbhkjrbm0rgb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65519,6 +66021,8 @@ self: {
        pname = "decimal-literals";
        version = "0.1.0.1";
        sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0";
+       revision = "1";
+       editedCabalFile = "0giz73yb179xvww1s92dbl4mhvcxlv25f0zrjwc9lsvx9h2aivg0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
@@ -67144,46 +67648,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_24_0" = callPackage
+  "dhall_1_25_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , bytestring, case-insensitive, cborg, cborg-json, containers
-     , contravariant, criterion, cryptonite, deepseq, Diff, directory
-     , doctest, dotgen, exceptions, filepath, foldl, haskeline
+     , contravariant, cryptonite, deepseq, Diff, directory, doctest
+     , dotgen, either, exceptions, filepath, foldl, gauge, haskeline
      , http-client, http-client-tls, http-types, lens-family-core
      , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
      , prettyprinter, prettyprinter-ansi-terminal, profunctors
-     , QuickCheck, quickcheck-instances, repline, scientific, serialise
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
-     , transformers, transformers-compat, turtle, unordered-containers
-     , uri-encode, vector
+     , QuickCheck, quickcheck-instances, repline, scientific, semigroups
+     , serialise, spoon, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, th-lift-instances, transformers
+     , transformers-compat, turtle, unordered-containers, uri-encode
+     , vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.24.0";
-       sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7";
-       revision = "1";
-       editedCabalFile = "1b0gqva12rh0fynddal7q8jy6i3yax79br8xbfp9kh7936w9cs1j";
+       version = "1.25.0";
+       sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring case-insensitive
-         cborg cborg-json containers contravariant cryptonite Diff directory
-         dotgen exceptions filepath haskeline http-client http-client-tls
-         http-types lens-family-core megaparsec memory mtl
+         cborg cborg-json containers contravariant cryptonite deepseq Diff
+         directory dotgen either exceptions filepath haskeline http-client
+         http-client-tls http-types lens-family-core megaparsec memory mtl
          optparse-applicative parsers prettyprinter
          prettyprinter-ansi-terminal profunctors repline scientific
-         serialise template-haskell text transformers transformers-compat
-         unordered-containers uri-encode vector
+         serialise template-haskell text th-lift-instances transformers
+         transformers-compat unordered-containers uri-encode vector
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring cborg containers deepseq directory doctest filepath
-         foldl megaparsec mockery prettyprinter QuickCheck
-         quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
-         text transformers turtle vector
+         foldl lens-family-core megaparsec mockery prettyprinter QuickCheck
+         quickcheck-instances semigroups serialise spoon tasty tasty-hunit
+         tasty-quickcheck text transformers turtle vector
        ];
        benchmarkHaskellDepends = [
-         base bytestring containers criterion directory serialise text
+         base bytestring containers directory gauge serialise text
        ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
@@ -67211,14 +67714,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash_1_0_21" = callPackage
+  "dhall-bash_1_0_22" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.21";
-       sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098";
+       version = "1.0.22";
+       sha256 = "1qxcf3f8a390znwkbhcirlgqpgg0ssc3bnwdml7wkv8k0qwqq57j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67279,28 +67782,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_3_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , dhall, exceptions, lens, libyaml, optparse-applicative
+  "dhall-json_1_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+     , bytestring, containers, dhall, exceptions, libyaml
+     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.3.0";
-       sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi";
-       revision = "1";
-       editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks";
+       version = "1.4.0";
+       sha256 = "0kxb71m1rf6y7z3wx4yx5ks0p5vhnlpgchsih3mfn9ygppc2z0ri";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers dhall exceptions lens
+         aeson aeson-pretty base bytestring containers dhall exceptions
          libyaml optparse-applicative scientific text unordered-containers
          vector yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall exceptions
-         optparse-applicative text
+         aeson aeson-pretty ansi-terminal base bytestring dhall exceptions
+         optparse-applicative prettyprinter prettyprinter-ansi-terminal text
        ];
        testHaskellDepends = [
          aeson base bytestring dhall tasty tasty-hunit text
@@ -67329,20 +67831,51 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , insert-ordered-containers, neat-interpolation, optparse-generic
-     , text
+  "dhall-lsp-server" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , cryptonite, data-default, dhall, dhall-json, directory, doctest
+     , dotgen, filepath, haskell-lsp, hslogger, lens, lens-family-core
+     , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter
+     , sorted-list, stm, text, transformers, unordered-containers
+     , uri-encode, yi-rope
      }:
      mkDerivation {
-       pname = "dhall-nix";
-       version = "1.1.6";
-       sha256 = "0pchanzgcag6z7fywqm09xj29n0pfxd2ya2ky64aapykq038jxbs";
+       pname = "dhall-lsp-server";
+       version = "1.0.0";
+       sha256 = "1i4bx8qiy1hbs6bm50fixj1ipkd9rm6y6z3bci8ngh1rhy5v51x1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-fix dhall hnix insert-ordered-containers
-         neat-interpolation text
+         aeson aeson-pretty base bytestring containers cryptonite
+         data-default dhall dhall-json dotgen filepath haskell-lsp hslogger
+         lens lens-family-core megaparsec mtl network-uri
+         optparse-applicative prettyprinter sorted-list stm text
+         transformers unordered-containers uri-encode yi-rope
+       ];
+       executableHaskellDepends = [
+         aeson base containers data-default dhall filepath haskell-lsp
+         hslogger lens lens-family-core megaparsec mtl optparse-applicative
+         prettyprinter sorted-list stm text transformers
+         unordered-containers yi-rope
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "dhall-nix" = callPackage
+    ({ mkDerivation, base, containers, data-fix, dhall, hnix
+     , neat-interpolation, optparse-generic, text
+     }:
+     mkDerivation {
+       pname = "dhall-nix";
+       version = "1.1.7";
+       sha256 = "0axg7qq8rfy5qsffiw57lll40mw7bxgk67g7lgdb5vbri69xj3is";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-fix dhall hnix neat-interpolation text
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text
@@ -67396,6 +67929,8 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -67418,6 +67953,41 @@ self: {
        broken = true;
      }) {};
 
+  "dhrun" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, conduit
+     , conduit-extra, containers, dhall, directory, editor-open
+     , filepath, generic-random, Glob, hspec, mtl, optparse-applicative
+     , process, protolude, quickcheck-text, tasty, tasty-golden
+     , tasty-hspec, tasty-hunit, tasty-quickcheck, text, time, unix
+     , unliftio, unliftio-core, yaml
+     }:
+     mkDerivation {
+       pname = "dhrun";
+       version = "1.0.1";
+       sha256 = "1gyg5221g1qsq2h62lcdwi4g7amis26692hh3fdi824bjylz8pal";
+       isLibrary = false;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring conduit conduit-extra containers
+         dhall directory mtl process protolude text time unix unliftio-core
+         yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring dhall directory editor-open filepath
+         optparse-applicative protolude
+       ];
+       testHaskellDepends = [
+         aeson base bytestring dhall filepath generic-random Glob hspec mtl
+         protolude quickcheck-text tasty tasty-golden tasty-hspec
+         tasty-hunit tasty-quickcheck text unliftio yaml
+       ];
+       doHaddock = false;
+       description = "Dhall/YAML configurable concurrent integration test executor";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "di" = callPackage
     ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
      , di-monad, exceptions
@@ -69319,24 +69889,25 @@ self: {
 
   "discord-haskell" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
-     , containers, data-default, http-client, iso8601-time, JuicyPixels
-     , MonadRandom, req, safe-exceptions, text, time
+     , containers, data-default, emoji, http-client, iso8601-time
+     , JuicyPixels, MonadRandom, req, safe-exceptions, text, time
      , unordered-containers, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "0.8.4";
-       sha256 = "1x2rqnvmxcyf320l0vyrj2dw5p1nql588zp8nknnwpk0sp0dxmjm";
+       version = "1.0.0";
+       sha256 = "1z0d46gd7rgwbh05ws6hcp4rikach0yg1fim6ni0ww4g0mksj8j3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring containers
-         data-default http-client iso8601-time JuicyPixels MonadRandom req
-         safe-exceptions text time unordered-containers vector websockets
-         wuss
+         data-default emoji http-client iso8601-time JuicyPixels MonadRandom
+         req safe-exceptions text time unordered-containers vector
+         websockets wuss
        ];
+       executableHaskellDepends = [ base text ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-hs" = callPackage
@@ -70364,6 +70935,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ditto" = callPackage
+    ({ mkDerivation, base, containers, mtl, semigroups, text }:
+     mkDerivation {
+       pname = "ditto";
+       version = "0.3.1";
+       sha256 = "1y3s0q0c0lsj6hsszazbd0yjb10nagvg96nw3x154kz55mn2bdym";
+       libraryHaskellDepends = [ base containers mtl semigroups text ];
+       description = "ditto is a type-safe HTML form generation and validation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ditto-lucid" = callPackage
+    ({ mkDerivation, base, ditto, lucid, path-pieces, text }:
+     mkDerivation {
+       pname = "ditto-lucid";
+       version = "0.3.2";
+       sha256 = "1asp25vi3m6rbk1wllqb1gzjrgifndhcpr2blx1j132ql6h5qqpj";
+       libraryHaskellDepends = [ base ditto lucid path-pieces text ];
+       description = "Add support for using lucid with Ditto";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diversity" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -70714,6 +71307,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_4_0_0" = callPackage
+    ({ mkDerivation, array, async, attoparsec, auto-update, base
+     , base16-bytestring, base64-bytestring, bytestring, Cabal
+     , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec
+     , iproute, mtl, network, psqueues, QuickCheck, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "4.0.0";
+       sha256 = "0gq0y8pw4x8fja0f3hhwpbxh4rg2i8nzfnp2rxh2py49qfhg38mj";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array async attoparsec auto-update base base16-bytestring
+         base64-bytestring bytestring containers cryptonite hourglass
+         iproute mtl network psqueues
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec iproute network QuickCheck word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -71026,6 +71644,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "doctemplates_0_3_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , Glob, mtl, parsec, scientific, tasty, tasty-golden, tasty-hunit
+     , temporary, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "doctemplates";
+       version = "0.3.0.1";
+       sha256 = "11xvrmk9qb2izq8y61pna0lxlsfr5yb94nlk5ih8z1fcdn7ghl3j";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base containers filepath mtl parsec scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring filepath Glob mtl tasty tasty-golden
+         tasty-hunit temporary text
+       ];
+       description = "Pandoc-style document templates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
@@ -71294,6 +71935,26 @@ self: {
        broken = true;
      }) {};
 
+  "doldol" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th
+     }:
+     mkDerivation {
+       pname = "doldol";
+       version = "0.4.1.2";
+       sha256 = "0r9ylifyyv2mg4b94ikv8q56j0z5f6qa8r2jcpqg0xzdznwxqlv5";
+       revision = "1";
+       editedCabalFile = "0xwbdrfzd6z3nwkgnav2drisw2sn464ggkz8fid58cym9hbfpl47";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th
+       ];
+       description = "Flag packer & handler for flaggable data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dollaridoos" = callPackage
     ({ mkDerivation, base, profunctors, semigroups }:
      mkDerivation {
@@ -71500,15 +72161,15 @@ self: {
        broken = true;
      }) {};
 
-  "dotenv_0_8_0_1" = callPackage
+  "dotenv_0_8_0_2" = callPackage
     ({ mkDerivation, base, base-compat, containers, directory
      , exceptions, hspec, hspec-megaparsec, megaparsec
      , optparse-applicative, process, text, transformers, yaml
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.8.0.1";
-       sha256 = "1mp6j3wcxiz75yjf9bnb4kc5gw09v0ax1fz0hhh9i2glxi53m27l";
+       version = "0.8.0.2";
+       sha256 = "0an7spi0cgvzr64nyy7p8pdslyf0jlh9l2ww52jbh1habsxjn6fp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -72624,6 +73285,8 @@ self: {
        pname = "dumb-cas";
        version = "0.2.0.0";
        sha256 = "1zcq9r2p5gjpfivprjp9hspqpayrj9in2jck5vf5ibxpc671isb4";
+       revision = "1";
+       editedCabalFile = "1269wjyywvi86gmpqdpq2niv5ifns0bqr1i5229w69jdlzrc6dqg";
        libraryHaskellDepends = [
          base containers decimal-literals hashable template-haskell
          unordered-containers
@@ -73045,8 +73708,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-graph";
-       version = "0.1.0.12";
-       sha256 = "1jygkj2jryjxlkyf0104abhkhjmfdvjaaa4zcyz7kgpny342fhiy";
+       version = "0.1.0.13";
+       sha256 = "1gx3hqbps8mvhxm03j5wri7v4qy3z42kcy8rhhcxq7dd0mryd4rz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers
@@ -73154,6 +73817,8 @@ self: {
        pname = "dynamic-plot";
        version = "0.4.0.0";
        sha256 = "1klq7lwvfwwp6z842g50a2xx6cqihp8a6551f935nr2sx9hwdr94";
+       revision = "1";
+       editedCabalFile = "0x5jxjvwfkax6lxwk28hd2p903q6zmr1nxhyahrwcnqgh6ygywiw";
        libraryHaskellDepends = [
          base colour colour-space constrained-categories containers
          data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
@@ -74093,8 +74758,8 @@ self: {
     ({ mkDerivation, base, constraints, mtl, transformers }:
      mkDerivation {
        pname = "effect-stack";
-       version = "0.2.1";
-       sha256 = "0sram572nbzpgwb3vi5fmg2f4ynsh693q05w0n5yjj8zl4a7p4ds";
+       version = "0.3";
+       sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi";
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
        license = stdenv.lib.licenses.bsd3;
@@ -74180,28 +74845,30 @@ self: {
      }) {};
 
   "egison" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
-     , HUnit, lens, mtl, parallel, parsec, process, random, regex-tdfa
-     , split, test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector
+    ({ mkDerivation, alex, array, base, containers, criterion, deepseq
+     , directory, filepath, ghc, ghc-paths, Glob, happy, hashable
+     , haskeline, HUnit, mtl, optparse-applicative, parallel, parsec
+     , process, random, regex-tdfa, split, test-framework
+     , test-framework-hunit, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.8.2";
-       sha256 = "090zhf89faakidbf8kkbsa8ck0rl7fqbpg3fwymjqlafgnfx1jc2";
+       version = "3.9.0";
+       sha256 = "1law6pwgqvp6nniwwbbsdm6fjq2fp30ywjfla2qqgwdabcqbd2vq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory ghc ghc-paths hashable haskeline
-         lens mtl parallel parsec process random regex-tdfa split text
+         mtl parallel parsec process random regex-tdfa split text
          transformers unordered-containers vector
        ];
+       libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
-         mtl parsec process regex-tdfa text transformers
-         unordered-containers vector
+         mtl optparse-applicative parsec process regex-tdfa text
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
          base filepath Glob HUnit mtl test-framework test-framework-hunit
@@ -74212,6 +74879,8 @@ self: {
        ];
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-quote" = callPackage
@@ -75805,8 +76474,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.9";
-       sha256 = "1zdin34gfi2059n1wjfxs4i2kfc0r53f3wpwhjd0fbp0as56h94s";
+       version = "1.0.10";
+       sha256 = "07vjjb7d5ndv8cailnrv5qif0d3kmi09bq1s38hwjyp5ml8dlfis";
        libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
@@ -75944,6 +76613,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "enum-text_0_5_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, fmt, hashable, possibly
+     , text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "enum-text";
+       version = "0.5.1.0";
+       sha256 = "0v48hmxbpzjpclg1q0avrc1dp4giglbxy2rkqnbj4f0sprp03kff";
+       libraryHaskellDepends = [
+         array base bytestring fmt hashable possibly text time
+         unordered-containers
+       ];
+       description = "A text rendering and parsing toolkit for enumerated types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "enum-text-rio" = callPackage
+    ({ mkDerivation, base, bytestring, enum-text, fmt, rio, text }:
+     mkDerivation {
+       pname = "enum-text-rio";
+       version = "1.2.0.0";
+       sha256 = "0cz91i1m9ibphlm153i23i03nhx41bca398hkfzf9hq904ziarna";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring enum-text fmt rio text ];
+       executableHaskellDepends = [
+         base bytestring enum-text fmt rio text
+       ];
+       description = "Making fmt available with rio";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "enum-types" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -76148,6 +76852,26 @@ self: {
        broken = true;
      }) {};
 
+  "enummapset_0_6_0_2" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit
+     , QuickCheck, semigroups, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "enummapset";
+       version = "0.6.0.2";
+       sha256 = "0476rzarcfpp4qm4qsz6wdnhr11nlfhqgrnbni591kbmngqlld1v";
+       libraryHaskellDepends = [ base containers deepseq semigroups ];
+       testHaskellDepends = [
+         array base containers deepseq ghc-prim HUnit QuickCheck semigroups
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "IntMap and IntSet with Enum keys/elements";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "enummapset-th" = callPackage
     ({ mkDerivation, base, containers, deepseq, template-haskell }:
      mkDerivation {
@@ -78949,6 +79673,8 @@ self: {
        pname = "explicit-constraint-lens";
        version = "0.1.0.0";
        sha256 = "181frvmgv65rcjpiya4gswvpq9ahz97c8lalhgmwknx9jx5nqd98";
+       revision = "1";
+       editedCabalFile = "06mj6zxj1l439g6l5ibrxbsr6ff2c199i3dlf0k1yxjck1dfblv4";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
@@ -79240,7 +79966,7 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+    ({ mkDerivation, aeson, barbies, base, bytestring, cassava, comonad
      , constraints, deepseq, exceptions, ghc-prim, hashable, lens
      , membership, monad-skeleton, mtl, prettyprinter, primitive
      , profunctors, QuickCheck, resourcet, StateVar, tagged
@@ -79249,10 +79975,10 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.5.1";
-       sha256 = "0rqq2pwp5zzpl9xzjmk0m8a54mbs10d7dywswfd84wqrngknkp10";
+       version = "0.6";
+       sha256 = "14cqsg4lamnhbdccdc0wfwzjzkpj93g92s93wmpg4214ykvr2gvf";
        libraryHaskellDepends = [
-         aeson base bytestring cassava comonad constraints deepseq
+         aeson barbies base bytestring cassava comonad constraints deepseq
          exceptions ghc-prim hashable membership monad-skeleton mtl
          prettyprinter primitive profunctors QuickCheck resourcet StateVar
          tagged template-haskell text th-lift transformers
@@ -79306,32 +80032,31 @@ self: {
      }) {};
 
   "extensible-effects-concurrent" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, data-default
-     , deepseq, directory, exceptions, extensible-effects, filepath
-     , hostname, HUnit, lens, monad-control, mtl, network, parallel
-     , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged
-     , tasty, tasty-discover, tasty-hunit, text, time, transformers-base
+    ({ mkDerivation, async, base, containers, data-default, deepseq
+     , directory, exceptions, extensible-effects, filepath, hashable
+     , hostname, HUnit, lens, monad-control, mtl, network, pretty-types
+     , QuickCheck, safe-exceptions, stm, tasty, tasty-discover
+     , tasty-hunit, text, time, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.29.2";
-       sha256 = "0a2nbnr8giil05jy5nr7d3gy3cgvq9058dzqb49as65n232n1iv1";
+       version = "0.32.0";
+       sha256 = "1zipam9jac1bj4fkzihgh0hasiwgpycidhvxb0b2b0q7ic18487a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring containers data-default deepseq directory
-         exceptions extensible-effects filepath hostname lens monad-control
-         mtl network parallel pretty-types process QuickCheck
-         safe-exceptions stm tagged text time transformers-base
+         async base containers data-default deepseq directory exceptions
+         extensible-effects filepath hashable hostname lens monad-control
+         mtl network pretty-types safe-exceptions stm text time
+         transformers-base
        ];
        executableHaskellDepends = [
-         base data-default deepseq directory extensible-effects filepath
-         lens pretty-types text
+         base data-default deepseq extensible-effects lens pretty-types text
        ];
        testHaskellDepends = [
          async base containers data-default deepseq extensible-effects
-         filepath hostname HUnit lens pretty-types QuickCheck stm tasty
-         tasty-discover tasty-hunit text time
+         filepath hostname HUnit lens monad-control pretty-types QuickCheck
+         stm tasty tasty-discover tasty-hunit text time
        ];
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
@@ -79511,6 +80236,17 @@ self: {
        broken = true;
      }) {};
 
+  "f-algebra-gen" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "f-algebra-gen";
+       version = "0.1.0.2";
+       sha256 = "1vxhfr4wqm2bclnq15lp4q496w3916ll9chj6mcqbn0r64bmmkn8";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "Generate a special f-algebra combinator from any data type";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "f-ree-hack-cheats-free-v-bucks-generator" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79819,8 +80555,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }:
      mkDerivation {
        pname = "fakefs";
-       version = "0.2.0.0";
-       sha256 = "0r20w8grmcfr5vwh8j2kfg9lm9pkcq9cvgnrw1sj2vi38s96icwx";
+       version = "0.2.0.1";
+       sha256 = "0szdjrc4m87h9dsb7qg5rpp5avnyzv47mymyihgvmxc22wiyf1c1";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Extensible fake file system for testing";
@@ -80906,6 +81642,8 @@ self: {
        pname = "fedora-haskell-tools";
        version = "0.8";
        sha256 = "03wk335dpkbcdgxqsjiavnqc43jkw8gh7y41dyfwivwd9mr32y2w";
+       revision = "1";
+       editedCabalFile = "06xak96g91krd45kvz1nscnfn4rw9gdj5xxwn8simb2vmqiy6f94";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -81004,7 +81742,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "feed_1_1_0_0" = callPackage
+  "feed_1_2_0_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, HUnit
      , markdown-unlit, old-locale, old-time, safe, test-framework
      , test-framework-hunit, text, time, time-locale-compat, utf8-string
@@ -81012,10 +81750,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed";
-       version = "1.1.0.0";
-       sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg";
-       revision = "1";
-       editedCabalFile = "0bn0vnn6v373ycrbxwqzp1ncmq649h13f2na8q8yf0i68mxampks";
+       version = "1.2.0.0";
+       sha256 = "0cakrlq1ra2gwyqmdhss4clkj0xxrwy3pc4xjzgqz4w3yd1czjg7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
@@ -83206,13 +83942,17 @@ self: {
      }) {};
 
   "flags-applicative" = callPackage
-    ({ mkDerivation, base, containers, hspec, mtl, network, text }:
+    ({ mkDerivation, base, casing, containers, hspec, mtl, network
+     , text
+     }:
      mkDerivation {
        pname = "flags-applicative";
-       version = "0.0.5.2";
-       sha256 = "1yjwnh6mqq3ypc3rs7a13j998zizfn6fn35d2wijdkm4ahyjpjhv";
-       libraryHaskellDepends = [ base containers mtl network text ];
-       testHaskellDepends = [ base hspec text ];
+       version = "0.1.0.1";
+       sha256 = "1pamcfv5g6d42ksq10af0l2a6k8y997zx3y4pvf5gcy5hlxr2gwv";
+       libraryHaskellDepends = [
+         base casing containers mtl network text
+       ];
+       testHaskellDepends = [ base containers hspec text ];
        description = "Applicative flag parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84161,6 +84901,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fmt-for-rio" = callPackage
+    ({ mkDerivation, base, enum-text-rio }:
+     mkDerivation {
+       pname = "fmt-for-rio";
+       version = "1.0.0.0";
+       sha256 = "0hxf1cgch4l5vwnsg4449ing3qi40kpfcwjg4l807sw0b18ccwar";
+       libraryHaskellDepends = [ base enum-text-rio ];
+       description = "Adaptor for getting fmt to work with rio";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "fmt-terminal-colors" = callPackage
     ({ mkDerivation, ansi-terminal, base, fmt }:
      mkDerivation {
@@ -85233,6 +85986,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foundation_0_0_24" = callPackage
+    ({ mkDerivation, base, basement, gauge, ghc-prim }:
+     mkDerivation {
+       pname = "foundation";
+       version = "0.0.24";
+       sha256 = "1yygliyg5dh06n7iyyrvy4iz2328hgb5igjp832wxrfa529pwqdk";
+       libraryHaskellDepends = [ base basement ghc-prim ];
+       testHaskellDepends = [ base basement ];
+       benchmarkHaskellDepends = [ base basement gauge ];
+       description = "Alternative prelude with batteries and no dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foundation-edge" = callPackage
     ({ mkDerivation, bytestring, foundation, text }:
      mkDerivation {
@@ -85836,8 +86603,8 @@ self: {
        pname = "free-vector-spaces";
        version = "0.1.5.0";
        sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1";
-       revision = "1";
-       editedCabalFile = "0b95827ppw0nvhaxg9axkngsij2sj8d6s06amz2vi79jgs7vbfr6";
+       revision = "3";
+       editedCabalFile = "09jy8kj31p6b4pmzry6glq7climw6pmpph23byhijs82a7yl609w";
        libraryHaskellDepends = [
          base lens linear MemoTrie pragmatic-show vector vector-space
        ];
@@ -87187,24 +87954,22 @@ self: {
     ({ mkDerivation, base, bifunctors, comonad, constraints, containers
      , dependent-sum, deriving-compat, free, hedgehog, kan-extensions
      , mmorph, mtl, natural-transformation, nonempty-containers, pointed
-     , profunctors, recursion-schemes, semigroupoids, tagged, tasty
-     , tasty-hedgehog, these, transformers, trivial-constraint, vinyl
+     , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these
+     , transformers, trivial-constraint, vinyl
      }:
      mkDerivation {
        pname = "functor-combinators";
-       version = "0.1.1.0";
-       sha256 = "1x3a2rwqhvcyr298adfc9qband5s5qwh8wfd67cgrq5qx2z4j8xf";
-       revision = "2";
-       editedCabalFile = "09r6bgjlcsjjbwqhfxqbw5dk5sj9lsbfwwsjpdzmi8z8dywgyn2z";
+       version = "0.1.1.1";
+       sha256 = "1bs1xqlndbzi91z9048clmgmgkjyyrkgcmz6s864villy0s9h90c";
        libraryHaskellDepends = [
          base bifunctors comonad constraints containers deriving-compat free
          kan-extensions mmorph mtl natural-transformation
-         nonempty-containers pointed profunctors recursion-schemes
-         semigroupoids tagged these transformers trivial-constraint vinyl
+         nonempty-containers pointed profunctors semigroupoids tagged these
+         transformers trivial-constraint vinyl
        ];
        testHaskellDepends = [
          base bifunctors dependent-sum free hedgehog nonempty-containers
-         semigroupoids tagged tasty tasty-hedgehog transformers
+         semigroupoids tasty tasty-hedgehog transformers
        ];
        description = "Tools for functor combinator-based program design";
        license = stdenv.lib.licenses.bsd3;
@@ -87451,8 +88216,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "funspection";
-       version = "0.1.0.0";
-       sha256 = "1bq7gj8kcgz8ccy6skkqbrfkxavkg3s511shm8fd9s8syqwdglr8";
+       version = "1.0.0.0";
+       sha256 = "0jbzvn06d5kfyiav3fjd6k8sk8dy00pwk2g711nrbmlrljbw7f39";
        libraryHaskellDepends = [ base ];
        description = "Type-level function utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -87472,15 +88237,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fused-effects_0_4_0_0" = callPackage
+  "fused-effects_0_5_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, hspec
      , inspection-testing, MonadRandom, QuickCheck, random, transformers
      , unliftio-core
      }:
      mkDerivation {
        pname = "fused-effects";
-       version = "0.4.0.0";
-       sha256 = "1r6yzw0212p5wn9rad2r7pjijnw6jajhypirm4j8h1gz1a393ds8";
+       version = "0.5.0.0";
+       sha256 = "1s1jvxdmwnjyxcx7zhspv1qkfy1dvcj0c92az2njqjibldbvqsa4";
        libraryHaskellDepends = [
          base deepseq MonadRandom random transformers unliftio-core
        ];
@@ -87499,10 +88264,8 @@ self: {
      }:
      mkDerivation {
        pname = "fused-effects-exceptions";
-       version = "0.1.1.0";
-       sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd";
-       revision = "1";
-       editedCabalFile = "1sg9gvv5lf4z7h70szjcqilhxxjmkiyriz95qyvahplln9p6281l";
+       version = "0.2.0.0";
+       sha256 = "1hgvl48vdrgcb45izmwad40x5jgxiaf3rdhhm5x0gjd9848drmbb";
        libraryHaskellDepends = [
          base fused-effects safe-exceptions unliftio-core
        ];
@@ -87713,6 +88476,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fuzzyset_0_1_1" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
+     , ieee754, lens, text, text-metrics, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "fuzzyset";
+       version = "0.1.1";
+       sha256 = "1r23xp3c4f1y0kx0kcg4z83rfxl6swciysb3cy7z6yv35fs8bs4q";
+       libraryHaskellDepends = [
+         base base-unicode-symbols data-default lens text text-metrics
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols hspec ieee754 lens text
+         unordered-containers
+       ];
+       description = "Fuzzy set for approximate string matching";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fuzzytime" = callPackage
     ({ mkDerivation, base, cmdargs, directory, old-time, process }:
      mkDerivation {
@@ -87906,22 +88690,20 @@ self: {
 
   "galois-field" = callPackage
     ({ mkDerivation, base, criterion, integer-gmp, MonadRandom
-     , protolude, tasty, tasty-discover, tasty-quickcheck
-     , wl-pprint-text
+     , protolude, tasty, tasty-quickcheck, wl-pprint-text
      }:
      mkDerivation {
        pname = "galois-field";
-       version = "0.2.0";
-       sha256 = "19q08k5aqnp1vcvlnlw6h4qmlh80dj1rglzckzf7ak78ifcwm1m8";
+       version = "0.3.0";
+       sha256 = "0c4n37rf6kfpyxdmqk4hdgmjc8fvxwynq0izgrhrqinv4z4l97v7";
        libraryHaskellDepends = [
          base integer-gmp MonadRandom protolude tasty-quickcheck
          wl-pprint-text
        ];
        testHaskellDepends = [
-         base integer-gmp MonadRandom protolude tasty tasty-discover
-         tasty-quickcheck wl-pprint-text
+         base integer-gmp MonadRandom protolude tasty tasty-quickcheck
+         wl-pprint-text
        ];
-       testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
          base criterion integer-gmp MonadRandom protolude tasty-quickcheck
          wl-pprint-text
@@ -87983,6 +88765,40 @@ self: {
        broken = true;
      }) {};
 
+  "gamgee" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , cryptonite, directory, filepath, Hclip, memory
+     , optparse-applicative, polysemy, QuickCheck, quickcheck-instances
+     , relude, safe-exceptions, tasty, tasty-golden, tasty-quickcheck
+     , text, time, unix
+     }:
+     mkDerivation {
+       pname = "gamgee";
+       version = "1.1.0";
+       sha256 = "0ip6y8l2dmw15494d77s771aqmn7awrqnlmbcc7dd2lqwq5s5wgr";
+       revision = "1";
+       editedCabalFile = "1lg04ps7m85x4py844vcc53a3r6ijaqzjrggrwp53iv2ga1m88sr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptonite memory polysemy
+         relude safe-exceptions text time
+       ];
+       executableHaskellDepends = [
+         aeson base directory filepath Hclip optparse-applicative polysemy
+         relude safe-exceptions text time unix
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cryptonite filepath memory polysemy
+         QuickCheck quickcheck-instances relude tasty tasty-golden
+         tasty-quickcheck text time
+       ];
+       description = "Tool for generating TOTP MFA tokens";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "gamma" = callPackage
     ({ mkDerivation, base, continued-fractions, converge, erf, numbers
      , QuickCheck, template-haskell, test-framework
@@ -89220,12 +90036,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "generics-mrsop_2_0_0" = callPackage
+  "generics-mrsop_2_1_0" = callPackage
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "generics-mrsop";
-       version = "2.0.0";
-       sha256 = "1cdjh5bjvx8xfglwnm48lfybdz4n8v7v8va2c3zyihzqbxh6akml";
+       version = "2.1.0";
+       sha256 = "1ynzwpwry6fqzjmz3n0iwdp5ra3c402jg1g8sdf7vbpaw9ilyrng";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
@@ -90856,16 +91672,17 @@ self: {
 
   "ghc-heap-view" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, containers
-     , deepseq, filepath, ghc, template-haskell, transformers
+     , deepseq, filepath, ghc-heap, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-heap-view";
-       version = "0.5.10";
-       sha256 = "0wb4311k8pyvgmhlxsdr8ss497nlgr8hawkm0fi930s3y4xxak1f";
+       version = "0.6.0";
+       sha256 = "1j2ygig1m7xq1y5gsaaxbgywv382yzlp1nbf3cp98yias0s61vcr";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         base binary bytestring containers ghc template-haskell transformers
+         base binary bytestring containers ghc-heap template-haskell
+         transformers
        ];
        testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
@@ -90966,8 +91783,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib";
-       version = "8.8.0.20190424";
-       sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm";
+       version = "8.8.0.20190723";
+       sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -90991,8 +91808,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib-parser";
-       version = "8.8.0.20190424";
-       sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10";
+       version = "8.8.0.20190723";
+       sha256 = "0szrv98h2c1db3400cbb7vbhqnwagqncgpllzd9jiw74rq6y8mjq";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -91347,6 +92164,18 @@ self: {
        broken = true;
      }) {};
 
+  "ghc-source-gen" = callPackage
+    ({ mkDerivation, base, ghc, ghc-paths, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "ghc-source-gen";
+       version = "0.1.0.0";
+       sha256 = "0sw62jjbd7h9i96hn0srl9m8p0qip6hnm1am6if7snqdm5b4ki3k";
+       libraryHaskellDepends = [ base ghc ];
+       testHaskellDepends = [ base ghc ghc-paths tasty tasty-hunit ];
+       description = "Constructs Haskell syntax trees for the GHC API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-srcspan-plugin" = callPackage
     ({ mkDerivation, array, base, containers, ghc, hpc }:
      mkDerivation {
@@ -91656,6 +92485,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghci-hexcalc_0_1_1_0" = callPackage
+    ({ mkDerivation, base, binary, doctest, QuickCheck }:
+     mkDerivation {
+       pname = "ghci-hexcalc";
+       version = "0.1.1.0";
+       sha256 = "1kjkx8w1rq1fkzl0ffvp71xjb2q5pmlgnm19g0avim7isrjy87kh";
+       libraryHaskellDepends = [ base binary ];
+       testHaskellDepends = [ base binary doctest QuickCheck ];
+       description = "GHCi as a Hex Calculator interactive";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghci-history-parser" = callPackage
     ({ mkDerivation, base, doctest, hspec, parsec }:
      mkDerivation {
@@ -91717,6 +92559,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghci-websockets" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, foreign-store
+     , text, wai, wai-app-static, warp, websockets
+     }:
+     mkDerivation {
+       pname = "ghci-websockets";
+       version = "0.0.2";
+       sha256 = "0x3hwgsihsr780hxsmjbxhxlw98rv1aws30myh117l7gjmj5lvzg";
+       libraryHaskellDepends = [
+         aeson base bytestring containers foreign-store text wai
+         wai-app-static warp websockets
+       ];
+       description = "A websocket server that survives GHCi reloads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghcid" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers
      , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
@@ -92057,6 +92915,26 @@ self: {
        broken = true;
      }) {};
 
+  "ghcprofview" = callPackage
+    ({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk
+     , haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text
+     }:
+     mkDerivation {
+       pname = "ghcprofview";
+       version = "0.1.0.0";
+       sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa
+         regex-tdfa-text scientific text
+       ];
+       description = "GHC .prof files viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "ghczdecode" = callPackage
     ({ mkDerivation, base, zenc }:
      mkDerivation {
@@ -92339,7 +93217,7 @@ self: {
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
@@ -92352,13 +93230,13 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk-pixbuf ];
+       libraryPkgconfigDepends = [ gdk_pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk-pixbuf;};
+     }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-gdkpixbuf_2_0_22" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
@@ -92373,11 +93251,11 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk-pixbuf ];
+       libraryPkgconfigDepends = [ gdk_pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gdk-pixbuf;};
+     }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-gdkx11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -92722,6 +93600,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gtk_3_0_31" = callPackage
@@ -92747,26 +93627,32 @@ self: {
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gi-gtk-declarative" = callPackage
-    ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
-     , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl
-     , random, text, unordered-containers, vector
+    ({ mkDerivation, async, base, data-default-class, gi-gdk, gi-glib
+     , gi-gobject, gi-gtk, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, hedgehog, mtl, safe-exceptions, stm, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "gi-gtk-declarative";
-       version = "0.4.3";
-       sha256 = "148daz8a6nj6djvsfiy5yk7lfyxhdjl5l34a7d6nn66mikc8538b";
+       version = "0.5.0";
+       sha256 = "0nhacfja1wrz0sa5pbz069sbpyzp8jnlrp078gg9gydwhlmh2k2h";
        libraryHaskellDepends = [
-         base gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
-         haskell-gi-overloading mtl text unordered-containers vector
+         base data-default-class gi-glib gi-gobject gi-gtk haskell-gi
+         haskell-gi-base haskell-gi-overloading mtl text
+         unordered-containers vector
        ];
-       benchmarkHaskellDepends = [
-         base criterion gi-gdk gi-glib gi-gtk random text vector
+       testHaskellDepends = [
+         async base gi-gdk gi-glib gi-gobject gi-gtk hedgehog
+         safe-exceptions stm text unordered-containers vector
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-declarative-app-simple" = callPackage
@@ -92776,8 +93662,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-declarative-app-simple";
-       version = "0.4.2";
-       sha256 = "1ydaxs2isqpy8ld8nlg4plr7ry5xni3g93m9kxdm2klz8xzs3js7";
+       version = "0.5.0";
+       sha256 = "0vl9gqgdbqr4hipr7ka01hyvyz9n8by0ry890w4n2c5w9rghgvva";
        libraryHaskellDepends = [
          async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
          haskell-gi haskell-gi-base haskell-gi-overloading pipes
@@ -92785,6 +93671,8 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-hs" = callPackage
@@ -92802,6 +93690,8 @@ self: {
        ];
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-hs_0_3_7_0" = callPackage
@@ -92820,6 +93710,7 @@ self: {
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -92831,6 +93722,8 @@ self: {
        pname = "gi-gtkosxapplication";
        version = "2.0.16";
        sha256 = "11wfmvjgl6lmmdanz5jmmvf4289c9jiylxfn006shc4pby7ay6i8";
+       revision = "1";
+       editedCabalFile = "1fixrfjmqqrik38fl90h4f3lh34g6zilscibq9r9x1j8d33qmin4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
@@ -92864,6 +93757,8 @@ self: {
        doHaddock = false;
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
   "gi-gtksource_3_0_21" = callPackage
@@ -92889,6 +93784,7 @@ self: {
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
   "gi-handy" = callPackage
@@ -93168,6 +94064,8 @@ self: {
        libraryPkgconfigDepends = [ vte_291 ];
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {vte_291 = pkgs.vte;};
 
   "gi-vte_2_91_24" = callPackage
@@ -93193,6 +94091,7 @@ self: {
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {vte_291 = pkgs.vte;};
 
   "gi-webkit" = callPackage
@@ -93576,8 +94475,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20190708";
-       sha256 = "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij";
+       version = "7.20190730";
+       sha256 = "16mya2dm7q9ggdmwyszri85qnnxf0l71xnn8khnxl5fqrh2zvsjg";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -94373,8 +95272,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlab-haskell";
-       version = "0.1.0.1";
-       sha256 = "1gvhfdlh6x500qms0kfqsyf0c934rm0xw1z1gv8zzb7nssndiann";
+       version = "0.1.0.2";
+       sha256 = "16dj3m038fgxf8w69g8qldnsk2xrk83lkkgdapwv7qz9c9jd0nh1";
        libraryHaskellDepends = [
          aeson base bytestring connection http-conduit http-types text
          transformers unliftio unliftio-core
@@ -99542,14 +100441,21 @@ self: {
      }) {};
 
   "graphql" = callPackage
-    ({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }:
+    ({ mkDerivation, aeson, base, hspec, hspec-expectations, megaparsec
+     , raw-strings-qq, text, transformers, unordered-containers
+     }:
      mkDerivation {
        pname = "graphql";
-       version = "0.3";
-       sha256 = "18hb8bwcwx98vrr9nzr8965i4c1y6dh10ilijksbldf10yaiq53z";
+       version = "0.4.0.0";
+       sha256 = "03y8wn0a1zbrsl3i5g5zy5awmlgsncnksskd4gcx8wzfl14120g0";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ attoparsec base text ];
-       testHaskellDepends = [ attoparsec base tasty tasty-hunit text ];
+       libraryHaskellDepends = [
+         aeson base megaparsec text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base hspec hspec-expectations megaparsec raw-strings-qq text
+         transformers
+       ];
        description = "Haskell GraphQL implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100918,6 +101824,8 @@ self: {
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        description = "Libary for creating strut windows with gi-gtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk-toggle-button-list" = callPackage
@@ -104802,6 +105710,37 @@ self: {
        broken = true;
      }) {};
 
+  "hapistrano_0_3_9_3" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, QuickCheck, silently, stm, temporary, time
+     , transformers, typed-process, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.9.3";
+       sha256 = "1kp2gdr0xjzr0qi584lqiqh7hjk8vymz04af2zcgdhbw68brj2cx";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base filepath formatting gitrev mtl path process stm time
+         transformers typed-process
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process QuickCheck
+         silently temporary
+       ];
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -105763,6 +106702,28 @@ self: {
        broken = true;
      }) {};
 
+  "harg" = callPackage
+    ({ mkDerivation, aeson, barbies, base, bytestring, directory
+     , higgledy, markdown-unlit, optparse-applicative, text, yaml
+     }:
+     mkDerivation {
+       pname = "harg";
+       version = "0.1.0.1";
+       sha256 = "11qkyx9axd8vybkb1kq7vs5v5xf594wgkbpbfpvj0hah7iw9wb95";
+       libraryHaskellDepends = [
+         aeson barbies base bytestring directory higgledy
+         optparse-applicative text yaml
+       ];
+       testHaskellDepends = [
+         aeson barbies base higgledy optparse-applicative
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Haskell program configuration from multiple sources";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hark" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, haskell98
      , mtl, old-locale, old-time, regex-pcre
@@ -105934,6 +106895,8 @@ self: {
        pname = "hasbolt";
        version = "0.1.3.3";
        sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb";
+       revision = "1";
+       editedCabalFile = "0v4ksld4qs1ll5a5c6x5kvrcb584yskhbda7zv9r9lrqvcsjwg5i";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default network text transformers
@@ -105953,8 +106916,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.18";
-       sha256 = "11ij6xrxf28sv8b464dqax9834k0r6q99hdyfsg030aw2i1rqygy";
+       version = "0.0.0.19";
+       sha256 = "11g6rlgyxi57bvmr862ly7yfwiiph1kckr056b5khz8v8k6fhhpv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106947,6 +107910,7 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "haskell-cnc" = callPackage
@@ -107011,13 +107975,13 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-conll";
-       version = "0.1.0.1";
-       sha256 = "09lgj70lk2xh75rq4gdmfacmb465r0xn03v8cnk82bx52c7jwiga";
+       version = "0.1.0.2";
+       sha256 = "05w90jlidxr55r5j1hihfhdcwjkzw85xipwxdd3i6kmskin2pv1v";
        libraryHaskellDepends = [
          base containers lens pretty-show protolude split text
        ];
        description = "Core Types for NLP";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -109311,8 +110275,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "haskeme";
-       version = "0.1.0.3";
-       sha256 = "14hrimm52v5hlgkdkqwijxrfnzj8x46bg3kh9nw1vlflf97053wf";
+       version = "0.1.0.4";
+       sha256 = "0lis0ni0l52x691adm2da7mzjam4g414gc0d0i9f6i050ra02g3j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -109690,12 +110654,12 @@ self: {
      , haskoin-node, hspec, hspec-discover, http-types, monad-logger
      , mtl, network, nqe, optparse-applicative, random, resourcet
      , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text
-     , time, transformers, unliftio, unordered-containers, uuid
+     , time, transformers, unliftio, unordered-containers, wai
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.16.5";
-       sha256 = "111gip8l2c9m85viaz02rlxhdb6svwx0jyhrkzcqjgz4j3y0n4lj";
+       version = "0.16.6";
+       sha256 = "03214p8xqf062grgpkbfchrm4awm0zrq41j77z8s31iin9d0qzp9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109703,21 +110667,21 @@ self: {
          hashable haskoin-core haskoin-node http-types monad-logger mtl
          network nqe random resourcet rocksdb-haskell rocksdb-query scotty
          string-conversions text time transformers unliftio
-         unordered-containers uuid
+         unordered-containers wai
        ];
        executableHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          filepath hashable haskoin-core haskoin-node http-types monad-logger
          mtl network nqe optparse-applicative random resourcet
          rocksdb-haskell rocksdb-query scotty string-conversions text time
-         transformers unliftio unordered-containers uuid
+         transformers unliftio unordered-containers wai
        ];
        testHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          hashable haskoin-core haskoin-node hspec http-types monad-logger
          mtl network nqe random resourcet rocksdb-haskell rocksdb-query
          scotty string-conversions text time transformers unliftio
-         unordered-containers uuid
+         unordered-containers wai
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -111294,8 +112258,8 @@ self: {
      }:
      mkDerivation {
        pname = "haven";
-       version = "0.2.0.1";
-       sha256 = "15q9cgfifz87ns730agv2vzc8rp5lqggiclc91khpckm2qppk6yd";
+       version = "0.2.0.2";
+       sha256 = "0n92h5gjy6ax0c5f2k80j21ymf741vzhsm1kdav86hphhxdlw8ng";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112954,8 +113918,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog-classes";
-       version = "0.2.1";
-       sha256 = "1hkkbmsn397a73aqaasi2c076nx9g8s8vsdp6wdqq33a96q1b0mq";
+       version = "0.2.2";
+       sha256 = "072w697nc7dv9yi700g5ap4h49ichpw1srzkq07sz637022l19wl";
        libraryHaskellDepends = [
          aeson base binary containers hedgehog pretty-show semirings
          silently transformers wl-pprint-annotated
@@ -113071,7 +114035,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hedis_0_12_5" = callPackage
+  "hedis_0_12_6" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, stm, test-framework, test-framework-hunit
@@ -113079,8 +114043,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.12.5";
-       sha256 = "1alabz8j9lmd2ydm34hndqcyvihnfyvl7cgda6ycsch5sbffmjlp";
+       version = "0.12.6";
+       sha256 = "1lx7lwh282ijp63yfy6ybb6zc5zil09abnrsbm052ghdlnz3sfk1";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing deepseq errors HTTP mtl
          network network-uri resource-pool scanner stm text time tls
@@ -115250,8 +116214,8 @@ self: {
        pname = "hi-file-parser";
        version = "0.1.0.0";
        sha256 = "09gs26z0jvkkhb1r43gj27pq0k5fc4i6fpr59g397vz4sm86gb2l";
-       revision = "1";
-       editedCabalFile = "1hylfzkd42mqap2ydh4wq96vwbblyp26zb8wwyn63yl72swbww23";
+       revision = "2";
+       editedCabalFile = "1bm98h0v4wf9vmdng15c2r48yz06118jxlprsnk0z3jw0d95ij9z";
        libraryHaskellDepends = [ base binary bytestring rio vector ];
        testHaskellDepends = [ base binary bytestring hspec rio vector ];
        description = "Parser for GHC's hi files";
@@ -115469,8 +116433,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchical-spectral-clustering";
-       version = "0.4.0.0";
-       sha256 = "1mw546dvyzrhcw7a61zb0anfgxk3s5r3bjrj7iry36shh1ancs1s";
+       version = "0.4.1.1";
+       sha256 = "0wi1yw0mhszalixay7sd1n7i8xjmb3m6v7h3kn09ih5vn3bxj26f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115794,8 +116758,8 @@ self: {
        pname = "hills";
        version = "0.1.2.6";
        sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
-       revision = "2";
-       editedCabalFile = "11f4mmhxivxkdcn4wdcz1hszfyi3hdggls22x2q0m3jxq3lw0izg";
+       revision = "3";
+       editedCabalFile = "10l4hx0j8il66h3m9flhwsqm9v52qmpj4cyjih4c6cnng6vjsfnj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116605,22 +117569,22 @@ self: {
      }) {};
 
   "hit-on" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-noprelude, github
-     , gitrev, optparse-applicative, relude, shellmet, text, vector
+    ({ mkDerivation, ansi-terminal, base, base-noprelude, directory
+     , github, gitrev, hspec, optparse-applicative, process, relude
+     , shellmet, text, vector
      }:
      mkDerivation {
        pname = "hit-on";
-       version = "0.0.0";
-       sha256 = "14npvwxh33cn8z2klp7liij41r9pyr00rs4g28yva2zry75bf98r";
-       revision = "1";
-       editedCabalFile = "1fwvm0fz2agqziaspxlxxmdv44xrv65pf601i0938wkx4452v8fz";
+       version = "0.1.0.0";
+       sha256 = "13pxn9xqyfd5n53bl57bk0wc8qlnl5dsh1xq5y49arsnk2g86ir5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base-noprelude github gitrev optparse-applicative
-         relude shellmet text vector
+         ansi-terminal base-noprelude directory github gitrev
+         optparse-applicative process relude shellmet text vector
        ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116755,8 +117719,8 @@ self: {
        pname = "hjsonschema";
        version = "1.9.0";
        sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki";
-       revision = "1";
-       editedCabalFile = "1kxn0smmcmzysvi1bw9v0j6j68fk4s36nqyqmvbkl61pgm6bs803";
+       revision = "2";
+       editedCabalFile = "0110dyc8lbd8x0cbmxgwwbvzckxkfj84krd5p51p0jaixvrrl53r";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-client-tls http-types pcre-heavy
@@ -116794,6 +117758,35 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "hjugement-cli" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , containers, cryptonite, deepseq, directory, filepath, ghc-prim
+     , hjugement, hjugement-protocol, lens-family-core, memory, pipes
+     , pipes-aeson, pipes-bytestring, pipes-group, pipes-parse
+     , pipes-safe, pipes-text, random, reflection, symantic-cli
+     , symantic-document, terminal-size, text, time, transformers, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hjugement-cli";
+       version = "0.0.0.20190721";
+       sha256 = "1fgl9yjjmwd8y2hcmva0fh3d6qwvj8papdm0v50s85b9s8cwn6ll";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         cryptonite deepseq directory filepath ghc-prim hjugement
+         hjugement-protocol lens-family-core memory pipes pipes-aeson
+         pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
+         random reflection symantic-cli symantic-document terminal-size text
+         time transformers unix unordered-containers
+       ];
+       description = "Majority Judgment and Helios-C command line tool";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hjugement-protocol" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
      , containers, criterion, cryptonite, deepseq, memory, QuickCheck
@@ -116802,8 +117795,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjugement-protocol";
-       version = "0.0.1.20190623";
-       sha256 = "0rqsggij0vx9hh7wl8nzmycb55ilcm0j6dp33x94jycpyvqnc4ym";
+       version = "0.0.4.20190711";
+       sha256 = "0r4g8n1a8c0azdk307mq1q2dv1h4xf251fjrmldcws7b0vrla5ri";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          cryptonite deepseq memory random reflection text transformers
@@ -117120,6 +118113,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.3.9";
        sha256 = "07g48w4099m4vm7z5hrg9zzd2v2yhy7kcv40902njz6v8cklgdgq";
+       revision = "1";
+       editedCabalFile = "18qjkl79gwmdgk6vl8cg3m94wm0qw30kxn4lvlnj9n6gnv2p0b3k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117391,8 +118386,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.2";
-       sha256 = "0921s4cnpjnxmsp8x5dhjs8qiv6mlw98nngwsq6ad5qrj1wn72lx";
+       version = "2.2.2";
+       sha256 = "1v10xcz4vdzk1a3gjlvqbdckldax2643sg7s3xkm3dnlj5hg05yp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -119362,8 +120357,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.9";
-       sha256 = "0s4p82issy3jlc0yz153r7i38ny1ygchf294hgms6jr1q467w86z";
+       version = "5.0.17.10";
+       sha256 = "12s3n3l6lf2vwmh4jbxnra694fpnzjgd8c236pnan0jdcb6x82vl";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -119791,10 +120786,8 @@ self: {
      }:
      mkDerivation {
        pname = "horname";
-       version = "0.1.3.0";
-       sha256 = "067jnyqk4lwrr23hvc30rqjmd400n9vd8wvj9bq67w47paqcz9p9";
-       revision = "1";
-       editedCabalFile = "10cgcxvpl0s4hs2r5g34kcdiy676azz751j3w5703m54mpz9irwl";
+       version = "0.2.0.0";
+       sha256 = "1qcvgjwasrgi760sv5rxl5klincgw34xczd3mqz32id183s57164";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121615,6 +122608,22 @@ self: {
        broken = true;
      }) {};
 
+  "hs-rqlite" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
+     , HTTP, scientific, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hs-rqlite";
+       version = "0.1.0.0";
+       sha256 = "04q9vnwil3f30972pljs613wq1kb71w61jivdyxxy9i14grfcxsq";
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring containers HTTP scientific text
+         unordered-containers
+       ];
+       description = "A Haskell client for RQlite";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hs-rs-notify" = callPackage
     ({ mkDerivation, base, filepath, notifier, process, protolude, text
      , unix
@@ -122873,7 +123882,7 @@ self: {
        broken = true;
      }) {};
 
-  "hsdev_0_3_3_1" = callPackage
+  "hsdev_0_3_3_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
      , base, bytestring, Cabal, containers, cpphs, data-default, deepseq
      , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc
@@ -122887,8 +123896,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.3.1";
-       sha256 = "09i1m3xkvjzq69mpzf73g3jxf3g5md8lfrxjwza6ns8ii9m4xcqh";
+       version = "0.3.3.2";
+       sha256 = "1qx5ppj1l871pm9qhqwd4297p3cp0v0fv64fkw4cdbpjza798x1i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124383,6 +125392,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hspec-megaparsec_2_0_1" = callPackage
+    ({ mkDerivation, base, containers, hspec, hspec-expectations
+     , megaparsec
+     }:
+     mkDerivation {
+       pname = "hspec-megaparsec";
+       version = "2.0.1";
+       sha256 = "0w8nn2rh01lkiwsiyqh3gviklhfmy0245rakj94dmliyljw8skfg";
+       libraryHaskellDepends = [
+         base containers hspec-expectations megaparsec
+       ];
+       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+       description = "Utility functions for testing Megaparsec parsers with Hspec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-meta" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, HUnit
@@ -125693,6 +126719,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "htdp-image" = callPackage
+    ({ mkDerivation, AC-Angle, base, gloss, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "htdp-image";
+       version = "1.1.0.0";
+       sha256 = "17123nqkg8yk0pssmshdza0ipc42rx818q9gidig1d1camiyrfl4";
+       libraryHaskellDepends = [ AC-Angle base gloss ];
+       testHaskellDepends = [
+         base gloss HUnit test-framework test-framework-hunit
+       ];
+       description = "Beginner friendly graphics library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "htestu" = callPackage
     ({ mkDerivation, base, gcc, random }:
      mkDerivation {
@@ -126775,8 +127817,8 @@ self: {
        pname = "http-download";
        version = "0.1.0.0";
        sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb";
-       revision = "3";
-       editedCabalFile = "147fjxz1y3rqwnrhvrhgg2d93fl6pbwkhc2fbzriwn7kyan8z06l";
+       revision = "4";
+       editedCabalFile = "1s20zjh52whs6hfhr90zyyy7g78zv1pw9hry1nwlzdv4hg97cbdh";
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra cryptonite
          cryptonite-conduit directory exceptions filepath http-client
@@ -128936,8 +129978,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-avro";
-       version = "4.0.0";
-       sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak";
+       version = "4.0.1";
+       sha256 = "1x0mq3sn05iwrn444kzyl66056xm8203hq0ajx9f8r85faq3v1ir";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129148,17 +130190,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_6_2_29" = callPackage
+  "hw-prim_0_6_2_31" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
-     , mmap, QuickCheck, semigroups, transformers, vector
+     , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.29";
-       sha256 = "1pbcmi3ysaidhb5jlllmdwdkh7gbky234qxf5j2r5lk3n0n6zzp1";
+       version = "0.6.2.31";
+       sha256 = "00xfakvwnj3zys2ilpc9w9z5qzw1ng3cc65jfa1860z6yr7xdp59";
        libraryHaskellDepends = [
-         base bytestring ghc-prim mmap semigroups transformers vector
+         base bytestring ghc-prim mmap semigroups transformers unliftio-core
+         vector
        ];
        testHaskellDepends = [
          base bytestring directory exceptions hedgehog hspec
@@ -129398,8 +130441,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-uri";
-       version = "0.0.2.0";
-       sha256 = "0z2y9ykg6q3p7qgm7s66sg5cw3pf2cbjlqk8xf6l7qgpa7br1z2b";
+       version = "0.1.1.0";
+       sha256 = "1f96632k6pcaxhy2nrm13s9kdb0dz3vsav6hzf94wlv7zdlncn8x";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
          base bytestring directory exceptions filepath http-client
@@ -131332,15 +132375,16 @@ self: {
      , blaze-html, blaze-markup, bytestring, Cabal, cheapskate
      , code-page, containers, deepseq, directory, filepath, fingertree
      , fsnotify, gmp, haskeline, ieee754, libffi, megaparsec, mtl
-     , network, optparse-applicative, pretty, process, regex-tdfa, safe
-     , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size
-     , text, time, transformers, uniplate, unix, unordered-containers
-     , utf8-string, vector, vector-binary-instances, zip-archive
+     , network, optparse-applicative, parser-combinators, pretty
+     , process, regex-tdfa, safe, split, tagged, tasty, tasty-golden
+     , tasty-rerun, terminal-size, text, time, transformers, uniplate
+     , unix, unordered-containers, utf8-string, vector
+     , vector-binary-instances, zip-archive
      }:
      mkDerivation {
        pname = "idris";
-       version = "1.3.1";
-       sha256 = "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi";
+       version = "1.3.2";
+       sha256 = "0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7";
        configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -131351,8 +132395,8 @@ self: {
          base base64-bytestring binary blaze-html blaze-markup bytestring
          cheapskate code-page containers deepseq directory filepath
          fingertree fsnotify haskeline ieee754 libffi megaparsec mtl network
-         optparse-applicative pretty process regex-tdfa safe split
-         terminal-size text time transformers uniplate unix
+         optparse-applicative parser-combinators pretty process regex-tdfa
+         safe split terminal-size text time transformers uniplate unix
          unordered-containers utf8-string vector vector-binary-instances
          zip-archive
        ];
@@ -131367,6 +132411,8 @@ self: {
        ];
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -131425,6 +132471,25 @@ self: {
        license = "GPL";
      }) {};
 
+  "iexcloud" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , HUnit, semigroups, stocks, unordered-containers
+     }:
+     mkDerivation {
+       pname = "iexcloud";
+       version = "0.0.0.1";
+       sha256 = "15qn3h1bz75bykcnyra6gg4d33gmr6ywc485hk2gmi4k6hbl6amf";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-conduit semigroups
+         unordered-containers
+       ];
+       testHaskellDepends = [ base bytestring HUnit stocks ];
+       description = "Library for the IEX Trading API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "if" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -133229,16 +134294,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_7_0" = callPackage
+  "influxdb_1_7_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
-     , http-types, lens, network, optional-args, scientific, tagged
-     , template-haskell, text, time, unordered-containers, vector
+     , http-types, lens, network, optional-args, raw-strings-qq
+     , scientific, tagged, tasty, tasty-hunit, template-haskell, text
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.7.0";
-       sha256 = "1a9la9gm5brsh9rs9ai1a50kcdk75kw8jmrh1rd6xs4xiwdca819";
+       version = "1.7.1";
+       sha256 = "1nny63rd9bw7ijg9l09cd467whfaa1n3ph8dqdy7bp6kcbvdwnzn";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -133247,7 +134313,10 @@ self: {
          http-types lens network optional-args scientific tagged text time
          unordered-containers vector
        ];
-       testHaskellDepends = [ base doctest template-haskell ];
+       testHaskellDepends = [
+         base containers doctest raw-strings-qq tasty tasty-hunit
+         template-haskell time
+       ];
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133983,6 +135052,8 @@ self: {
        pname = "integer-logarithms";
        version = "1.0.3";
        sha256 = "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs";
+       revision = "1";
+       editedCabalFile = "1z6z63jr42jn073fd9ns7jcrw7n5lwx076q4b5rgzak7q1ixw2i8";
        libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
        testHaskellDepends = [
          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
@@ -134720,8 +135791,8 @@ self: {
        pname = "invertible-grammar";
        version = "0.1.2";
        sha256 = "1nf7dchcxs8wwd2hgfpf04qd63ws22pafjwb5911lq7da8k1y57j";
-       revision = "1";
-       editedCabalFile = "1qk0pi8n45mbzwr6i6sly59b74njk0akzm6k0vnr262lqahy0hdl";
+       revision = "2";
+       editedCabalFile = "0j6zmj0dlhiq4qjrbjbvdsmky1l4z1qwqikixk1b9dpa05n01ykf";
        libraryHaskellDepends = [
          base bifunctors containers mtl prettyprinter profunctors semigroups
          tagged template-haskell text transformers
@@ -135080,7 +136151,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ip_1_5_0" = callPackage
+  "ip_1_5_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, doctest, hashable, hspec, hspec-discover, HUnit
      , primitive, QuickCheck, quickcheck-classes, test-framework
@@ -135089,10 +136160,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.5.0";
-       sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j";
-       revision = "1";
-       editedCabalFile = "09r4flbanb4zq3ixx57zd47gjvl6ghyrv62k11smbxzs6wy3szr4";
+       version = "1.5.1";
+       sha256 = "1crnn76vxhqq13556nc0537bh8xi5jzklyp24dqqfamxmfbwkzll";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring deepseq hashable primitive text
          vector wide-word
@@ -135129,11 +136198,11 @@ self: {
     ({ mkDerivation, base, binary, bytestring, iproute }:
      mkDerivation {
        pname = "ip2location";
-       version = "8.0.4";
-       sha256 = "0fry56zk9nbpqp58qvm1xxbq53pjiahkb58gh2h8dax80q3iczh4";
+       version = "8.1.0";
+       sha256 = "07n5xnspl318hrmff4gr274zpgszgviilwhjd7vdrhm1sq9sdir8";
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
-       license = stdenv.lib.licenses.lgpl3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -135142,8 +136211,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, iproute }:
      mkDerivation {
        pname = "ip2proxy";
-       version = "2.0.0";
-       sha256 = "0lhc0ni65wj32j97yw9iy2lawnl4bc7ml6lsjk12wks4mcy01nrv";
+       version = "2.1.0";
+       sha256 = "0qcmqy8p13hg9aih8m9w7qpbr6zcbvgc9y6bzh2cqm2sbx7ksvqm";
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
        license = stdenv.lib.licenses.mit;
@@ -135469,6 +136538,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_1_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.1.1.0";
+       sha256 = "1f2lqg37ig3f23066c4179vcym6p3ylmxsywqhmb0n078kix6kfb";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-chans text time tls transformers x509
+         x509-store x509-validation
+       ];
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -136815,10 +137905,10 @@ self: {
      }:
      mkDerivation {
        pname = "jaeger-flamegraph";
-       version = "1.3.0";
-       sha256 = "03j5hjrhyhmc6qjp7v4j0mr2y0fpk0zds6v55as24par508w72ka";
-       revision = "2";
-       editedCabalFile = "0p2pcfyrcbqh0rnmhhp5hbwixvlml62iz0d48z7dd6cwfdzlkfrr";
+       version = "1.3.2";
+       sha256 = "1m7vs4zi1cm5xj3wn8zr44rdx1l99ra59xwr64y9bdrs1raga7k3";
+       revision = "1";
+       editedCabalFile = "003h3aqdkpvpqqyv7ypv3shvfiqcwq7cfihqv38bp2iq5vin938q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base containers QuickCheck text ];
@@ -137646,6 +138736,37 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "jose_0_8_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, concise, containers, cryptonite, hspec, lens, memory
+     , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
+     , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck
+     , template-haskell, text, time, unordered-containers, vector, x509
+     }:
+     mkDerivation {
+       pname = "jose";
+       version = "0.8.1.0";
+       sha256 = "02xg8axy6whbkn0mzg1gjy6b1mhxlmsh1x7vjk1fiawvg9nwzrkl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe semigroups template-haskell
+         text time unordered-containers vector x509
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring concise
+         containers cryptonite hspec lens memory monad-time mtl network-uri
+         QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec
+         tasty-quickcheck template-haskell text time unordered-containers
+         vector x509
+       ];
+       description = "Javascript Object Signing and Encryption and JSON Web Token library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, criterion, cryptonite, doctest, either, hspec, HUnit
@@ -137802,13 +138923,14 @@ self: {
      }) {};
 
   "jsaddle-dom" = callPackage
-    ({ mkDerivation, base, base-compat, exceptions, jsaddle, lens, text
-     , transformers
+    ({ mkDerivation, base, base-compat, Cabal, exceptions, jsaddle
+     , lens, text, transformers
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.9.3.1";
-       sha256 = "0ifbddp4vjpbl89bwczfp7ivnhfayg8317l8qk6h84p9vd1km44z";
+       version = "0.9.3.2";
+       sha256 = "1qc135w1y4f2mbky36dmb0ggcbwkv1vnmszw5lkhkxhkcag2sf07";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base base-compat exceptions jsaddle lens text transformers
        ];
@@ -137979,8 +139101,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-api";
-       version = "0.1.1.2";
-       sha256 = "092x0zldcz6dsvvsxs2zr4cp4mbwjsrdpcassrl5i715x9rb5fmm";
+       version = "0.1.4.0";
+       sha256 = "1xswmpkwr1f49kf4hmp9014lwv4lcnyjj161ylfh5ihjfr30w0yb";
        libraryHaskellDepends = [
          aeson base containers data-default lens lens-aeson text
          unordered-containers url
@@ -138712,6 +139834,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json5hs" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, mtl, pretty
+     , syb, text
+     }:
+     mkDerivation {
+       pname = "json5hs";
+       version = "0.1.2.2";
+       sha256 = "19r1ripvalrhvlqdk0pvm18b4a8sibdwlc60i2yj7da10rdx5cv1";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl pretty syb text
+       ];
+       description = "Serialising to and from JSON5";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jsonextfilter" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , monads-tf, optparse-applicative, process, scientific, string-qq
@@ -138736,13 +139873,15 @@ self: {
 
   "jsonpath" = callPackage
     ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
-     , file-embed, hspec, hspec-attoparsec, text, unordered-containers
-     , vector
+     , file-embed, hspec, hspec-attoparsec, hspec-discover, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "jsonpath";
-       version = "0.1.0.0";
-       sha256 = "0lr0sw30siaycw92b1xbnlrjn1pb7y8l9dflrjzr5d9k43lnrz42";
+       version = "0.1.0.1";
+       sha256 = "0wp5516g33spb9ilphjkzamr88xl64fb6y9zjfci1kac5vkl4qqk";
+       revision = "2";
+       editedCabalFile = "04jw3ayvcabsfcqazksnn0rg0i1326d0gjdx1zl8rk955g2qlwam";
        libraryHaskellDepends = [
          aeson attoparsec base text unordered-containers vector
        ];
@@ -138750,6 +139889,7 @@ self: {
          aeson aeson-casing attoparsec base bytestring file-embed hspec
          hspec-attoparsec text unordered-containers vector
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Library to parse and execute JSONPath";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139747,7 +140887,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katip_0_8_2_0" = callPackage
+  "katip_0_8_3_0" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
      , filepath, hostname, microlens, microlens-th, monad-control, mtl
@@ -139759,8 +140899,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.8.2.0";
-       sha256 = "064i2dbl52i2z7lyvk01ayvf6dzzn20bac3fwh0dlvr5bn49wran";
+       version = "0.8.3.0";
+       sha256 = "0wpqchpgrp7awrf7hirg0768g8nnqrydnwcw8xgxw6w47zcb71d0";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -140402,8 +141542,8 @@ self: {
      }:
      mkDerivation {
        pname = "keera-hails-reactive-gtk";
-       version = "0.3";
-       sha256 = "0b3j9h0d4sw1hhgihnlqpiyc9bwfk5qd6jl64jij3q3rjy97wr3v";
+       version = "0.5";
+       sha256 = "014d9hr2321gs6ska8ykrgh59k92c6kxf0a3gqvrfj3rck28izb9";
        libraryHaskellDepends = [
          base bytestring cairo glib gtk gtk-helpers
          keera-hails-reactivevalues mtl transformers
@@ -140415,13 +141555,15 @@ self: {
      }) {};
 
   "keera-hails-reactive-network" = callPackage
-    ({ mkDerivation, base, keera-hails-reactivevalues, network }:
+    ({ mkDerivation, base, bytestring, keera-hails-reactivevalues
+     , network, network-bsd
+     }:
      mkDerivation {
        pname = "keera-hails-reactive-network";
-       version = "0.0.3.3";
-       sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3";
+       version = "0.1";
+       sha256 = "1d1r9p5ray60yfrxs89byc7rmdsm340k2b8klv25k0wh2fvrx2yw";
        libraryHaskellDepends = [
-         base keera-hails-reactivevalues network
+         base bytestring keera-hails-reactivevalues network network-bsd
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
@@ -141325,18 +142467,18 @@ self: {
 
   "korea-holidays" = callPackage
     ({ mkDerivation, aeson, base, hspec, monad-extras, split
-     , template-haskell, yaml
+     , template-haskell, time, yaml
      }:
      mkDerivation {
        pname = "korea-holidays";
-       version = "0.1.0.3";
-       sha256 = "0v240dkvqy1jhkq1mzhyaiyg62m8lbbm79bc2g31jy9b7r1h93i2";
+       version = "0.1.0.4";
+       sha256 = "11yiip6nv84k8q4n37w9kn1w57vizlcggszh0pnrkkx36xwwk9ll";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base monad-extras split template-haskell yaml
+         aeson base monad-extras split template-haskell time yaml
        ];
        testHaskellDepends = [
-         aeson base hspec monad-extras split template-haskell yaml
+         aeson base hspec monad-extras split template-haskell time yaml
        ];
        description = "Korea Holidays";
        license = stdenv.lib.licenses.mit;
@@ -141485,6 +142627,66 @@ self: {
        broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
+  "kubernetes-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, containers
+     , data-default-class, hspec, http-client, http-client-tls
+     , kubernetes-client-core, microlens, mtl, pem, safe-exceptions
+     , streaming-bytestring, text, tls, x509, x509-store, x509-system
+     , x509-validation, yaml
+     }:
+     mkDerivation {
+       pname = "kubernetes-client";
+       version = "0.1.0.1";
+       sha256 = "0fzilm4k7cq3k6vlx01c5gzg4lnrgpfdldbiml4rbiv42f13pr7j";
+       libraryHaskellDepends = [
+         aeson base bytestring connection containers data-default-class
+         http-client http-client-tls kubernetes-client-core microlens mtl
+         pem safe-exceptions streaming-bytestring text tls x509 x509-store
+         x509-system x509-validation
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection containers data-default-class
+         hspec http-client http-client-tls kubernetes-client-core microlens
+         mtl pem safe-exceptions streaming-bytestring text tls x509
+         x509-store x509-system x509-validation yaml
+       ];
+       description = "Client library for Kubernetes";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "kubernetes-client-core" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, iso8601-time, katip, microlens, mtl, network
+     , QuickCheck, random, safe-exceptions, semigroups, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "kubernetes-client-core";
+       version = "0.1.0.1";
+       sha256 = "08sxsc9a9vdsqp71zxnc309cng75k3c57mcmmryhpwwyscvgfnsk";
+       revision = "1";
+       editedCabalFile = "0qzh7zq36q57yfccna1izi1gz9fpki9ngnl8dgf3m6halrxwqlc7";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive containers
+         deepseq exceptions http-api-data http-client http-client-tls
+         http-media http-types iso8601-time katip microlens mtl network
+         random safe-exceptions text time transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+         semigroups text time transformers unordered-containers vector
+       ];
+       description = "Auto-generated kubernetes-client-core API Client";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "kure" = callPackage
     ({ mkDerivation, base, dlist, transformers }:
      mkDerivation {
@@ -141907,6 +143109,8 @@ self: {
        ];
        description = "Declarative command-line parser using type-driven pattern matching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -144238,7 +145442,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lattices_2" = callPackage
+  "lattices_2_0_1" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , integer-logarithms, QuickCheck, quickcheck-instances
      , semigroupoids, tagged, tasty, tasty-quickcheck, transformers
@@ -144246,10 +145450,8 @@ self: {
      }:
      mkDerivation {
        pname = "lattices";
-       version = "2";
-       sha256 = "050c66rrzh5p204jyqmysyhm419f8pasi0mlbwv3n167y0fnr8xq";
-       revision = "1";
-       editedCabalFile = "08m46liplbh1xxnpsq0wnjabmyj625vbnnsyypd52jlhzclfhqz1";
+       version = "2.0.1";
+       sha256 = "0c7n7fh89llg8ijylwc14ikqrg077vcqcgph5h9nar6i5dyaprfy";
        libraryHaskellDepends = [
          base base-compat containers deepseq hashable integer-logarithms
          QuickCheck semigroupoids tagged transformers universe-base
@@ -144476,8 +145678,8 @@ self: {
        pname = "lazy-hash";
        version = "0.1.0.0";
        sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa";
-       revision = "1";
-       editedCabalFile = "07sn3q7q29zkxpillprx2d05pybjpvpglz8s7jq07akdhwmwx9mk";
+       revision = "2";
+       editedCabalFile = "0j46blbddl9y4chccyns7cixbxb0a4pkmdkbd5z09510ddz3jqm3";
        libraryHaskellDepends = [
          base constrained-categories hashable haskell-src-meta tagged
          template-haskell vector-space
@@ -144497,6 +145699,8 @@ self: {
        pname = "lazy-hash-cache";
        version = "0.1.0.0";
        sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4";
+       revision = "1";
+       editedCabalFile = "1m42wsj93vpb6v1dcj2lc5z04qc2np8i7n3w82jwwk4wbgl5q35j";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring data-default-class
          directory filepath hashable lazy-hash microlens microlens-th
@@ -144698,16 +145902,16 @@ self: {
 
   "ldap-client" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , connection, containers, hspec, network, process, semigroups, stm
-     , text
+     , connection, containers, fail, hspec, network, process, semigroups
+     , stm, text
      }:
      mkDerivation {
        pname = "ldap-client";
-       version = "0.2.0";
-       sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88";
+       version = "0.3.0";
+       sha256 = "0fii1yi3mn1dqvzbsx63fqrb53v81a7d2gqn3xma8v9vsp9nxv7v";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring connection
-         containers network semigroups stm text
+         containers fail network semigroups stm text
        ];
        testHaskellDepends = [ base bytestring hspec process semigroups ];
        description = "Pure Haskell LDAP Client Library";
@@ -145361,6 +146565,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-family_2_0_0" = callPackage
+    ({ mkDerivation, base, containers, lens-family-core, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "lens-family";
+       version = "2.0.0";
+       sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7";
+       libraryHaskellDepends = [
+         base containers lens-family-core mtl transformers
+       ];
+       description = "Lens Families";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-family-core" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -145372,6 +146592,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-family-core_2_0_0" = callPackage
+    ({ mkDerivation, base, containers, transformers }:
+     mkDerivation {
+       pname = "lens-family-core";
+       version = "2.0.0";
+       sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r";
+       libraryHaskellDepends = [ base containers transformers ];
+       description = "Haskell 2022 Lens Families";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-family-th" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -145520,19 +146752,20 @@ self: {
      }) {};
 
   "lens-regex-pcre" = callPackage
-    ({ mkDerivation, base, hspec, lens, pcre-heavy, pcre-light
-     , template-haskell, text
+    ({ mkDerivation, base, bytestring, hspec, lens, pcre-heavy
+     , pcre-light, template-haskell, text
      }:
      mkDerivation {
        pname = "lens-regex-pcre";
-       version = "0.3.0.0";
-       sha256 = "1010nhik7vfk6gll9h8cwnq7mx3v4gnl3nlyn7ma5y93ghq0ckvs";
+       version = "0.3.1.0";
+       sha256 = "1fbhwzs7mwz9c0l3p34zcgfvqxwxlhr3abz9gawlraiiypmz0iby";
        libraryHaskellDepends = [
-         base lens pcre-heavy pcre-light template-haskell text
+         base bytestring lens pcre-heavy pcre-light template-haskell text
        ];
        testHaskellDepends = [
          base hspec lens pcre-heavy pcre-light template-haskell text
        ];
+       description = "A lensy interface to regular expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -146053,6 +147286,8 @@ self: {
        pname = "libarchive";
        version = "1.0.5.1";
        sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz";
+       revision = "4";
+       editedCabalFile = "0wzw962gl9lm5faaa86z4q7s9cbzqn346cmlbhr518dbnw7nv31d";
        libraryHaskellDepends = [
          base bytestring composition-prelude dlist filepath
        ];
@@ -147756,8 +148991,8 @@ self: {
        pname = "linearmap-category";
        version = "0.3.5.0";
        sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
-       revision = "2";
-       editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg";
+       revision = "3";
+       editedCabalFile = "0b4m77csdsi5wgvbclza2arps5s0xgg0iibiy8kwax55ml04kkvp";
        libraryHaskellDepends = [
          base call-stack constrained-categories containers
          free-vector-spaces ieee754 lens linear manifolds-core semigroups
@@ -150017,6 +151252,28 @@ self: {
        broken = true;
      }) {};
 
+  "log4hs" = callPackage
+    ({ mkDerivation, aeson, base, containers, data-default, directory
+     , filepath, hspec, hspec-core, process, QuickCheck
+     , template-haskell, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "log4hs";
+       version = "0.0.2.0";
+       sha256 = "08z8lyh0q4wpxvvzbf1w0bxvbm90ic4wzxyac2b0ddm4zn8zdn9s";
+       libraryHaskellDepends = [
+         aeson base containers data-default directory filepath
+         template-haskell text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base containers data-default directory filepath hspec
+         hspec-core process QuickCheck template-haskell text time
+         unordered-containers
+       ];
+       description = "A python logging style log library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "logentries" = callPackage
     ({ mkDerivation, base, bytestring, data-default, fast-logger, hspec
      , network, stm, uuid-types, wai, wai-extra
@@ -150296,12 +151553,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "logict_0_7_0_1" = callPackage
+  "logict_0_7_0_2" = callPackage
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "logict";
-       version = "0.7.0.1";
-       sha256 = "1zzcfxdl156rrr120vjcn2wawa2qdrninm6d4mxj215ig1a3aak5";
+       version = "0.7.0.2";
+       sha256 = "1xfgdsxg0lp8m0a2cb83rcxrnnc37asfikay2kydi933anh9ihfc";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
@@ -153174,8 +154431,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.5";
-       sha256 = "0yh7r3wrzpzm3iv0zvs6nzf36hwv0y7xlsz6cy3dlnyrr5jbsb1i";
+       version = "0.5.3.6";
+       sha256 = "1jvgxhc3x7867cryvsbpj7hks9syhpqbwyh4y0v6b0yp0xil8qrl";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types microlens-th
@@ -153931,26 +155188,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_3_6_0" = callPackage
-    ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest
-     , containers, data-default, data-default-class, deepseq, doctest
-     , exceptions, hspec, mersenne-random-pure64, primitive, QuickCheck
-     , random, scheduler, splitmix, template-haskell, unliftio
-     , unliftio-core, vector
+  "massiv_0_4_0_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.3.6.0";
-       sha256 = "00bjgrb7pa59i8wmbjgscq0jw4x3r1gjvpns7sd58ffa8zfd6sgc";
+       version = "0.4.0.0";
+       sha256 = "077w18fxgq50h1ylbalf6lbam2rcqp4a3b6qr21ac63514dyvyfz";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq exceptions primitive
          scheduler unliftio-core vector
        ];
        testHaskellDepends = [
-         async base bytestring containers data-default deepseq doctest hspec
-         mersenne-random-pure64 QuickCheck random scheduler splitmix
-         template-haskell unliftio vector
+         base doctest mersenne-random-pure64 QuickCheck random splitmix
+         template-haskell
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
@@ -153993,6 +155248,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv-test" = 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.0";
+       sha256 = "08rs0j773c3jxnj6akh8gaywfz2g10w1ddmcqpkci5bqqjmqqf85";
+       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
@@ -155337,19 +156615,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mega-sdist_0_4_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, optparse-simple, pantry-tmp
-     , path, path-io, rio, rio-orphans, yaml
+  "mega-sdist_0_4_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, optparse-simple, pantry, path
+     , path-io, rio, rio-orphans, yaml
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.4.0.0";
-       sha256 = "0d8z0jj4xm091zdlydkp5fgs22xrjrsydfm9czfr79pmcx83bdi4";
+       version = "0.4.0.1";
+       sha256 = "191saxmdh3705rhci7lz7qzcdzv2zvw9bwa7f5d62500azi13j8v";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring optparse-simple pantry-tmp path path-io rio
-         rio-orphans yaml
+         base bytestring optparse-simple pantry path path-io rio rio-orphans
+         yaml
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
@@ -155559,6 +156837,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "membrain" = callPackage
+    ({ mkDerivation, base, doctest, Glob, hedgehog, hspec, type-spec }:
+     mkDerivation {
+       pname = "membrain";
+       version = "0.0.0.0";
+       sha256 = "01wv5i3kgbpmwjnjk5xgkpm3j5wazlz1f05kmm523wf34xivp498";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest Glob hedgehog hspec type-spec
+       ];
+       description = "Type-safe memory units";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "memcache" = callPackage
     ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion
      , data-default-class, hashable, network, resource-pool, time
@@ -155667,8 +156961,8 @@ self: {
      }:
      mkDerivation {
        pname = "memdb";
-       version = "1.0.0.0";
-       sha256 = "1rm1ijhhiyznbqidcpa1796lzj35dhi4jb0a2qbrvgim329ymsr2";
+       version = "1.0.0.3";
+       sha256 = "082i381qyba51zkv4fqkn3mdhmya39pz8pw69m02c3hnp5vr4n4c";
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [
          base bytestring cereal hspec QuickCheck vector
@@ -156734,8 +158028,8 @@ self: {
        pname = "microlens-process";
        version = "0.2.0.0";
        sha256 = "05bkm3nhiv2mprds9xlmmnzll91hn76navb9h9kc9nl5rnq4nwrn";
-       revision = "2";
-       editedCabalFile = "02h97gnxwsn20npxsc0mjhyv5s8fj41xkm18xwvcqcq7a4cj8jnw";
+       revision = "4";
+       editedCabalFile = "00dhcr2czcx986a4lijmlbrxk2wm059mmbh63qs48wb6z4rrsg7y";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base filepath microlens process ];
        testHaskellDepends = [ base doctest microlens process ];
@@ -157341,6 +158635,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "minecraft" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "minecraft";
+       version = "0.0.0.0";
+       sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h";
+       doHaddock = false;
+       description = "TBA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "minecraft-data" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse
@@ -157348,8 +158653,8 @@ self: {
      }:
      mkDerivation {
        pname = "minecraft-data";
-       version = "0.1.0.0";
-       sha256 = "1p0lci3b3lwcd6j13bvsscz7ar5vskvhkpj8gy4fp8d1pak2adwr";
+       version = "0.1.0.1";
+       sha256 = "02ispnzvxjazjy76bqpils6jmy37l4v61l1wcklvvsvkb72yc39n";
        libraryHaskellDepends = [
          array base bytestring cereal containers lens mtl nbt pipes
          pipes-bytestring pipes-cereal pipes-parse pipes-zlib text text-show
@@ -157559,36 +158864,36 @@ self: {
        broken = true;
      }) {};
 
-  "minio-hs_1_3_1" = callPackage
+  "minio-hs_1_5_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, containers
-     , cryptonite, cryptonite-conduit, digest, directory, exceptions
-     , filepath, http-client, http-client-tls, http-conduit, http-types
-     , ini, memory, protolude, QuickCheck, raw-strings-qq, resourcet
-     , retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
-     , temporary, text, time, transformers, unliftio, unliftio-core
+     , case-insensitive, conduit, conduit-extra, connection, cryptonite
+     , cryptonite-conduit, digest, directory, exceptions, filepath
+     , http-client, http-client-tls, http-conduit, http-types, ini
+     , memory, protolude, QuickCheck, raw-strings-qq, resourcet, retry
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary
+     , text, time, transformers, unliftio, unliftio-core
      , unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "minio-hs";
-       version = "1.3.1";
-       sha256 = "1z553cpflxmr5hy723bgmwyq061fpivi1jw0vq64x1i0bz0q1llp";
+       version = "1.5.0";
+       sha256 = "0qp8zl7f055lpchg8abcc27jq4s0nn14qp474qrj4wdmynfi8bc8";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring case-insensitive
-         conduit conduit-extra connection containers cryptonite
-         cryptonite-conduit digest directory exceptions filepath http-client
-         http-client-tls http-conduit http-types ini memory protolude
-         raw-strings-qq resourcet retry text time transformers unliftio
-         unliftio-core unordered-containers xml-conduit
+         conduit conduit-extra connection cryptonite cryptonite-conduit
+         digest directory exceptions filepath http-client http-client-tls
+         http-conduit http-types ini memory protolude raw-strings-qq
+         resourcet retry text time transformers unliftio unliftio-core
+         unordered-containers xml-conduit
        ];
        testHaskellDepends = [
          aeson base base64-bytestring binary bytestring case-insensitive
-         conduit conduit-extra connection containers cryptonite
-         cryptonite-conduit digest directory exceptions filepath http-client
-         http-client-tls http-conduit http-types ini memory protolude
-         QuickCheck raw-strings-qq resourcet retry tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck temporary text time transformers
-         unliftio unliftio-core unordered-containers xml-conduit
+         conduit conduit-extra connection cryptonite cryptonite-conduit
+         digest directory exceptions filepath http-client http-client-tls
+         http-conduit http-types ini memory protolude QuickCheck
+         raw-strings-qq resourcet retry tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck temporary text time transformers unliftio
+         unliftio-core unordered-containers xml-conduit
        ];
        description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
        license = stdenv.lib.licenses.asl20;
@@ -157974,6 +159279,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso_1_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
+     , http-types, lucid, network-uri, servant, servant-lucid, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "1.2.0.0";
+       sha256 = "08yhr5hxrvgqdc32yz2j3mix7s8q5bzycld3kd4rfcy2h4h72962";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-api-data http-types lucid
+         network-uri servant servant-lucid text transformers vector
+       ];
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "miso-action-logger" = callPackage
     ({ mkDerivation, aeson, base, ghcjs-base, miso }:
      mkDerivation {
@@ -159547,6 +160872,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-metrics-extensible" = callPackage
+    ({ mkDerivation, base, dependent-map, dependent-sum, ekg, ekg-core
+     , exceptions, hspec, mtl, stm, text
+     }:
+     mkDerivation {
+       pname = "monad-metrics-extensible";
+       version = "0.1.0.1";
+       sha256 = "044hvhnf7wsgd18cac2j3bfw2vbxfnra736l6qndfx07mkv1nz5n";
+       libraryHaskellDepends = [
+         base dependent-map dependent-sum ekg ekg-core exceptions mtl stm
+         text
+       ];
+       testHaskellDepends = [
+         base dependent-map dependent-sum ekg ekg-core exceptions hspec mtl
+         stm text
+       ];
+       description = "An extensible and type-safe wrapper around EKG metrics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "monad-mock" = callPackage
     ({ mkDerivation, base, constraints, exceptions, haskell-src-exts
      , haskell-src-meta, hspec, monad-control, mtl, template-haskell
@@ -160734,6 +162079,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoidal-containers_0_5_0_0" = callPackage
+    ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
+     , newtype, semigroups, these, unordered-containers
+     }:
+     mkDerivation {
+       pname = "monoidal-containers";
+       version = "0.5.0.0";
+       sha256 = "0dayylvsn6mcgyis04nl4384sg8vr4mrnvf1wvfhb5pip3v7hl7a";
+       libraryHaskellDepends = [
+         aeson base containers deepseq hashable lens newtype semigroups
+         these unordered-containers
+       ];
+       description = "Containers with monoidal accumulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoidplus" = callPackage
     ({ mkDerivation, base, contravariant, semigroups, transformers }:
      mkDerivation {
@@ -161747,8 +163109,8 @@ self: {
      }:
      mkDerivation {
        pname = "ms-tds";
-       version = "0.2.0.0";
-       sha256 = "0675h4w8nayvh2gm644anz8sqk37b1n5ia4w5fgyaf9y6drafyda";
+       version = "0.3.0.0";
+       sha256 = "0pdv9x6743qaqk6fcm02hfrr09ckwbd9fpgzgmgmgnqhqxm0y9y6";
        libraryHaskellDepends = [
          array base binary bytestring crypto-random data-default-class mtl
          network template-haskell text time tls uuid-types x509-store
@@ -161885,8 +163247,8 @@ self: {
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.2.0.0";
-       sha256 = "1pqw2kr8fyy62kmamvm600zsqri9d2201kixvr6gdy6z0ivyl0sz";
+       version = "0.3.0.0";
+       sha256 = "0wssw1d3ki95b83ww6brx8apk7s86vnzgwlh91xvfdp8hkqygx1q";
        libraryHaskellDepends = [
          base binary bytestring hostname ms-tds network text time tls
        ];
@@ -163586,6 +164948,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mwc-probability_2_1_0" = callPackage
+    ({ mkDerivation, base, mwc-random, primitive, transformers }:
+     mkDerivation {
+       pname = "mwc-probability";
+       version = "2.1.0";
+       sha256 = "0ac4pr2l0p48a0n6jym445c8h7n2nf1pqkhrz6cd1rjbmrk5mbm3";
+       libraryHaskellDepends = [ base mwc-random primitive transformers ];
+       description = "Sampling function-based probability distributions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mwc-probability-transition" = callPackage
     ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect
      , mtl, mwc-probability, primitive, QuickCheck, transformers
@@ -164419,6 +165793,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "named-sop" = callPackage
+    ({ mkDerivation, base, singletons, tasty, tasty-hunit, text }:
+     mkDerivation {
+       pname = "named-sop";
+       version = "0.2.0.0";
+       sha256 = "1yz4cp19nf44cscfzhwsw7xigq07sxbvzfw5v5l3jgsjxi5xw9ad";
+       libraryHaskellDepends = [ base singletons text ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Dependently-typed sums and products, tagged by field name";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "namelist" = callPackage
     ({ mkDerivation, base, case-insensitive, data-default-class, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -164715,10 +166101,8 @@ self: {
      }:
      mkDerivation {
        pname = "naqsha";
-       version = "0.3.0.0";
-       sha256 = "1564aff7ynqilqa9aiv1ih3dl9rimvvzyzqczx1bb94iznrfzghi";
-       isLibrary = false;
-       isExecutable = false;
+       version = "0.3.0.1";
+       sha256 = "0wg2vvik0yhaqyla64m3mcrv0fkrs92dgkrq5pzq78xjycnm7q1r";
        libraryHaskellDepends = [ base bytestring groups vector ];
        testHaskellDepends = [
          base bytestring groups hspec hspec-discover HUnit QuickCheck vector
@@ -165477,20 +166861,20 @@ self: {
   "net-spider" = callPackage
     ({ mkDerivation, aeson, base, containers, data-interval, doctest
      , doctest-discover, extended-reals, greskell, greskell-websocket
-     , hashable, hspec, monad-logger, safe-exceptions, text, time
-     , unordered-containers, vector
+     , hashable, hspec, monad-logger, safe-exceptions, scientific, text
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "net-spider";
-       version = "0.3.0.0";
-       sha256 = "1wz37rrjpk4v8h1mh6pbld84f9kp5h3qcjxxh6fgbkij5l4g7m77";
+       version = "0.3.1.1";
+       sha256 = "0p0vwj438mbiwjgn7sqf3cb4bl48ygwi8n61wap9a9nc6fwrjmi8";
        libraryHaskellDepends = [
          aeson base containers data-interval extended-reals greskell
-         greskell-websocket hashable monad-logger safe-exceptions text time
-         unordered-containers vector
+         greskell-websocket hashable monad-logger safe-exceptions scientific
+         text time unordered-containers vector
        ];
        testHaskellDepends = [
-         base doctest doctest-discover hspec vector
+         aeson base doctest doctest-discover hspec text vector
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
@@ -165502,8 +166886,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider-pangraph";
-       version = "0.1.0.0";
-       sha256 = "1aiacaccml8477vmcnv9mqcrn87nyx7pbgwp7rppz7h5w0dsj8lx";
+       version = "0.1.1.0";
+       sha256 = "1j3s379ri05jg3bzhiz6d8fjvxlkz00l7mrphqmr46j4y8d9vrkv";
        libraryHaskellDepends = [
          base bytestring greskell net-spider pangraph text time
        ];
@@ -165518,15 +166902,14 @@ self: {
 
   "net-spider-rpl" = callPackage
     ({ mkDerivation, aeson, base, greskell, hashable, hspec, ip
-     , net-spider, net-spider-pangraph, text, time
+     , net-spider, text, time
      }:
      mkDerivation {
        pname = "net-spider-rpl";
-       version = "0.1.0.0";
-       sha256 = "0basbgcdkjksg9p2s5s0whnbas3w3wnrkkdsr907m8gppkdk6i69";
+       version = "0.2.1.0";
+       sha256 = "07f51ym5v1mpa1v6249sgkxqd8y52fdgs8l2r59mxil1ph6al7x1";
        libraryHaskellDepends = [
-         aeson base greskell hashable ip net-spider net-spider-pangraph text
-         time
+         aeson base greskell hashable ip net-spider text time
        ];
        testHaskellDepends = [ base hspec net-spider text ];
        description = "NetSpider data model and utility for RPL networks";
@@ -166701,6 +168084,19 @@ self: {
        broken = true;
      }) {};
 
+  "network-run" = callPackage
+    ({ mkDerivation, base, network }:
+     mkDerivation {
+       pname = "network-run";
+       version = "0.0.1";
+       sha256 = "1yc5hpcadab1dzvi9wz6v25v7wp5j07a36wdabrxi1pwy4gania5";
+       libraryHaskellDepends = [ base network ];
+       description = "Simple network runner library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "network-server" = callPackage
     ({ mkDerivation, base, network, unix }:
      mkDerivation {
@@ -167568,8 +168964,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.5.0";
-       sha256 = "1775syhp5pgm6sdn3x8y3zqzvqrwypl07xm6rkv34sbw5x84mmmv";
+       version = "0.4.6.0";
+       sha256 = "0bvyh1b8q2mh2labaykc7lndr2rfhzmkw8c7b56pxsa2fypfl232";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -168169,6 +169565,17 @@ self: {
        broken = true;
      }) {};
 
+  "no-value" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "no-value";
+       version = "1.0.0.0";
+       sha256 = "1jczx8d4ah74wiishdcv335hlr0330wwq0vfb5rv4gmrvbpkgllf";
+       libraryHaskellDepends = [ base ];
+       description = "A type class for choosing sentinel-like values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "noether" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , criterion, deepseq, ghc-prim, hashable, hedgehog, mtl, mtl-compat
@@ -169171,8 +170578,8 @@ self: {
        pname = "number-show";
        version = "0.1.0.0";
        sha256 = "01lywbcqg46wrd3qy0jikkh1p45yflypf1vcmrw75qpwji2afjry";
-       revision = "1";
-       editedCabalFile = "0wzim9xpm78rd71jcgfrz427rjvyvrb7qilkcvw78si7mj9wsxcc";
+       revision = "2";
+       editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c";
        libraryHaskellDepends = [ base microlens microlens-th ];
        description = "Flexible and accurate (for a given precision) numerical->string conversion";
        license = stdenv.lib.licenses.gpl3;
@@ -172316,6 +173723,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "optparse-enum" = callPackage
+    ({ mkDerivation, base, enum-text, fmt, optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "optparse-enum";
+       version = "1.0.0.0";
+       sha256 = "0d3wpfss1nm42hjn8l7x34ksa7yx5ccc4iglbfvln0rkbqdsjh13";
+       libraryHaskellDepends = [
+         base enum-text fmt optparse-applicative text
+       ];
+       description = "An enum-text based toolkit for optparse-applicative";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "optparse-generic" = callPackage
     ({ mkDerivation, base, bytestring, Only, optparse-applicative
      , semigroups, system-filepath, text, time, transformers, void
@@ -172984,6 +174407,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "outsort" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit
+     , conduit-algorithms, conduit-combinators, conduit-extra
+     , containers, deepseq, directory, exceptions, filemanip, filepath
+     , MissingH, primitive, resourcet, safe, safeio, temporary, text
+     , transformers, transformers-base, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "outsort";
+       version = "0.1.0";
+       sha256 = "13iw9hgsmz1j4lm4ahpi9kjgf3pcayll9fpi3fga48474hpz7gff";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base bytestring conduit conduit-algorithms
+         conduit-combinators conduit-extra containers deepseq directory
+         exceptions filemanip filepath MissingH primitive resourcet safe
+         safeio temporary text transformers transformers-base vector
+         vector-algorithms
+       ];
+       description = "External sorting package based on Conduit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "overhang" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -173208,6 +174655,8 @@ self: {
        pname = "packed-multikey-map";
        version = "0.1.0.0";
        sha256 = "19bh697xazsi22krwjgy83hv1pscnaqx544d5pk0q71wnync5m89";
+       revision = "1";
+       editedCabalFile = "1z6bx1qga02f33l194k2m45gs9cddq9q7q52b2vhv408n09jixrn";
        libraryHaskellDepends = [
          base constraints containers QuickCheck transformers vector
        ];
@@ -174197,8 +175646,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.1.7";
-       sha256 = "1wmp5c7b9scdrhrh50cpjfpcw1riw4kxs1vy935mzwja1y4zalsj";
+       version = "0.2.0";
+       sha256 = "0p46z3imh618v7i2734b5nlg9nx3hw4imjchqsx2l7nvkrpkgn64";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -174347,6 +175796,60 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pantry" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
+     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
+     , containers, contravariant, cryptonite, cryptonite-conduit
+     , deepseq, digest, directory, exceptions, filelock, filepath
+     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
+     , hpack, hspec, http-client, http-client-tls, http-conduit
+     , http-download, http-types, integer-gmp, memory, mono-traversable
+     , mtl, network, network-uri, path, path-io, persistent
+     , persistent-sqlite, persistent-template, primitive, QuickCheck
+     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
+     , safe, syb, tar-conduit, template-haskell, text, text-metrics
+     , th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, yaml, zip-archive
+     }:
+     mkDerivation {
+       pname = "pantry";
+       version = "0.1.1.1";
+       sha256 = "082p2shapgnv10qjm77bpn0y6p6582n38xcgirh2l8mhs1yqflyg";
+       libraryHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory filelock
+         filepath generic-deriving ghc-prim hackage-security hashable hpack
+         http-client http-client-tls http-conduit http-download http-types
+         integer-gmp memory mono-traversable mtl network network-uri path
+         path-io persistent persistent-sqlite persistent-template primitive
+         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
+         template-haskell text text-metrics th-lift th-lift-instances
+         th-orphans th-reify-many th-utilities time transformers unix-compat
+         unliftio unordered-containers vector yaml zip-archive
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory exceptions
+         filelock filepath generic-deriving ghc-prim hackage-security
+         hashable hedgehog hpack hspec http-client http-client-tls
+         http-conduit http-download http-types integer-gmp memory
+         mono-traversable mtl network network-uri path path-io persistent
+         persistent-sqlite persistent-template primitive QuickCheck
+         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
+         tar-conduit template-haskell text text-metrics th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unix-compat unliftio unordered-containers vector yaml
+         zip-archive
+       ];
+       description = "Content addressable Haskell package management";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "pantry-tmp" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
      , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
@@ -174367,8 +175870,8 @@ self: {
        pname = "pantry-tmp";
        version = "0.1.0.0";
        sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn";
-       revision = "3";
-       editedCabalFile = "12k0lqpc530ai9gb1ldx7l62qi86z4qc2s1bzif8fwaflk4c7ax6";
+       revision = "4";
+       editedCabalFile = "0hiashi78cak635jk74bk6m1dwdgyp8m0j5bzg18i776mb1zn09y";
        libraryHaskellDepends = [
          aeson ansi-terminal array base base-orphans base64-bytestring
          bytestring Cabal conduit conduit-extra containers contravariant
@@ -174834,6 +176337,17 @@ self: {
        broken = true;
      }) {};
 
+  "par-traverse" = callPackage
+    ({ mkDerivation, base, directory, filepath, parallel-io }:
+     mkDerivation {
+       pname = "par-traverse";
+       version = "0.2.0.0";
+       sha256 = "1cbanrhaad3fq2kkpdkb3rh7c8qrc1v7by8v6mg4lrgghdx3msk8";
+       libraryHaskellDepends = [ base directory filepath parallel-io ];
+       description = "Traverse a directory in parallel";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "para" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -175481,12 +176995,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "parser-combinators_1_1_0" = callPackage
+  "parser-combinators_1_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "parser-combinators";
-       version = "1.1.0";
-       sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc";
+       version = "1.2.0";
+       sha256 = "18kfg4sxighqzd64ad98xhc62sh7pd63pv7xhcj601pw922iappa";
        libraryHaskellDepends = [ base ];
        description = "Lightweight package providing commonly useful parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -175500,10 +177014,8 @@ self: {
      }:
      mkDerivation {
        pname = "parser-combinators-tests";
-       version = "1.1.0";
-       sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz";
-       revision = "1";
-       editedCabalFile = "0adgbzpylvk9p7ylxynsdrmqhhbh5pm8ww1s3nz3czl79y8lhh47";
+       version = "1.2.0";
+       sha256 = "0ainpyrxm03brn6z27jkqp65rc1z3lza00k6mg10506qk83fa52l";
        isLibrary = false;
        isExecutable = false;
        testHaskellDepends = [
@@ -176031,6 +177543,8 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patch-combinators" = callPackage
@@ -176279,8 +177793,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "patience";
-       version = "0.2.1.1";
-       sha256 = "14d6hkrkbanlv09z7dbg8q7hk5ax5mfpgzr0knmcviq02kmzbs0s";
+       version = "0.3";
+       sha256 = "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i";
        libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
        license = stdenv.lib.licenses.bsd3;
@@ -177342,6 +178856,32 @@ self: {
        broken = true;
      }) {};
 
+  "perceptual-hash" = callPackage
+    ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip
+     , optparse-applicative, par-traverse, pHash, primitive, repa, stm
+     , vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "perceptual-hash";
+       version = "0.1.1.0";
+       sha256 = "107f5xb4wg4zmwqldw8a04byazqyzd0vkn6zl5iv4f5ii2sdb5yh";
+       revision = "1";
+       editedCabalFile = "001nr9brgk05bbhz9lw8viqrc6rgfy0rjp08fcdhn302j55j33i3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base hip primitive repa vector vector-algorithms
+       ];
+       executableHaskellDepends = [
+         base containers filepath optparse-applicative par-traverse stm
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       benchmarkPkgconfigDepends = [ pHash ];
+       benchmarkToolDepends = [ cpphs ];
+       description = "Find duplicate images";
+       license = stdenv.lib.licenses.bsd3;
+     }) {pHash = null;};
+
   "perdure" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cognimeta-utils
      , collections-api, comonad-transformers, containers, cryptohash
@@ -177468,8 +179008,8 @@ self: {
      }:
      mkDerivation {
        pname = "perfect-vector-shuffle";
-       version = "0.1.0";
-       sha256 = "1nvwbmfqv9bq6423hxafjrvza6ynj3pry4m5ms1g2yf5vsx47w38";
+       version = "0.1.1";
+       sha256 = "1r9w8792r25fgyf7q7jdpnw4rmdvrjfg7g4dn2dk1d3gy4lbabig";
        libraryHaskellDepends = [
          base MonadRandom primitive random vector
        ];
@@ -177998,6 +179538,8 @@ self: {
        pname = "persistent-mongoDB";
        version = "2.8.0";
        sha256 = "12hp7cqdz672r5rhad6xvjpxhrs8v1swiz0d9n7xbn41g11a247l";
+       revision = "1";
+       editedCabalFile = "06iqf7frc5h7qvxhnxi2zirgspsmafp2ls0jw3ppzb01q0y6mgi4";
        libraryHaskellDepends = [
          aeson attoparsec base bson bytestring cereal conduit containers
          http-api-data mongoDB network path-pieces persistent resource-pool
@@ -178103,6 +179645,27 @@ self: {
        broken = true;
      }) {};
 
+  "persistent-pagination" = callPackage
+    ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec
+     , hspec-discover, microlens, mtl, persistent, persistent-sqlite
+     , persistent-template, QuickCheck, time
+     }:
+     mkDerivation {
+       pname = "persistent-pagination";
+       version = "0.1.1.0";
+       sha256 = "1g2mn2gv9dygx4rrpxi81421dyyy9pdnzrdpqcb5sygcjsqi17ha";
+       libraryHaskellDepends = [
+         base conduit esqueleto foldl microlens mtl persistent
+       ];
+       testHaskellDepends = [
+         base conduit containers esqueleto hspec hspec-discover mtl
+         persistent persistent-sqlite persistent-template QuickCheck time
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Efficient and correct pagination for persistent or esqueleto queries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persistent-parser" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, text }:
      mkDerivation {
@@ -178356,7 +179919,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
-  "persistent-sqlite_2_10_1" = callPackage
+  "persistent-sqlite_2_10_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger
      , persistent, persistent-template, persistent-test, QuickCheck
@@ -178366,8 +179929,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.10.1";
-       sha256 = "1yan8ciljv2kkcxlc9yj97gvlgkzf1ha6369dqnr7fgk1xhr74nz";
+       version = "2.10.4";
+       sha256 = "0x4b327h2gqhccy7yw5sa8mn8xfc4zb5kqwx98nr9yk7f1s0fr79";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -178414,7 +179977,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template_2_7_1" = callPackage
+  "persistent-template_2_7_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, deepseq-generics, file-embed, hspec, http-api-data
      , monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -178422,8 +179985,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.7.1";
-       sha256 = "1yki4dvfk2p5cs2gfdnplsfyb1cxakhrdfjxgdgbnc0xxicbzx42";
+       version = "2.7.2";
+       sha256 = "04fpxsbj78gy51bl3jcfg70aaha92v0r48bjwq4pg7ln3cic95i8";
        libraryHaskellDepends = [
          aeson base bytestring containers http-api-data monad-control
          monad-logger path-pieces persistent template-haskell text
@@ -179591,8 +181154,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard-notes-backup";
-       version = "1.0.4";
-       sha256 = "0frlxz9mqd0dypi3f6w926sngwp4jhrz47zr35zdxwrvv64z29g7";
+       version = "1.0.4.1";
+       sha256 = "1a0lw43pjfz18aplm2frljwaww37pm2ashxi59j6l5n32lg5573j";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -179649,15 +181212,17 @@ self: {
 
   "ping" = callPackage
     ({ mkDerivation, base, cpu, ip, posix-api, primitive
-     , primitive-containers, stm, transformers
+     , primitive-addr, primitive-containers, stm, transformers
      }:
      mkDerivation {
        pname = "ping";
-       version = "0.1.0.2";
-       sha256 = "1cjgs571q5p5r5j94w8cax20r951v08x3cq5a2wd5r852bbgg9ww";
+       version = "0.1.0.3";
+       sha256 = "1h57p53vakjxm3g6inp9wvj5pp71qb0mpcrxbaa707w8v9lyvwwi";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base cpu ip posix-api primitive primitive-containers stm
-         transformers
+         base cpu ip posix-api primitive primitive-addr primitive-containers
+         stm transformers
        ];
        description = "icmp echo requests";
        license = stdenv.lib.licenses.bsd3;
@@ -179774,6 +181339,27 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "piped" = callPackage
+    ({ mkDerivation, base, conduit, gauge, microlens-platform, mtl
+     , quickcheck-instances, tasty, tasty-discover, tasty-golden
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "piped";
+       version = "0.1.0.0";
+       sha256 = "0f7j4mzdcmw7lnmq73hr6wfi64jjg350bmf0w1pf1rgma2wb9cl0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base conduit gauge microlens-platform mtl quickcheck-instances
+         tasty tasty-discover tasty-golden tasty-hunit tasty-quickcheck
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Conduit with a smaller core";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipeline" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -180344,6 +181930,8 @@ self: {
        pname = "pipes-group";
        version = "1.0.12";
        sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk";
+       revision = "1";
+       editedCabalFile = "0ws99n692c9km68n9y3x0b5bqdg3b47sva04nx9a4xdqr8p5akps";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
@@ -182299,8 +183887,8 @@ self: {
      }:
      mkDerivation {
        pname = "poly";
-       version = "0.3.0.0";
-       sha256 = "0kwh1n9b6zh21kg2036v02jpr9xvvay6x72b044j4la65pal5h8i";
+       version = "0.3.1.0";
+       sha256 = "1c8xnkqxwzbpx01clz9spz9zwa18qhsbvscrc381r0f46cjax2ph";
        libraryHaskellDepends = [
          base primitive semirings vector vector-algorithms
        ];
@@ -182477,26 +184065,27 @@ self: {
     ({ mkDerivation, async, base, containers, criterion, doctest
      , first-class-families, free, freer-simple, hspec, hspec-discover
      , inspection-testing, mtl, syb, template-haskell, th-abstraction
-     , transformers, type-errors, unagi-chan
+     , transformers, type-errors, type-errors-pretty, unagi-chan
      }:
      mkDerivation {
        pname = "polysemy";
-       version = "0.7.0.0";
-       sha256 = "0p9f5m2invppncmd1d9sim1kvnzcgramnq3y1vr0bisg02y0c8dc";
+       version = "1.0.0.0";
+       sha256 = "1y63vwrmmany62ci2sdd8kfmkrigk0vds2kjpxmyh9nsvw5fv576";
        libraryHaskellDepends = [
          async base containers first-class-families mtl syb template-haskell
-         th-abstraction transformers type-errors unagi-chan
+         th-abstraction transformers type-errors type-errors-pretty
+         unagi-chan
        ];
        testHaskellDepends = [
          async base containers doctest first-class-families hspec
          inspection-testing mtl syb template-haskell th-abstraction
-         transformers type-errors unagi-chan
+         transformers type-errors type-errors-pretty unagi-chan
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          async base containers criterion first-class-families free
          freer-simple mtl syb template-haskell th-abstraction transformers
-         type-errors unagi-chan
+         type-errors type-errors-pretty unagi-chan
        ];
        description = "Higher-order, low-boilerplate, zero-cost free monads";
        license = stdenv.lib.licenses.bsd3;
@@ -182551,21 +184140,21 @@ self: {
      }) {};
 
   "polysemy-zoo" = callPackage
-    ({ mkDerivation, base, constraints, containers, hspec
-     , hspec-discover, mtl, polysemy, polysemy-plugin, random
-     , reflection, text
+    ({ mkDerivation, async, base, binary, bytestring, constraints
+     , containers, ghc-prim, hedis, hspec, hspec-discover, mtl, polysemy
+     , polysemy-plugin, random, reflection
      }:
      mkDerivation {
        pname = "polysemy-zoo";
-       version = "0.3.0.0";
-       sha256 = "1ww5qsxpz1h5jb1444fm2hnzkikcpnpf7gw4v1vkn8bh6cnmpxfy";
+       version = "0.5.0.1";
+       sha256 = "06ggm3qinabwp5bha858anwdvw726wzl738wpgf1kd9mgivbv53w";
        libraryHaskellDepends = [
-         base constraints containers mtl polysemy polysemy-plugin random
-         reflection
+         async base binary bytestring constraints containers ghc-prim hedis
+         mtl polysemy polysemy-plugin random reflection
        ];
        testHaskellDepends = [
-         base constraints containers hspec mtl polysemy polysemy-plugin
-         random reflection text
+         async base binary bytestring constraints containers ghc-prim hedis
+         hspec mtl polysemy polysemy-plugin random reflection
        ];
        testToolDepends = [ hspec-discover ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
@@ -182921,7 +184510,7 @@ self: {
 
   "poppler" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
+     , gdk_pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
      , poppler
      }:
      mkDerivation {
@@ -182933,13 +184522,13 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
-       libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler ];
+       libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
+     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage
@@ -183129,12 +184718,14 @@ self: {
      }:
      mkDerivation {
        pname = "posix-api";
-       version = "0.3.0.0";
-       sha256 = "172271qakd2w8hg68m57p8avwwb2cm8hds0qzq53559p2n1z69xq";
+       version = "0.3.2.0";
+       sha256 = "1ki45p31cc1zplzsi9kln85rm556rwk5yvwgsb75bcgqwg6xpcl8";
        libraryHaskellDepends = [
          base primitive primitive-addr primitive-offset primitive-unlifted
        ];
-       testHaskellDepends = [ base primitive tasty tasty-hunit ];
+       testHaskellDepends = [
+         base primitive primitive-unlifted tasty tasty-hunit
+       ];
        description = "posix bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183530,8 +185121,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-lo-stream";
-       version = "0.1.1.0";
-       sha256 = "196f6lz8i8y0cfnd4lqjky69wpi0mc2jfs7jz5v0j3r15jbs5212";
+       version = "0.1.1.1";
+       sha256 = "0m2s717qb42ywiqvdi18nybjadkivygfi2pbflip5rvphqfc8k8x";
        libraryHaskellDepends = [
          base bytestring io-streams lifted-base monad-loops mtl
          postgresql-simple
@@ -183717,6 +185308,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-named" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, hspec, mtl
+     , postgresql-simple, resource-pool, text, transformers
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-named";
+       version = "0.0.1.0";
+       sha256 = "1lp7bq7w3l127cb4js3gmmp8c9nvxabs64c200c73lqg5mw9fkfp";
+       libraryHaskellDepends = [
+         base bytestring mtl postgresql-simple text
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hspec postgresql-simple resource-pool
+         transformers
+       ];
+       description = "Implementation of named parameters for `postgresql-simple` library";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, data-default, either
      , generic-deriving, hspec, optparse-applicative, optparse-generic
@@ -184457,6 +186069,8 @@ self: {
        pname = "pragmatic-show";
        version = "0.1.2.0";
        sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7";
+       revision = "1";
+       editedCabalFile = "17rs7ms62aisnk5wsdp67v3cgv5ph734iswv7137ibv339dlkl82";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck vector-space
@@ -185590,8 +187204,8 @@ self: {
     ({ mkDerivation, base, primitive }:
      mkDerivation {
        pname = "primitive-addr";
-       version = "0.1.0.1";
-       sha256 = "01gr75k2j60dgs711w1s9r201ndapqlwapznrvd3cm6r4rm3i54i";
+       version = "0.1.0.2";
+       sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2";
        libraryHaskellDepends = [ base primitive ];
        description = "Addresses to unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
@@ -186441,8 +188055,8 @@ self: {
        pname = "product-profunctors";
        version = "0.10.0.0";
        sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd";
-       revision = "1";
-       editedCabalFile = "17zi38fzg7yf9i5da2hlch6jw2qhmjcvs9wwkhyvra520605mlya";
+       revision = "2";
+       editedCabalFile = "0sarkc9sch60f5j1xjy30yrgycvmp5bqx1iynmlsfzdx7rvk5s29";
        libraryHaskellDepends = [
          base bifunctors contravariant profunctors tagged template-haskell
        ];
@@ -187120,8 +188734,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.9.0";
-       sha256 = "1hgqq782qyqdnr86cx7xc063ksqyq37pwf58jz2g0rn3sk8qmv1i";
+       version = "5.9.1";
+       sha256 = "1v4cpj4kbmhl4xkxm7gxm2z9pqf6zmr4psawaxixvsav6xpxgphr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188670,8 +190284,8 @@ self: {
      }:
      mkDerivation {
        pname = "purebred-email";
-       version = "0.1.0.1";
-       sha256 = "0igjid6rfg13bhgkm51np0ml2sfnkg5a6z3231mmiynkdja7l5zl";
+       version = "0.2.0.0";
+       sha256 = "1jjdia8qlwdibmfrqasyvm6qq01pxc9r66qmbyjmhz9bhdkqdd61";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191835,10 +193449,8 @@ self: {
     ({ mkDerivation, base, hmatrix, mtl, random-fu }:
      mkDerivation {
        pname = "random-fu-multivariate";
-       version = "0.1.2.0";
-       sha256 = "11hss3d1aa917g7w7k76zcakk82ras3046vb768yh5kayrb6a347";
-       revision = "2";
-       editedCabalFile = "13frafm1fdlgir64qsqy97158mv5chx98y23pdzdqiannf10w4by";
+       version = "0.1.2.1";
+       sha256 = "01r3jgjmhcj7wrc9ighwm0sbndsrz92l20gxh9p4rm2l90n0vxqc";
        libraryHaskellDepends = [ base hmatrix mtl random-fu ];
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
@@ -192064,6 +193676,24 @@ self: {
        broken = true;
      }) {};
 
+  "range-set-list_0_1_3_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "range-set-list";
+       version = "0.1.3.1";
+       sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j";
+       libraryHaskellDepends = [ base containers deepseq hashable ];
+       testHaskellDepends = [
+         base containers deepseq hashable tasty tasty-quickcheck
+       ];
+       description = "Memory efficient sets with ranges of elements";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "range-space" = callPackage
     ({ mkDerivation, base, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, time, vector-space
@@ -192535,6 +194165,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "1.1.0";
+       sha256 = "1wgmlcazfbz4y4q9k6367i76l8cal1qgqhqbh2p69ca365w9pf56";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rating-chgk-info" = callPackage
     ({ mkDerivation, aeson, base-noprelude, bytestring, cassava
      , containers, directory, gauge, http-client, http-client-tls, iconv
@@ -193571,23 +195217,23 @@ self: {
      }) {};
 
   "readme-lhs" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, filepath, foldl
-     , HUnit, optparse-applicative, protolude, tasty, tasty-hunit, text
+    ({ mkDerivation, base, containers, doctest, optparse-generic
+     , pandoc, pandoc-types, protolude, tasty, text
      }:
      mkDerivation {
        pname = "readme-lhs";
-       version = "0.1.0.0";
-       sha256 = "1pn0an37w4kgcn93a6qm0jxqsj882mhjwrnvl7hc5vp1960nqs6j";
+       version = "0.2.0";
+       sha256 = "0xwc2gqf23g87mi16miyi0nxy4wh33rki324biv3wh7xbpj03kpx";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ attoparsec base foldl protolude text ];
+       libraryHaskellDepends = [
+         base containers pandoc pandoc-types protolude text
+       ];
        executableHaskellDepends = [
-         base containers filepath foldl optparse-applicative protolude text
+         base optparse-generic pandoc protolude
        ];
-       testHaskellDepends = [
-         base HUnit protolude tasty tasty-hunit text
-       ];
-       description = "See readme.lhs";
+       testHaskellDepends = [ base doctest protolude tasty ];
+       description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -194108,8 +195754,8 @@ self: {
      }:
      mkDerivation {
        pname = "red-black-record";
-       version = "2.0.2.2";
-       sha256 = "1afmqdgd0xhawjckjz318561zsr478a7jkpr20l7alic6zxnl4z9";
+       version = "2.0.4.0";
+       sha256 = "1wcg8a3aql1jmnfl7q5gzjgxl4z6780zgp8w10v3g52ilcdq4myn";
        libraryHaskellDepends = [ base sop-core ];
        testHaskellDepends = [
          aeson base bytestring doctest profunctors sop-core tasty
@@ -194548,8 +196194,8 @@ self: {
      }:
      mkDerivation {
        pname = "refined";
-       version = "0.4.2.1";
-       sha256 = "0p74hqmlx0ns8zjn689ngfjn4y5rvap5fza0p9mpx7107bskdf9d";
+       version = "0.4.2.2";
+       sha256 = "1gdfhmj8f1abxflxmqyfibz0hdaayr932f04vchygdvdb812av60";
        libraryHaskellDepends = [
          aeson base deepseq exceptions mtl prettyprinter QuickCheck
          template-haskell transformers
@@ -194601,26 +196247,27 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, 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, random
-     , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb
+    ({ 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, semigroupoids, semigroups, split, stm, syb
      , template-haskell, these, time, transformers, transformers-compat
      , unbounded-delays, witherable
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.6.1";
-       sha256 = "1ggp2bpil2ig6rs45fn754kpqnp45lp069nc6ib4isj0dgzb9gpn";
+       version = "0.6.2.1";
+       sha256 = "0s8saim58bqqhg1nbrrdw2blnph7jrhqw97wxf73g4r1d8jacg3z";
        libraryHaskellDepends = [
-         base bifunctors comonad containers data-default dependent-map
-         dependent-sum exception-transformers haskell-src-exts
+         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 random ref-tf reflection semigroupoids
-         semigroups stm syb template-haskell these time transformers
-         transformers-compat unbounded-delays witherable
+         mtl prim-uniq primitive profunctors random ref-tf reflection
+         semigroupoids semigroups stm syb template-haskell these time
+         transformers transformers-compat unbounded-delays witherable
        ];
        testHaskellDepends = [
          base bifunctors containers deepseq dependent-map dependent-sum
@@ -194633,6 +196280,8 @@ self: {
        ];
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-animation" = callPackage
@@ -194693,6 +196342,8 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "A basic `reflex` host for backend work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-dom" = callPackage
@@ -195021,6 +196672,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reform-lucid" = callPackage
+    ({ mkDerivation, base, lucid, path-pieces, reform, text }:
+     mkDerivation {
+       pname = "reform-lucid";
+       version = "0.1.0.0";
+       sha256 = "1a3jfk0i87vqwxxlspzy44lf2i3bxxxy20pnbysczzf8i113y9zi";
+       libraryHaskellDepends = [ base lucid path-pieces reform text ];
+       description = "Add support for using lucid with Reform";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reformat" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -195820,8 +197482,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-hedgehog";
-       version = "0.2.0.3";
-       sha256 = "138x33b9sficpy20dvcayf9isilv9crng2d46m2gh7ckidw94ghp";
+       version = "0.2.1.0";
+       sha256 = "1gx7grxy7p08bbvmxrhr3ciw9jg7isz3xsa2ha3s3pg4ifas4g59";
        libraryHaskellDepends = [
          base containers hedgehog mmorph multimap protolude registry tasty
          tasty-discover tasty-hedgehog tasty-th template-haskell text
@@ -196096,6 +197758,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_12_2_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.12.2.2";
+       sha256 = "0768cw6c5chzdcwshjjniysik5d1yj7zvhwncqnn0wgy4gp6kzjv";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
@@ -198764,6 +200449,8 @@ self: {
        ];
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ridley-extras" = callPackage
@@ -198781,6 +200468,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riemann" = callPackage
@@ -198903,7 +200592,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "rio_0_1_10_0" = callPackage
+  "rio_0_1_11_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
      , process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -198911,8 +200600,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.10.0";
-       sha256 = "1jhiy139jl8rc8j4fwl76k1w8mrmmjszhsja7xcs8n2nxr13cb2g";
+       version = "0.1.11.0";
+       sha256 = "17p3zr1fncwqc1rz181mfbxi9dlyd2cd8xcxhnxm3fgnq6i9cj4l";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens mtl primitive process text time typed-process
@@ -198957,8 +200646,8 @@ self: {
        pname = "rio-prettyprint";
        version = "0.1.0.0";
        sha256 = "0n8ldc73i0954c6s8jh0hibxrisp84yh5pcxv3x3q0wg4v2xvr0m";
-       revision = "1";
-       editedCabalFile = "0ya7i766srm62p19idm7lwwfk01b81f8795q7jqqwl7rwk5rcdag";
+       revision = "2";
+       editedCabalFile = "1hvhjqy7kfk7fglx1rw8axscy0dfzqwd1564awnwdhvmf8silkkn";
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl
          path rio text
@@ -199736,15 +201425,16 @@ self: {
   "ron" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , containers, criterion, deepseq, hashable, integer-gmp, mtl
-     , template-haskell, text, time, unordered-containers
+     , scientific, template-haskell, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "ron";
-       version = "0.6";
-       sha256 = "022ilxpk9axw41d1cmlgdsgc3c7ss6a0j6a1w10l81g56xlpi67z";
+       version = "0.7";
+       sha256 = "1bh4vdq9nwi5kwfa2qly1n0jfnphy17b8svd1k3jdzjfclwrjpgj";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring containers hashable
-         integer-gmp mtl template-haskell text time unordered-containers
+         integer-gmp mtl scientific template-haskell text time
+         unordered-containers
        ];
        benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ];
        description = "RON";
@@ -199757,8 +201447,8 @@ self: {
      }:
      mkDerivation {
        pname = "ron-rdt";
-       version = "0.6";
-       sha256 = "0npd4fh3flywfrpnwfsfpss4zbzd9jj9xsbpxlcc4hhjh45x1b6b";
+       version = "0.7";
+       sha256 = "1fcvsirzhwmkzcsdr0bhipqq7k7wsg1cjb6z3q4sjihcq9qp22gq";
        libraryHaskellDepends = [
          base containers Diff hashable integer-gmp mtl ron text time
          transformers unordered-containers
@@ -199774,8 +201464,8 @@ self: {
      }:
      mkDerivation {
        pname = "ron-schema";
-       version = "0.6";
-       sha256 = "07nn74vwx26flam7klwfvj4yz5mqh8d5flf5ps7wxxfn70z3g4yg";
+       version = "0.7";
+       sha256 = "12vnzmsj6vxvr26x7a9vvp025dxn9jlyi40hgpydpyg9dmjbs246";
        libraryHaskellDepends = [
          base bytestring containers hedn integer-gmp megaparsec mtl ron
          ron-rdt template-haskell text transformers
@@ -199791,8 +201481,8 @@ self: {
      }:
      mkDerivation {
        pname = "ron-storage";
-       version = "0.7";
-       sha256 = "0wqvbnylz2wx85c7qfqzima3axif6r65vc0iwl8lrmxpif2zs41c";
+       version = "0.8";
+       sha256 = "1326r8x3m4x1ylf32x66h9s6y7z4hwrwah33kkshj656f3f4bnds";
        libraryHaskellDepends = [
          base bytestring containers directory filepath integer-gmp mtl
          network-info ron ron-rdt stm text transformers
@@ -200700,8 +202390,8 @@ self: {
      }:
      mkDerivation {
        pname = "ruby-marshal";
-       version = "0.1.2";
-       sha256 = "13s017sqim92yz9r3x8zc4by1hksncikavsn12kf42vv58k95g1p";
+       version = "0.1.3";
+       sha256 = "0syjd9fmp55cfkq1kb78pvx0vg9dk43s5w4q2a8ndd1fkg194jwx";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl string-conv vector
        ];
@@ -201663,64 +203353,66 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "salak_0_2_9_3" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default, directory, filepath, hspec, menshen, mtl, pqueue
-     , QuickCheck, scientific, text, time, unliftio-core
+  "salak_0_3_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, data-default
+     , directory, exceptions, filepath, hashable, heaps, hspec, menshen
+     , mtl, QuickCheck, random, scientific, text, time, unliftio-core
+     , unordered-containers
      }:
      mkDerivation {
        pname = "salak";
-       version = "0.2.9.3";
-       sha256 = "0y1p2cf8bpglqf20a16d2h5xfknzz6wcdgwv6mamh24mdqv0c3rn";
+       version = "0.3.3";
+       sha256 = "1jq9vngi03wqcvfb1r9ndg4w1vipgbhbzdyybkpj4hmc074l1079";
        libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default directory
-         filepath menshen mtl pqueue scientific text time unliftio-core
+         attoparsec base bytestring data-default directory exceptions
+         filepath hashable heaps menshen mtl scientific text time
+         unliftio-core unordered-containers
        ];
        testHaskellDepends = [
-         attoparsec base bytestring containers data-default directory
-         filepath hspec menshen mtl pqueue QuickCheck scientific text time
-         unliftio-core
+         attoparsec base bytestring data-default directory exceptions
+         filepath hashable heaps hspec menshen mtl QuickCheck random
+         scientific text time unliftio-core unordered-containers
        ];
-       description = "Configuration Loader";
-       license = stdenv.lib.licenses.bsd3;
+       description = "Configuration (re)Loader and Parser";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salak-toml" = callPackage
-    ({ mkDerivation, base, hspec, mtl, QuickCheck, salak, text, time
-     , tomland, unordered-containers
+    ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck, salak
+     , text, time, tomland, unordered-containers
      }:
      mkDerivation {
        pname = "salak-toml";
-       version = "0.2.9.3";
-       sha256 = "1hb5ddm7a9acwri730w50p14vyk6z8q1wnx2b87386d80am5mbpy";
+       version = "0.3.3";
+       sha256 = "0961xwj928map27az5qlp86wxg5jj6kq9cxqhbmcyl7m1cic91dy";
        libraryHaskellDepends = [
-         base mtl salak text time tomland unordered-containers
+         base salak text time tomland unordered-containers
        ];
        testHaskellDepends = [
-         base hspec mtl QuickCheck salak text time tomland
+         base exceptions hspec mtl QuickCheck salak text time tomland
          unordered-containers
        ];
        description = "Configuration Loader for toml";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
   "salak-yaml" = callPackage
-    ({ mkDerivation, base, conduit, hspec, libyaml, mtl, QuickCheck
-     , salak, text
+    ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl
+     , QuickCheck, salak, text
      }:
      mkDerivation {
        pname = "salak-yaml";
-       version = "0.2.9.3";
-       sha256 = "0jjmw923zvm349q318iw7y5lfqhbr85xgp6ai3xx5w5d4mcb2f32";
+       version = "0.3.3";
+       sha256 = "038pfna1jijw6vf8b89ql4f4987s60lpj90nlny66wxkj4b2nbrq";
        libraryHaskellDepends = [ base conduit libyaml salak text ];
        testHaskellDepends = [
-         base conduit hspec libyaml mtl QuickCheck salak text
+         base conduit exceptions hspec libyaml mtl QuickCheck salak text
        ];
        description = "Configuration Loader for yaml";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -203176,8 +204868,8 @@ self: {
      }:
      mkDerivation {
        pname = "scidb-hquery";
-       version = "2.8.0.432";
-       sha256 = "0swjsgf84kwkzv7nwrnrzlpxbhdvi3i5pnnjrlgql9x4c30bqw6i";
+       version = "2.8.0.434";
+       sha256 = "0q994ac1krcw312nklxxjr9d4r231s50lb2crbpph1swv6h8jwrq";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -203498,6 +205190,21 @@ self: {
        broken = true;
      }) {};
 
+  "scotty-form" = callPackage
+    ({ mkDerivation, base, ditto, ditto-lucid, lucid, scotty, text }:
+     mkDerivation {
+       pname = "scotty-form";
+       version = "0.1.0.0";
+       sha256 = "0ks11rav9x52lq27mr12qlygg6yl9wl87fqa28jbz084fwn97w44";
+       libraryHaskellDepends = [
+         base ditto ditto-lucid lucid scotty text
+       ];
+       description = "Html form validation using `ditto`";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "scotty-format" = callPackage
     ({ mkDerivation, aeson, base, http-media, http-types, scotty, text
      }:
@@ -204205,8 +205912,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdr";
-       version = "0.1.0.11";
-       sha256 = "0gkf7ql1a40vpb4qaivcyygvlykp4whljmhp2jy37bk56zr45yvv";
+       version = "0.1.0.12";
+       sha256 = "0nikrpcyb5mihc70cfvxy24bl80jjnabc8dc8y056yx54759jkk8";
        libraryHaskellDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL
@@ -205680,6 +207387,8 @@ self: {
        pname = "serialise";
        version = "0.2.1.0";
        sha256 = "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4";
+       revision = "1";
+       editedCabalFile = "1rknhad1i8bpknsnphmcmb6dnb48c2p2c13ia2qqch3hkhsvfpr6";
        libraryHaskellDepends = [
          array base bytestring cborg containers ghc-prim half hashable
          primitive text time unordered-containers vector
@@ -205850,7 +207559,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant_0_16_1" = callPackage
+  "servant_0_16_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
      , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq
      , doctest, hspec, hspec-discover, http-api-data, http-media
@@ -205860,8 +207569,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.16.1";
-       sha256 = "1v63b3ng1zck4jw79ijjv4vvsm8w1c8vz4c0dd8sklpkcrfbpxam";
+       version = "0.16.2";
+       sha256 = "0yzl1yklbbymlh8jdc4ncrdxkalx2z349v4msbd6wxxrxfkxbz6n";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bifunctors bytestring
@@ -207862,7 +209571,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-server_0_16_1" = callPackage
+  "servant-server_0_16_2" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base64-bytestring
      , bytestring, Cabal, cabal-doctest, containers, directory, doctest
      , exceptions, filepath, hspec, hspec-discover, hspec-wai
@@ -207874,8 +209583,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.16.1";
-       sha256 = "1zkx6ipz4ay64jdvqxhhrq2sfxj6d6ma8z4cxwpascnawhjqjpq7";
+       version = "0.16.2";
+       sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -211023,6 +212732,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "silently_1_2_5_1" = callPackage
+    ({ mkDerivation, base, deepseq, directory, nanospec, temporary }:
+     mkDerivation {
+       pname = "silently";
+       version = "1.2.5.1";
+       sha256 = "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz";
+       libraryHaskellDepends = [ base deepseq directory ];
+       testHaskellDepends = [ base deepseq directory nanospec temporary ];
+       description = "Prevent or capture writing to stdout and other handles";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "silvi" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, chronos, http-types
      , ip, quantification, savage, text
@@ -211083,8 +212805,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple";
-       version = "0.11.2";
-       sha256 = "05069qjgzm4j22p0q6i75qpsvzpw52b7bh2x2b6jcxnlvqp6flzg";
+       version = "0.11.3";
+       sha256 = "0qifp6wacsmykb09ddx03yv4pbk7c1rhs16jjlfafm2wc2025rac";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -211206,6 +212928,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-cabal_0_0_0_1" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "simple-cabal";
+       version = "0.0.0.1";
+       sha256 = "17v22v9sb8z2jbr76vv577hxcvypfkpmji2k8yzwd2kxjssxpjrn";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       description = "Cabal file wrapper library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-cmd" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -211860,8 +213594,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-templates";
-       version = "0.8.0.1";
-       sha256 = "13na1f29fvc0j452kh0a3fjig3fq4qbklcpdv6bm1fr0cf8hzq98";
+       version = "0.9.0.0";
+       sha256 = "09s81syr45dvrqski4gz96ynmv8gb3zwyy4n6a7frv49z843phda";
        libraryHaskellDepends = [
          aeson attoparsec base scientific text unordered-containers vector
        ];
@@ -212862,7 +214596,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_8_1_1" = callPackage
+  "skylighting_0_8_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
@@ -212871,8 +214605,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.8.1.1";
-       sha256 = "0q1zkb053szbgx3lqpmllxas0krb9m425qi0aplffhdqwmd05w8w";
+       version = "0.8.2";
+       sha256 = "0a81hd4f0xlc8as5lh454gkbyxndaxyj7lblkfk92j173nyx69cz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212918,7 +214652,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "skylighting-core_0_8_1_1" = callPackage
+  "skylighting-core_0_8_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -212928,8 +214662,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.8.1.1";
-       sha256 = "1klk9jlnyz5ciz2gm1dx5mh85nkvz6y1xsflvyf45c2gw9grc2km";
+       version = "0.8.2";
+       sha256 = "1nd11170r7xwv0hy21bx9nz7173ijbqkh7r8504ixjkwckgr2zs0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213375,19 +215109,22 @@ self: {
      }) {};
 
   "small-bytearray-builder" = callPackage
-    ({ mkDerivation, base, byteslice, primitive, primitive-offset
-     , QuickCheck, run-st, tasty, tasty-quickcheck, vector
+    ({ mkDerivation, base, byteslice, bytestring, gauge, primitive
+     , primitive-offset, QuickCheck, run-st, tasty, tasty-quickcheck
+     , vector
      }:
      mkDerivation {
        pname = "small-bytearray-builder";
-       version = "0.1.0.0";
-       sha256 = "1dsjvgl15wbja1fzm1sawqavvijkmaqidfaqk9qgp42kifhh0hzh";
+       version = "0.1.1.0";
+       sha256 = "1i3b77mczfy9f0gp5ckqln1vdhnqflz8lajfiygx5spxf9kraf9d";
        libraryHaskellDepends = [
          base byteslice primitive primitive-offset run-st vector
        ];
        testHaskellDepends = [
-         base byteslice primitive QuickCheck tasty tasty-quickcheck vector
+         base byteslice bytestring primitive QuickCheck tasty
+         tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Serialize to a small byte arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214686,6 +216423,8 @@ self: {
        pname = "snaplet-customauth";
        version = "0.1.2";
        sha256 = "0y1a8c9j1q1pzby5v4ajnafm6dr9fvxvvkiynvscyjsf73gp2myb";
+       revision = "1";
+       editedCabalFile = "1dh8vmrnndg06l5yr3fbmxlzf164nvcy923mafc624bxcr6iip9f";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary binary-orphans bytestring
          configurator containers errors heist hoauth2 http-client
@@ -215946,8 +217685,10 @@ self: {
      }:
      mkDerivation {
        pname = "sockets";
-       version = "0.4.0.0";
-       sha256 = "0xv8341kvy6br88lj4g17hqci9sn8qbm063iv69gmfbyp5x7fs9d";
+       version = "0.5.0.0";
+       sha256 = "0pxrdxmiqyp5xs24sp22b4rldhzm1rahkdq5lc24m30g4p609xa3";
+       revision = "1";
+       editedCabalFile = "1ji60m0wj3jwdfwdjaxzic41rwdnq72m9xspn64f66c872lx137d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -215956,7 +217697,7 @@ self: {
        ];
        testHaskellDepends = [
          async base byteslice bytestring ip primitive primitive-addr
-         primitive-unlifted tasty tasty-hunit
+         primitive-unlifted stm tasty tasty-hunit
        ];
        benchmarkHaskellDepends = [
          base byteslice bytestring entropy ip primitive
@@ -216277,6 +218018,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sortee" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, QuickCheck }:
+     mkDerivation {
+       pname = "sortee";
+       version = "0.1.0.1";
+       sha256 = "0lnjxryiqnkmsdqjam37ld1xqk50l3qh6lmmpsw5fnw48c8hlyzs";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck ];
+       description = "Generate string for sort key";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "sorting" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -216845,8 +218598,8 @@ self: {
        pname = "spatial-rotations";
        version = "0.1.0.1";
        sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii";
-       revision = "2";
-       editedCabalFile = "174y0jgf9bxqsc895f984q0gwn981sxdxmnwd3c25jp03iidc6c4";
+       revision = "3";
+       editedCabalFile = "03kjhr51w600cnm1jgdc9nbm9ay66fxq93z7r6xgph1a4dmcjvg4";
        libraryHaskellDepends = [
          base linear manifolds-core vector-space
        ];
@@ -216998,8 +218751,8 @@ self: {
      }:
      mkDerivation {
        pname = "spectral-clustering";
-       version = "0.3.0.2";
-       sha256 = "1jxjqdyjj8ajv7qb3qldaqh2mr00fg51yp4fiqi5d3bd4b4isga8";
+       version = "0.3.1.0";
+       sha256 = "140njrq73nalkm7dp9vyk3hz027jj0ppgjqdr3qcz93a9lkzdsyh";
        libraryHaskellDepends = [
          base clustering containers eigen hmatrix hmatrix-svdlibc mwc-random
          safe sparse-linear-algebra statistics vector
@@ -217482,6 +219235,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "splitmix_0_0_3" = callPackage
+    ({ mkDerivation, async, base, base-compat-batteries, bytestring
+     , clock, containers, criterion, deepseq, HUnit, process, random
+     , tf-random, time, vector
+     }:
+     mkDerivation {
+       pname = "splitmix";
+       version = "0.0.3";
+       sha256 = "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w";
+       libraryHaskellDepends = [ base deepseq random time ];
+       testHaskellDepends = [
+         async base base-compat-batteries bytestring deepseq HUnit process
+         random tf-random vector
+       ];
+       benchmarkHaskellDepends = [
+         base clock containers criterion random tf-random
+       ];
+       description = "Fast Splittable PRNG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "splitter" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, range }:
      mkDerivation {
@@ -218499,7 +220274,7 @@ self: {
      , http-client, http-client-tls, http-conduit, http-download
      , http-types, memory, microlens, mintty, mono-traversable, mtl
      , mustache, neat-interpolation, network-uri, open-browser
-     , optparse-applicative, pantry-tmp, path, path-io, persistent
+     , optparse-applicative, pantry, path, path-io, persistent
      , persistent-sqlite, persistent-template, pretty, primitive
      , process, project-template, QuickCheck, raw-strings-qq
      , regex-applicative-text, resource-pool, resourcet, retry, rio
@@ -218512,10 +220287,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "2.1.1.1";
-       sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2";
-       revision = "2";
-       editedCabalFile = "0c2vqmw6rvq4jspmc1h1d33bdzmm63svrax1q5r9g70lvjfi7ax8";
+       version = "2.1.3.1";
+       sha256 = "1q2nagnc24fvyj3hwnpgyp3rqhxswhscyw4pw2dazqx34ad3d0zr";
        configureFlags = [
          "-fdisable-git-info" "-fhide-dependency-versions"
          "-fsupported-build"
@@ -218532,7 +220305,7 @@ self: {
          http-client http-client-tls http-conduit http-download http-types
          memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         pantry-tmp path path-io persistent persistent-sqlite
+         pantry path path-io persistent persistent-sqlite
          persistent-template pretty primitive process project-template
          regex-applicative-text resource-pool resourcet retry rio
          rio-prettyprint semigroups split stm streaming-commons tar
@@ -218550,7 +220323,7 @@ self: {
          http-client http-client-tls http-conduit http-download http-types
          memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         pantry-tmp path path-io persistent persistent-sqlite
+         pantry path path-io persistent persistent-sqlite
          persistent-template pretty primitive process project-template
          regex-applicative-text resource-pool resourcet retry rio
          rio-prettyprint semigroups split stm streaming-commons tar
@@ -218568,7 +220341,7 @@ self: {
          hspec http-client http-client-tls http-conduit http-download
          http-types memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         pantry-tmp path path-io persistent persistent-sqlite
+         pantry path path-io persistent persistent-sqlite
          persistent-template pretty primitive process project-template
          QuickCheck raw-strings-qq regex-applicative-text resource-pool
          resourcet retry rio rio-prettyprint semigroups smallcheck split stm
@@ -218828,8 +220601,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack2cabal";
-       version = "1.0.2";
-       sha256 = "0zdyjf55zda465ai6bjp13a4f4khgz59smmaa2nlbbrjknlb1kbl";
+       version = "1.0.3";
+       sha256 = "1bmghzb866p3225ai3w4xxy3s2qic3vr4srcx7xb113qjvmadran";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -219136,8 +220909,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-to-hackage";
-       version = "1.1.0";
-       sha256 = "165g5vyxck8hh2523v4h0cwjl3yvp4wwzlsdrs9wvg9ca3ij0v85";
+       version = "1.1.1";
+       sha256 = "10zd3wqla54mfnwv65gklvmglhcpzhanqfka0l0ilnbkqlgx4acm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -220004,6 +221777,41 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "stc-lang" = callPackage
+    ({ mkDerivation, abstract-par, aeson, base, BoundedChan, bytestring
+     , clock, deepseq, ghc-prim, hashable, hashtables, hedis, HUnit
+     , hw-kafka-client, microlens, microlens-aeson, monad-par
+     , monad-par-extras, mtl, random, test-framework
+     , test-framework-hunit, text, time, transformers, uuid-types
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "stc-lang";
+       version = "1.0.0";
+       sha256 = "1x11q696f3598g3ph3shiia0xwxqjaydp27inmfqz01p891xhj5w";
+       revision = "1";
+       editedCabalFile = "1fjkr2k0j2463vifmaqm6d8pk3r66wrmf74g8lypgf9p4vbsv53m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         abstract-par base BoundedChan bytestring deepseq microlens
+         monad-par monad-par-extras mtl transformers
+       ];
+       executableHaskellDepends = [
+         aeson base BoundedChan bytestring clock deepseq hashable hashtables
+         hedis hw-kafka-client microlens microlens-aeson mtl random text
+         transformers uuid-types vector yaml
+       ];
+       testHaskellDepends = [
+         base deepseq ghc-prim HUnit microlens mtl test-framework
+         test-framework-hunit time transformers
+       ];
+       description = "A library for implicit, monadic dataflow parallelism";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "std" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -221075,41 +222883,56 @@ self: {
      }) {};
 
   "stratux" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, QuickCheck
-     , stratux-http, stratux-types, stratux-websockets, template-haskell
+    ({ mkDerivation, base, stratux-http, stratux-types
+     , stratux-websockets
      }:
      mkDerivation {
        pname = "stratux";
-       version = "0.0.9";
-       sha256 = "17jy7svf74k3r87p8xlp0hi9z95f5npmnn28jlwx4rb68dn63aly";
+       version = "0.0.10";
+       sha256 = "0km05c7i6yxlxy4fa39rrll1xmf5yzb6vk1b8s8rmh19520dzb07";
        libraryHaskellDepends = [
          base stratux-http stratux-types stratux-websockets
        ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
-       ];
        description = "A library for stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
+  "stratux-demo" = callPackage
+    ({ mkDerivation, base, lens, network-uri, optparse-applicative
+     , stratux, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "stratux-demo";
+       version = "0.0.12";
+       sha256 = "0rarr1z6rk6idjyxzb0053p90rpixqwc767bslcm6dvj9rxbgsvp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base lens network-uri optparse-applicative stratux text time
+         transformers
+       ];
+       executableHaskellDepends = [
+         base lens network-uri optparse-applicative stratux text time
+         transformers
+       ];
+       description = "A demonstration of the stratux library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "stratux-http" = callPackage
-    ({ mkDerivation, aeson, base, directory, doctest, either, filepath
-     , HTTP, network-uri, QuickCheck, stratux-types, template-haskell
-     , utf8-string
+    ({ mkDerivation, aeson, base, HTTP, network-uri, stratux-types
+     , transformers, utf8-string
      }:
      mkDerivation {
        pname = "stratux-http";
-       version = "0.0.9";
-       sha256 = "121pansnd8pdhv9ki2qdav93cwldmnxnykjldhbkb2bkyr0skdyb";
-       revision = "1";
-       editedCabalFile = "0paq3zs9c39dcjxxyz975q4nccmgdxxay839wa60gka75hix34gs";
+       version = "0.0.11";
+       sha256 = "056fz3fs1giwlh9yfj462p0bg98gzikbqvkkwcyrmyqpxjsala15";
        libraryHaskellDepends = [
-         aeson base either HTTP network-uri stratux-types utf8-string
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
+         aeson base HTTP network-uri stratux-types transformers utf8-string
        ];
        description = "A library for using HTTP with stratux";
        license = stdenv.lib.licenses.bsd3;
@@ -221118,20 +222941,16 @@ self: {
      }) {};
 
   "stratux-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , filepath, lens, QuickCheck, scientific, template-haskell, text
+    ({ mkDerivation, aeson, base, bytestring, lens, scientific, text
      , time
      }:
      mkDerivation {
        pname = "stratux-types";
-       version = "0.0.9";
-       sha256 = "06d4qagcmzch25zkxpnvw04h5aav5wbdrfyi6xvzvndj12hvayza";
+       version = "0.0.11";
+       sha256 = "0ps9y9rfjk5xzikkl4rsv203rfqc1yqa8alp5hx37lqgcnymw4hy";
        libraryHaskellDepends = [
          aeson base bytestring lens scientific text time
        ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
-       ];
        description = "A library for reading JSON output from stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221139,23 +222958,17 @@ self: {
      }) {};
 
   "stratux-websockets" = callPackage
-    ({ mkDerivation, aeson, base, directory, doctest, either, filepath
-     , network, QuickCheck, stratux-types, template-haskell, text
+    ({ mkDerivation, aeson, base, either, network, stratux-types, text
      , transformers, websockets
      }:
      mkDerivation {
        pname = "stratux-websockets";
-       version = "0.0.9";
-       sha256 = "0076n4i250frv71w9sysw935g5aq0py8shwaqrhjrv4jp6mb2k3q";
-       revision = "1";
-       editedCabalFile = "0863p5spgs68q6ddp3v9azm7x01wky1480yp3rrjxpkgay1ha4db";
+       version = "0.0.11";
+       sha256 = "0602y8h37zplp1g0fmdim1f8pmdz713jydc4qsh6ii3x58i8klj5";
        libraryHaskellDepends = [
          aeson base either network stratux-types text transformers
          websockets
        ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
-       ];
        description = "A library for using websockets with stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223375,8 +225188,8 @@ self: {
        pname = "summoner";
        version = "1.3.0.1";
        sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s";
-       revision = "3";
-       editedCabalFile = "0galzkk5y41akmy12vfk8zh5pm9pyv4a5034qpfcxm7ix0s2ivms";
+       revision = "4";
+       editedCabalFile = "1vjk95n2wqybigy8p55gs7qkiv5v1lwf8qmri1f9bk29599sh74k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224553,8 +226366,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic";
-       version = "6.3.3.20190614";
-       sha256 = "1l0a82r1fx6ai5csjaqiha8gngb1pay1cmj947619xy36iwng3pc";
+       version = "6.3.4.20190712";
+       sha256 = "0khx7ddr9cdwyqz22xai8vmjn37c3w9gf4mlzil8lqvdf2cwk6wk";
        libraryHaskellDepends = [
          base containers mono-traversable symantic-document symantic-grammar
          text transformers
@@ -224566,15 +226379,16 @@ self: {
      }) {};
 
   "symantic-cli" = callPackage
-    ({ mkDerivation, base, containers, megaparsec, symantic-document
-     , text, transformers
+    ({ mkDerivation, base, bytestring, containers, megaparsec
+     , symantic-document, text, transformers
      }:
      mkDerivation {
        pname = "symantic-cli";
-       version = "2.2.4.20190701";
-       sha256 = "0qkfjhva0mrmirc4md82r5f738i6af4whlyqnxmksqz0jwa9r5nv";
+       version = "2.4.0.20190719";
+       sha256 = "0ca3c309wxby99sy3xa96i04q2r7wxcgk4amy8z86xaz1r78a60d";
        libraryHaskellDepends = [
-         base containers megaparsec symantic-document text transformers
+         base bytestring containers megaparsec symantic-document text
+         transformers
        ];
        description = "Symantics for parsing and documenting a CLI";
        license = stdenv.lib.licenses.gpl3;
@@ -224588,8 +226402,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic-document";
-       version = "1.2.3.20190628";
-       sha256 = "0ahbhksiyinfsbgb2xhikckly8m5g2lfads5cjk7mbi27zn9y2v8";
+       version = "1.5.0.20190711";
+       sha256 = "01vza9k4ic6xwgj4jqihcfm5a5q8n6svi1988v851pi40dg8m03s";
        libraryHaskellDepends = [ ansi-terminal base text transformers ];
        testHaskellDepends = [
          base containers tasty tasty-hunit text transformers
@@ -224766,6 +226580,31 @@ self: {
        broken = true;
      }) {};
 
+  "symantic-xml" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , deepseq, filepath, hashable, hxt-charproperties, megaparsec, safe
+     , tasty, tasty-golden, text, transformers, treeseq
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "symantic-xml";
+       version = "1.0.0.20190223";
+       sha256 = "0mqx0ysp9c4zzljjgl0w68k5r8qgv2h35cfq0mqvijcjq5dgiflp";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class filepath hashable
+         hxt-charproperties megaparsec safe text transformers treeseq
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default-class deepseq filepath
+         hashable megaparsec tasty tasty-golden text transformers treeseq
+       ];
+       description = "Library for reading, validating and writing a subset of the XML format";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "symbol" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -224779,6 +226618,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "symbolic-link" = callPackage
+    ({ mkDerivation, base, directory, unix, yaml }:
+     mkDerivation {
+       pname = "symbolic-link";
+       version = "0.1.0.2";
+       sha256 = "02v0ry474xkpacbav6s3781xiczkhbx5rzks9ad5pj2y16z59pr7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory unix ];
+       executableHaskellDepends = [ base directory unix yaml ];
+       description = "Symlink tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -226516,6 +228369,8 @@ self: {
        pname = "tai";
        version = "0";
        sha256 = "1kp7m9mhawi2fbdsir4kg9z6hbmlw4kmp3kjvlk4qkhvckgl3pxw";
+       revision = "1";
+       editedCabalFile = "0m95bx120pjigxncbdb28y3cv4d6x05vgpjgny86vk0lkslk130y";
        libraryHaskellDepends = [
          base clock lens mtl parsers time trifecta wreq
        ];
@@ -226926,6 +228781,8 @@ self: {
        pname = "tart";
        version = "0.1.2";
        sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k";
+       revision = "1";
+       editedCabalFile = "04xkrc0xfbx2kk6f8b41zf611s4k848ahczbbs85pd9lqqpkbhzj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -227575,6 +229432,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-silver_3_1_13" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
+     , tasty-hunit, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.13";
+       sha256 = "1sd9xgjcvlnw338dn5rcy5la7gw15yvg4xl85ym7aav5fr97apfs";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         semigroups stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       description = "A fancy test runner, including support for golden tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-smallcheck" = callPackage
     ({ mkDerivation, async, base, smallcheck, tagged, tasty }:
      mkDerivation {
@@ -227648,6 +229529,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-tmux" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, regex-posix, tasty
+     , tasty-hunit, text, typed-process
+     }:
+     mkDerivation {
+       pname = "tasty-tmux";
+       version = "0.1.0.0";
+       sha256 = "1k7xc2fvfjrv48hml1jlhjrdrnb9sjaar7xrbwbj1275s09b51h8";
+       libraryHaskellDepends = [
+         base bytestring mtl regex-posix tasty tasty-hunit text
+         typed-process
+       ];
+       description = "Terminal user acceptance testing (UAT) via tmux";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "tasty-travis" = callPackage
     ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
@@ -229128,6 +231025,8 @@ self: {
        ];
        description = "Terminal emulator configurable in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;};
 
   "termplot" = callPackage
@@ -230055,8 +231954,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-cp437";
-       version = "0.2.1";
-       sha256 = "1fzsb341yr1jiv9wflr35ra1z1cd41wmyp0y5dv2p0fq10kxcfgs";
+       version = "0.2.2";
+       sha256 = "1lv1nhkrwdrs3ji7x2qv1r33dipgchr1fl2znmmkhxksbhlwi0x9";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring QuickCheck quickcheck-text text
@@ -230558,6 +232457,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-short_0_1_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim
+     , hashable, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "text-short";
+       version = "0.1.3";
+       sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq ghc-prim hashable text
+       ];
+       testHaskellDepends = [
+         base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         text
+       ];
+       description = "Memory-efficient representation of Unicode text strings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers
@@ -231514,6 +233434,22 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "th-test-utils" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "th-test-utils";
+       version = "1.0.0";
+       sha256 = "1kpkf6h0vr06z7iphkcjva9x28mfjg967hrih4im527g9vw5mdq6";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [
+         base tasty tasty-hunit template-haskell transformers
+       ];
+       description = "Utility functions for testing Template Haskell code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-to-exp" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
@@ -231758,14 +233694,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "these_1" = callPackage
+  "these_1_0_1" = callPackage
     ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq
      , hashable, QuickCheck, semigroupoids, unordered-containers
      }:
      mkDerivation {
        pname = "these";
-       version = "1";
-       sha256 = "01pnibkkzbsdiry4w018img92ja2sqwjigpw53q12mfnabvsgvxn";
+       version = "1.0.1";
+       sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r";
        libraryHaskellDepends = [
          aeson assoc base base-compat binary deepseq hashable QuickCheck
          semigroupoids unordered-containers
@@ -232437,6 +234373,27 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "tidal_1_3_0" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, clock, colour
+     , containers, criterion, deepseq, hosc, microspec, mwc-random
+     , network, parsec, text, transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "tidal";
+       version = "1.3.0";
+       sha256 = "0zd9z0nc600b1zw0c1bpl5b3ik1dcspv5kd72p3if70g81x56d8l";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring clock colour containers deepseq hosc
+         mwc-random network parsec text transformers vector
+       ];
+       testHaskellDepends = [ base containers microspec parsec ];
+       benchmarkHaskellDepends = [ base criterion weigh ];
+       description = "Pattern language for improvised music";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tidal-midi" = callPackage
     ({ mkDerivation, base, containers, PortMidi, tidal, time
      , transformers
@@ -232472,13 +234429,22 @@ self: {
      }) {};
 
   "tidal-vis" = callPackage
-    ({ mkDerivation, base, cairo, colour, tidal }:
+    ({ mkDerivation, async, base, cairo, colour, containers, gloss
+     , hashable, hosc, mtl, network, SDL, SDL-gfx, SDL-image, SDL-ttf
+     , tidal, time, unagi-chan
+     }:
      mkDerivation {
        pname = "tidal-vis";
-       version = "0.9.3";
-       sha256 = "1sj17czyzpfrq0a8kalr170dw1zcphix0dnhdf6ggryskb1wswdp";
-       libraryHaskellDepends = [ base cairo colour tidal ];
-       description = "Visual rendering for Tidal patterns";
+       version = "1.0.14";
+       sha256 = "1l924nqv8ljd9ljpy05r18j0rc5if3k5lvpifv2g8fn967gi0nfs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base cairo colour containers gloss hashable hosc mtl network
+         SDL SDL-gfx SDL-image SDL-ttf tidal time unagi-chan
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Visual rendering for Tidal patterns and osc messages";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -233852,7 +235818,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tls_1_5_0" = callPackage
+  "tls_1_5_1" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
      , cereal, cryptonite, data-default-class, gauge, hourglass, memory
      , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
@@ -233860,8 +235826,8 @@ self: {
      }:
      mkDerivation {
        pname = "tls";
-       version = "1.5.0";
-       sha256 = "04hdk8mdn8l928prj1h37xkn4ny44bnkrbbknxyqjba51y5y30bc";
+       version = "1.5.1";
+       sha256 = "1fs5q494ip8hi2jdp34wy93hmdd42lwkh1hi0jg3ngdnilpg33yi";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring cereal cryptonite
          data-default-class hourglass memory mtl network transformers x509
@@ -233899,15 +235865,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tls-debug_0_4_6" = callPackage
+  "tls-debug_0_4_7" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, pem, tls, tls-session-manager, x509, x509-store
      , x509-system, x509-validation
      }:
      mkDerivation {
        pname = "tls-debug";
-       version = "0.4.6";
-       sha256 = "0xfjwyiazjdyba6x9bps93ibah9p22ww24wlmr6iksfsdhs79l7n";
+       version = "0.4.7";
+       sha256 = "1p3ihky5vznjv66f1mbpj33ahkg8g0xgfknldzmgllwsmh533dji";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -233955,6 +235921,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls-session-manager_0_0_3" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tmapchan" = callPackage
     ({ mkDerivation, base, containers, hashable, stm
      , unordered-containers
@@ -234455,9 +236437,9 @@ self: {
        broken = true;
      }) {};
 
-  "tomland_1_1_0_0" = callPackage
+  "tomland_1_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , gauge, hashable, hedgehog, hspec-megaparsec, htoml
+     , directory, gauge, hashable, hedgehog, hspec-megaparsec, htoml
      , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec
      , parser-combinators, tasty, tasty-discover, tasty-hedgehog
      , tasty-hspec, tasty-silver, text, time, toml-parser, transformers
@@ -234465,8 +236447,10 @@ self: {
      }:
      mkDerivation {
        pname = "tomland";
-       version = "1.1.0.0";
-       sha256 = "0ip3pp76jf6di18r10ksxw35a2594k7h1iygm0b4k77m4fx4bqzn";
+       version = "1.1.0.1";
+       sha256 = "0ihz8pvcnr33mydz4n7gsayikh50pn1bg3km2h3nlv054lff7kai";
+       revision = "1";
+       editedCabalFile = "16382q0q77bv9zlahmgbmc90hvl1b23g9fxk4dl2f1lhlfqjkxnw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234476,9 +236460,9 @@ self: {
        executableHaskellDepends = [ base text time unordered-containers ];
        executableToolDepends = [ markdown-unlit ];
        testHaskellDepends = [
-         base bytestring containers hashable hedgehog hspec-megaparsec
-         megaparsec tasty tasty-hedgehog tasty-hspec tasty-silver text time
-         unordered-containers
+         base bytestring containers directory hashable hedgehog
+         hspec-megaparsec megaparsec tasty tasty-hedgehog tasty-hspec
+         tasty-silver text time unordered-containers
        ];
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
@@ -234649,17 +236633,17 @@ self: {
      , diversity, fgl, filepath, find-clumpiness, foldl, graphviz
      , hierarchical-clustering, hierarchical-spectral-clustering
      , hmatrix, inline-r, lens, managed, matrix-market-attoparsec
-     , mltool, modularity, mtl, optparse-generic, palette, parallel
-     , plots, safe, scientific, sparse-linear-algebra
-     , spectral-clustering, split, statistics, streaming
-     , streaming-bytestring, streaming-cassava, streaming-utils
-     , streaming-with, SVGFonts, temporary, terminal-progress-bar, text
-     , text-show, transformers, vector, vector-algorithms, zlib
+     , modularity, mtl, optparse-generic, palette, parallel, plots, safe
+     , scientific, sparse-linear-algebra, spectral-clustering, split
+     , statistics, streaming, streaming-bytestring, streaming-cassava
+     , streaming-utils, streaming-with, SVGFonts, temporary
+     , terminal-progress-bar, text, text-show, transformers, vector
+     , vector-algorithms, zlib
      }:
      mkDerivation {
        pname = "too-many-cells";
-       version = "0.1.8.0";
-       sha256 = "0xf9q5x4ch4v1yr41fs155rvymdhslphj6d4dsjhf12ahq8rs5rl";
+       version = "0.1.12.2";
+       sha256 = "01jbz5a51myy4293637c9v2ac87cp60l4rax2gkdiqw8vj8231j4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234667,9 +236651,9 @@ self: {
          diagrams diagrams-cairo diagrams-graphviz diagrams-lib differential
          directory diversity fgl filepath find-clumpiness foldl graphviz
          hierarchical-clustering hierarchical-spectral-clustering hmatrix
-         inline-r lens managed matrix-market-attoparsec mltool modularity
-         mtl palette parallel plots safe scientific sparse-linear-algebra
-         split statistics streaming streaming-bytestring streaming-cassava
+         inline-r lens managed matrix-market-attoparsec modularity mtl
+         palette parallel plots safe scientific sparse-linear-algebra split
+         statistics streaming streaming-bytestring streaming-cassava
          streaming-with SVGFonts temporary text text-show vector
          vector-algorithms zlib
        ];
@@ -234677,9 +236661,10 @@ self: {
          aeson base birch-beer bytestring cassava colour containers
          diagrams-cairo diagrams-lib directory fgl filepath find-clumpiness
          graphviz hierarchical-spectral-clustering inline-r lens
-         matrix-market-attoparsec mtl optparse-generic palette plots
-         spectral-clustering streaming streaming-bytestring streaming-utils
-         terminal-progress-bar text text-show transformers vector
+         matrix-market-attoparsec modularity mtl optparse-generic palette
+         plots spectral-clustering streaming streaming-bytestring
+         streaming-utils terminal-progress-bar text text-show transformers
+         vector
        ];
        description = "Cluster single cells and analyze cell clade relationships";
        license = stdenv.lib.licenses.gpl3;
@@ -234689,15 +236674,15 @@ self: {
 
   "toodles" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
-     , bytestring, cmdargs, directory, extra, hspec, hspec-expectations
-     , megaparsec, MissingH, process, regex-posix, RSA, servant
-     , servant-blaze, servant-server, strict, text, time, wai, warp
-     , yaml
+     , bytestring, cmdargs, directory, extra, filepath, hspec
+     , hspec-expectations, megaparsec, MissingH, process, regex-posix
+     , RSA, servant, servant-blaze, servant-server, strict, text, time
+     , wai, warp, yaml
      }:
      mkDerivation {
        pname = "toodles";
-       version = "1.2.1";
-       sha256 = "19z8xx8pw66m9q9xq0qldpzhmjwfsln4hn8smmz2pjk2x713883c";
+       version = "1.2.3";
+       sha256 = "0b6sznzkcjhs5fw920ivmvh6n6walamy16602bxid7sjrlgdjzcf";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -234708,8 +236693,9 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring cmdargs
-         directory extra megaparsec MissingH process regex-posix RSA servant
-         servant-blaze servant-server strict text time wai warp yaml
+         directory extra filepath megaparsec MissingH process regex-posix
+         RSA servant servant-blaze servant-server strict text time wai warp
+         yaml
        ];
        testHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring cmdargs
@@ -235110,8 +237096,8 @@ self: {
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "2.1.1";
-       sha256 = "0hk592dki8hp15a84pnqnjdwql2zczfask71gxf833i0vrph38yb";
+       version = "2.2.0";
+       sha256 = "1hrnfvp49rny9rznnhlhvgw4ffmn9nbbdiknsbwxgjfh1ixir1vf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -235252,6 +237238,8 @@ self: {
        ];
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -235292,8 +237280,8 @@ self: {
      }:
      mkDerivation {
        pname = "traction";
-       version = "0.1.0";
-       sha256 = "1vf6hrzxr28yp6rijdxcq83c60hzkyvjkc2caiifmfi5ay2hzlzq";
+       version = "0.2.0";
+       sha256 = "1rbbp2sw5i1x499bhi1d0f37m34rf6j9p2ndlqsijallmdiawcgq";
        libraryHaskellDepends = [
          base bytestring containers exceptions mmorph postgresql-simple
          resource-pool syb template-haskell text time transformers
@@ -235663,6 +237651,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-except" = callPackage
+    ({ mkDerivation, base, exceptions, text, transformers }:
+     mkDerivation {
+       pname = "transformers-except";
+       version = "0.1.1";
+       sha256 = "1i89k4bml223f7m3pin73vrz51xb2j7q7rr39x9v587hmm40mvkm";
+       libraryHaskellDepends = [ base exceptions text transformers ];
+       description = "An Except monad transformer with";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "transformers-fix" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -235857,8 +237856,8 @@ self: {
      }:
      mkDerivation {
        pname = "trasa";
-       version = "0.4";
-       sha256 = "059zbm4bfzcv0qlvr55l49xs5izycb2hdjbyqvri5f3vrnwnic1q";
+       version = "0.4.1";
+       sha256 = "0nnr72h6ylx52ni6l7r0nnv02d540agzfhyjfjrxywbx7xz70q5c";
        libraryHaskellDepends = [
          base binary bytestring hashable http-media http-types
          quantification text unordered-containers
@@ -235884,6 +237883,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "trasa-extra" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, cookie, http-types, mtl, path-pieces, quantification
+     , text, trasa, trasa-server
+     }:
+     mkDerivation {
+       pname = "trasa-extra";
+       version = "0.1.0.0";
+       sha256 = "0ka5w55zzx7cy17pwdwcjf20yl0lmpg6bqv874k0ia7hihl6sx6c";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers cookie http-types
+         mtl path-pieces quantification text trasa trasa-server
+       ];
+       description = "Extra functions for trasa";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "trasa-form" = callPackage
+    ({ mkDerivation, base, bytestring, cookie, ditto, ditto-lucid
+     , http-api-data, http-types, lucid, mtl, quantification, text
+     , trasa, trasa-server, unordered-containers
+     }:
+     mkDerivation {
+       pname = "trasa-form";
+       version = "0.3.2.0";
+       sha256 = "0q59wkg7k66iq8n6b73226z23sgy8pfvylac9qvlaiib6dllq1g8";
+       libraryHaskellDepends = [
+         base bytestring cookie ditto ditto-lucid http-api-data http-types
+         lucid mtl quantification text trasa trasa-server
+         unordered-containers
+       ];
+       description = "generate forms using lucid, ditto and trasa";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "trasa-reflex" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghcjs-dom
      , http-media, http-types, jsaddle, reflex, reflex-dom, text, trasa
@@ -235907,8 +237943,8 @@ self: {
      }:
      mkDerivation {
        pname = "trasa-server";
-       version = "0.4";
-       sha256 = "1xh85kh9ilsq8zy19if4s93zmjqxbpgqpvhkh9jpk8klia7zc0pv";
+       version = "0.5.4";
+       sha256 = "1z3cq2zfygxf1v7ifga23mf7zn750925cvghmb3i54a9r0wafmb2";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-media http-types
          mtl text trasa wai
@@ -235931,6 +237967,8 @@ self: {
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traverse-with-class" = callPackage
@@ -236651,8 +238689,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "trivial-constraint";
-       version = "0.5.1.0";
-       sha256 = "0wk925w1qswr5ma6427p0p1gl96hr1pfdqkn08r3ccpbibz6q1sy";
+       version = "0.6.0.0";
+       sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5";
        libraryHaskellDepends = [ base ];
        description = "Constraints that any type, resp. no type fulfills";
        license = stdenv.lib.licenses.gpl3;
@@ -238340,6 +240378,18 @@ self: {
        broken = true;
      }) {};
 
+  "type-errors-pretty" = callPackage
+    ({ mkDerivation, base, doctest, Glob }:
+     mkDerivation {
+       pname = "type-errors-pretty";
+       version = "0.0.0.0";
+       sha256 = "0yj8c91maanihyl9506ihpxv3zyfvprr359dvd2b9ym3py50kncs";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest Glob ];
+       description = "Combinators for writing pretty type errors easily";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "type-fun" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -239281,8 +241331,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.4.1";
-       sha256 = "1nm74fj819kws9rrksk80gyrl3m5dxsm17bm2a18mp8dca76iix2";
+       version = "0.7.5.1";
+       sha256 = "0n2cnd15gwixk17jqcz4hxishikscwbcn2gnrkcz3a295ng68ins";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -239563,8 +241613,8 @@ self: {
        pname = "ucam-webauth";
        version = "0.1.0.0";
        sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k";
-       revision = "5";
-       editedCabalFile = "1hii6sjyc3dps800ffwkjq6fq82idlpkdv68k1y9ivv477plw24a";
+       revision = "6";
+       editedCabalFile = "1dammzdhin226byx8p287kdnn9pc7s49hfxcdmflly6hsy1psnvy";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers cryptonite errors
          http-api-data http-types microlens microlens-mtl mtl
@@ -239960,40 +242010,23 @@ self: {
      }) {};
 
   "unbeliever" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, chronologique
-     , containers, deepseq, directory, exceptions, fingertree, gauge
-     , hashable, hourglass, hspec, mtl, prettyprinter
-     , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm
-     , template-haskell, terminal-size, text, text-short, transformers
-     , unix, unordered-containers, vector
+    ({ mkDerivation, base, bytestring, core-data, core-program
+     , core-text, fingertree, gauge, hspec, safe-exceptions, text
+     , text-short
      }:
      mkDerivation {
        pname = "unbeliever";
-       version = "0.9.3.2";
-       sha256 = "1gsjmr9h7w08576smi978k5djhvjk4ry0ljgr6zxx7nj7cy1m84b";
-       revision = "1";
-       editedCabalFile = "0mlbjb79ylk2jb7mp6da1xfl2r28zfijwv5dd2l73l9mgi5h0s72";
-       libraryHaskellDepends = [
-         aeson async base bytestring chronologique containers deepseq
-         directory exceptions fingertree hashable hourglass mtl
-         prettyprinter prettyprinter-ansi-terminal safe-exceptions
-         scientific stm template-haskell terminal-size text text-short
-         transformers unix unordered-containers vector
-       ];
+       version = "0.10.0.1";
+       sha256 = "0fmv76xmi4ansrksa07vidqvxiqgdmvvampkqngi1ma7g3k2n29x";
+       libraryHaskellDepends = [ base core-data core-program core-text ];
        testHaskellDepends = [
-         aeson async base bytestring chronologique containers deepseq
-         directory exceptions fingertree hashable hourglass hspec mtl
-         prettyprinter prettyprinter-ansi-terminal safe-exceptions
-         scientific stm template-haskell terminal-size text text-short
-         transformers unix unordered-containers vector
+         base bytestring core-data core-program core-text fingertree hspec
+         safe-exceptions text text-short
        ];
        benchmarkHaskellDepends = [
-         aeson async base bytestring chronologique containers deepseq
-         directory exceptions fingertree gauge hashable hourglass mtl
-         prettyprinter prettyprinter-ansi-terminal safe-exceptions
-         scientific stm template-haskell terminal-size text text-short
-         transformers unix unordered-containers vector
+         base bytestring core-data core-program core-text gauge text
        ];
+       doHaddock = false;
        description = "Opinionated Haskell Interoperability";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -240579,8 +242612,8 @@ self: {
        pname = "union";
        version = "0.1.2";
        sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3";
-       revision = "2";
-       editedCabalFile = "170dhg4z4jzi50nh4xx75r9k8zz5br7j2iqjjw2r1dx29ajqbcw9";
+       revision = "3";
+       editedCabalFile = "160jc4ykqvkzw79sb9j95mw7hsnknpfhkbbd75xmkpx08vnv4d76";
        libraryHaskellDepends = [
          base deepseq hashable profunctors tagged vinyl
        ];
@@ -241389,6 +243422,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_12" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
+     , transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.12";
+       sha256 = "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg";
+       libraryHaskellDepends = [
+         async base bytestring deepseq directory filepath process stm time
+         transformers unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base bytestring containers deepseq directory filepath hspec
+         process QuickCheck stm time transformers unix unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring deepseq directory filepath gauge process stm
+         time transformers unix unliftio-core
+       ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -241879,6 +243938,8 @@ self: {
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "up-grade" = callPackage
@@ -242352,6 +244413,8 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urn" = callPackage
@@ -242405,6 +244468,17 @@ self: {
        broken = true;
      }) {};
 
+  "usa-holidays" = callPackage
+    ({ mkDerivation, base, doctest, doctest-discover, hspec, time }:
+     mkDerivation {
+       pname = "usa-holidays";
+       version = "0.1.0.1";
+       sha256 = "04biw4l5rpfcflrmcn45hlirq26bpzs27745jhyr32gl6mpnqb12";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base doctest doctest-discover hspec time ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "usb" = callPackage
     ({ mkDerivation, base, bindings-libusb, bytestring, containers
      , ghc-prim, text, vector
@@ -243855,6 +245929,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vault_0_3_1_3" = callPackage
+    ({ mkDerivation, base, containers, hashable, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "vault";
+       version = "0.3.1.3";
+       sha256 = "0vdm472vn734xa27jjm2mjacl37mxiqaaahvm4hzqjgyh4cqq377";
+       libraryHaskellDepends = [
+         base containers hashable semigroups unordered-containers
+       ];
+       description = "a persistent store for values of arbitrary types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vault-tool" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, text, unordered-containers
@@ -244925,6 +247015,8 @@ self: {
        ];
        description = "types for ingesting vflow data with aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vfr-waypoints" = callPackage
@@ -246313,6 +248405,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_27" = 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.27";
+       sha256 = "1p8x61xjbwjif10iibc3b2gxh3dd3rymrfvinrdn0h9wn7qsyh2x";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -246510,8 +248632,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-http2-extra";
-       version = "0.1.1";
-       sha256 = "00fr1rg92vfkn6cb7cgdwmj7lavmyj8m9y0xxj05ws4b93r5f2z5";
+       version = "0.1.2";
+       sha256 = "1f4ddgrprdnbpdbb6jj8n2ib206dlj5mgf8ar6r1ls2p90vpn6yr";
        libraryHaskellDepends = [
          auto-update base bytestring containers http-types wai warp word8
        ];
@@ -247865,8 +249987,8 @@ self: {
        pname = "warc";
        version = "1.0.4";
        sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b";
-       revision = "1";
-       editedCabalFile = "1mdd3r1lg92rchy1zv4jwvrsn6x3wnplhbnwavpx0nivf3xp7m8q";
+       revision = "2";
+       editedCabalFile = "0vlh1wivzs2ikmp3jbx4m0zxyvkjy1rn6xhbgaz1n5vi37hid74n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -248538,6 +250660,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes-generics" = callPackage
+    ({ mkDerivation, base, parsec, text, web-routes }:
+     mkDerivation {
+       pname = "web-routes-generics";
+       version = "0.1.0.1";
+       sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy";
+       libraryHaskellDepends = [ base parsec text web-routes ];
+       description = "portable, type-safe URL routing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "web-routes-happstack" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, text
      , web-routes
@@ -250064,18 +252197,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "winery_1_1_1" = callPackage
+  "winery_1_1_2" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal
      , containers, cpu, deepseq, directory, fast-builder, gauge
      , hashable, HUnit, megaparsec, mtl, prettyprinter
      , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
-     , scientific, semigroups, serialise, text, time, transformers
-     , unordered-containers, vector
+     , scientific, semigroups, serialise, store, text, time
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "1.1.1";
-       sha256 = "0jyr5vwz55rjwqvvh2ys3aq426i6jhfrykz0mx4kidr9l9yd0yls";
+       version = "1.1.2";
+       sha256 = "1hxs3pyv0icqmnmnjadr86d55jdi689hgcjgx3lq7skxs3hp0qf1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -250095,7 +252228,7 @@ self: {
        ];
        benchmarkHaskellDepends = [
          aeson base binary bytestring cereal deepseq directory gauge
-         serialise text
+         serialise store text
        ];
        description = "A compact, well-typed seralisation format for Haskell values";
        license = stdenv.lib.licenses.bsd3;
@@ -250475,7 +252608,7 @@ self: {
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) wlc;};
+     }) {wlc = null;};
 
   "wobsurv" = callPackage
     ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring
@@ -251031,14 +253164,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "world-peace_1_0_0_0" = callPackage
+  "world-peace_1_0_1_0" = callPackage
     ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors
      , should-not-typecheck, tagged, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "world-peace";
-       version = "1.0.0.0";
-       sha256 = "1fx8f7dfrslqwmkbcyff5q7iafa5znc73f77il7y87hz23q9yzmx";
+       version = "1.0.1.0";
+       sha256 = "1fx7y9h1yyjc5xn1mpbkwas6p6h06rivzndb545z1qnnp583vzwp";
        libraryHaskellDepends = [ aeson base deepseq profunctors tagged ];
        testHaskellDepends = [
          base doctest Glob should-not-typecheck tasty tasty-hunit text
@@ -251507,6 +253640,8 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ws-chans" = callPackage
@@ -254461,7 +256596,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yam_0_6_3" = callPackage
+  "yam_0_7" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring
      , data-default, exceptions, fast-logger, hspec, http-client
      , http-types, lens, menshen, monad-logger, mtl, mwc-random
@@ -254472,8 +256607,8 @@ self: {
      }:
      mkDerivation {
        pname = "yam";
-       version = "0.6.3";
-       sha256 = "1mw4yylh8cmrm22cqpdkd64idklkwig8c4rbvrmpw5j5s0hdmdly";
+       version = "0.7";
+       sha256 = "1b1igh82zhdbql4kfjxxh1rg1776x2yv2755hnvps5p06c2wap7z";
        libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring data-default
          exceptions fast-logger http-client http-types lens menshen
@@ -254549,15 +256684,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yam-datasource_0_6_3" = callPackage
+  "yam-datasource_0_7" = callPackage
     ({ mkDerivation, base, conduit, data-default, monad-logger
      , persistent, resource-pool, resourcet, salak, servant-server, text
      , unliftio-core, yam
      }:
      mkDerivation {
        pname = "yam-datasource";
-       version = "0.6.3";
-       sha256 = "0zcwd32iz01b3m3xg1n3axvrljbkcld196pblc7cn0kb2n0w6ilp";
+       version = "0.7";
+       sha256 = "0dkricvyypyggbmqp3mqryz7sw1z1z92ixnvz48lc8xqahvj0fsv";
        libraryHaskellDepends = [
          base conduit data-default monad-logger persistent resource-pool
          resourcet salak servant-server text unliftio-core yam
@@ -254600,8 +256735,8 @@ self: {
      }:
      mkDerivation {
        pname = "yam-redis";
-       version = "0.6.3";
-       sha256 = "0xvv9azq8ihyxgz11089xkvxmisp6ajggldayj8bdg045m74lv9r";
+       version = "0.7";
+       sha256 = "0cw4prkmi2csmi1kw3k0lvvzhnl71f4fplsv3f2jxgcgviim89pw";
        libraryHaskellDepends = [
          base bytestring data-default hedis menshen monad-logger mtl salak
          servant-server text yam
@@ -255288,6 +257423,8 @@ self: {
        libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
        description = "Hedgehog testing support for the Yaya recursion scheme library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaya-unsafe" = callPackage
@@ -256488,6 +258625,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_6_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, text, time, transformers, wai
+     , xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.6.6";
+       sha256 = "16m7m7yixsnka926znjy0xn0kp30mbvjq2f46rh987kdr28dks9p";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare text time
+         transformers wai xss-sanitize yesod-core yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text
      , yesod-core, yesod-form

From 844d26ddbd74bf3532e3f3824bc18581d4415ffe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 Jul 2019 08:35:42 +0200
Subject: [PATCH 132/562] haskell-skylighting: fix overrides for the new
 version

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5cddf2f3672..226306b8355 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1253,8 +1253,8 @@ self: super: {
   cmark-gfm = self.cmark-gfm_0_2_0;
   pandoc = dontCheck (doDistribute super.pandoc_2_7_3);  # test suite failure: https://github.com/jgm/pandoc/issues/5582
   pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2;
-  skylighting = self.skylighting_0_8_1_1;
-  skylighting-core = self.skylighting-core_0_8_1_1;
+  skylighting = self.skylighting_0_8_2;
+  skylighting-core = self.skylighting-core_0_8_2;
 
   # Current versions of tasty-hedgehog need hedgehog 1.x, which
   # we don't have in LTS-13.x.

From bde87d5cbeacf0faa386cdfc91ddeb4b0365f5ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Jul 2019 13:30:53 +0200
Subject: [PATCH 133/562] stack: update rio override to the latest version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 226306b8355..9b7e99cf212 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1130,7 +1130,7 @@ self: super: {
     hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser);  # Avoid depending on newer hspec versions.
     http-download = dontCheck (unmarkBroken super.http-download);
     pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp);
-    rio = self.rio_0_1_10_0;
+    rio = self.rio_0_1_11_0;
     rio-prettyprint = unmarkBroken super.rio-prettyprint;
   }));
 

From d9efb3584283d099c9f9b24314ebcb60742fd8be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 12:59:08 +0200
Subject: [PATCH 134/562] haskell-ip: update override for the latest version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9b7e99cf212..559ca9dec70 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1313,7 +1313,7 @@ self: super: {
   constraints-deriving = dontCheck super.constraints-deriving;
 
   # The old LTS-13.x version does not compile.
-  ip = self.ip_1_5_0;
+  ip = self.ip_1_5_1;
 
   # Needs deque >= 0.3, but latest version on stackage is 2.7
   butcher = super.butcher.override { deque = self.deque_0_4_2_3; };

From 04abf153ef02c6535779e0e333f731393627dce7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 13:00:22 +0200
Subject: [PATCH 135/562] haskell-hsdev: update override for the latest version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 559ca9dec70..5cd0ad2cd7b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1111,7 +1111,7 @@ self: super: {
     '';
   });
 
-  hsdev_0_3_3_1 = super.hsdev_0_3_3_1.overrideScope (self: super: {
+  hsdev_0_3_3_2 = super.hsdev_0_3_3_2.overrideScope (self: super: {
     haskell-names = self.haskell-names_0_9_6;
     network = self.network_3_0_1_1;
   });

From 41ff1335e9e867596b21447af947d18c49442e00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 13:01:38 +0200
Subject: [PATCH 136/562] haskell-dhall-to-cabal: update override for the
 latest version

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-nix.nix    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5cd0ad2cd7b..752d7ccc3d3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1299,8 +1299,8 @@ self: super: {
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
   # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; };
-  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; };
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; };
+  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; };
 
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 9d40b8d98a2..23cbf15e51b 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -584,6 +584,6 @@ self: super: builtins.intersectAttrs super {
   snap-server = dontCheck super.snap-server;
 
   # Tests require internet
-  dhall_1_24_0 = dontCheck super.dhall_1_24_0;
+  dhall_1_25_0 = dontCheck super.dhall_1_25_0;
 
 }

From 92ad54a274bef91396778da142329bf713699364 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 11:46:53 +0000
Subject: [PATCH 137/562] haskell-stack: fix build by updating unliftio, which
 rio requires

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 752d7ccc3d3..6d447af96dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1132,6 +1132,7 @@ self: super: {
     pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp);
     rio = self.rio_0_1_11_0;
     rio-prettyprint = unmarkBroken super.rio-prettyprint;
+    unliftio = self.unliftio_0_2_12;
   }));
 
   # musl fixes

From 5c89397875f98cb8c669286ad6a8034badfc1e11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 11:56:39 +0000
Subject: [PATCH 138/562] stack: update overrides to use pantry rather than
 pantry-tmp

---
 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 6d447af96dc..122cfb313bf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1129,7 +1129,7 @@ self: super: {
     concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
     hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser);  # Avoid depending on newer hspec versions.
     http-download = dontCheck (unmarkBroken super.http-download);
-    pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp);
+    pantry = dontCheck (unmarkBroken super.pantry);
     rio = self.rio_0_1_11_0;
     rio-prettyprint = unmarkBroken super.rio-prettyprint;
     unliftio = self.unliftio_0_2_12;

From 9a40de7cc5d48526bb24b208ef07d7347625d51f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 15:00:09 +0000
Subject: [PATCH 139/562] git-annex: update sha256 hash for version 7.20190730

---
 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 122cfb313bf..524dba0e4c4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -72,7 +72,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap";
+      sha256 = "1pz12l0awshdq5xyac5awjd902sy9l65z6ihya4pzapik4gqfdcd";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From e78d952b5b6441d69d6aeeab279cb8a6a72aa20c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 Aug 2019 17:37:33 +0200
Subject: [PATCH 140/562] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-2-ge532a45 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bd2ec34f885123ac8346bc650365565bc197ca05.
---
 .../haskell-modules/hackage-packages.nix       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 84a35340d60..04209b9e16f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -93217,7 +93217,7 @@ self: {
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
@@ -93230,13 +93230,13 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk_pixbuf;};
+     }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkpixbuf_2_0_22" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
@@ -93251,11 +93251,11 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gdk_pixbuf;};
+     }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkx11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -184510,7 +184510,7 @@ self: {
 
   "poppler" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gdk_pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
+     , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
      , poppler
      }:
      mkDerivation {
@@ -184522,13 +184522,13 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
+       libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; 
+     }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage

From 0fd978baf77e15c4eb9ba7a54111c340b0730b8f Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Mon, 10 Jun 2019 08:43:49 -0700
Subject: [PATCH 141/562] vulkan-validation-layers: 1.1.101.0 -> 1.1.106.0

---
 .../tools/vulkan-validation-layers/default.nix       |  8 ++++----
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 5acf5ed0d23..3c189d09f1c 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -3,17 +3,17 @@
 , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 stdenv.mkDerivation rec {
   name = "vulkan-validation-layers-${version}";
-  version = "1.1.101.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
+  version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json!
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "00gz72m393i3m3rh5hv9d0znzlz39cpw35ifchzb4cr11bi4mzyz";
+    sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
+  nativeBuildInputs = [ pkgconfig cmake python3  ];
+  buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05f7dba952b..98004a6ce8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13768,24 +13768,24 @@ in
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Tools";
-          rev = "5994ae2a045015004cce24802dc47c33736486ea";
-          sha256 = "1w1zkql03aggma31nz4xb1b5waxxf2jcg99slzvmihg9ngmmlbm6";
+          rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
+          sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
         };
       });
       spirv-headers = spirv-tools.overrideAttrs (_: {
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Headers";
-          rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f";
-          sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj";
+          rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
+          sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
         };
       });
     }).overrideAttrs (_: {
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "glslang";
-        rev = "5432f0dd8f331f15182681664d7486681e8514e6";
-        sha256 = "0spdm93qkx83z8bks61am2g3ary7fkibvhqq706nj4z9wx4k0cbm";
+        rev = "e06c7e9a515b716c731bda13f507546f107775d1";
+        sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq";
       };
     });
   };

From 0423b5d7620912f8ea4fa91b10ca202a73c0a3fb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Aug 2019 11:25:22 -0500
Subject: [PATCH 142/562] tflint: 0.9.2 -> 0.9.3 (#65848)

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

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index b372481cec7..caa4d718f89 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yk5hygrjkbq5ry2kark3hd59hwjxpgryz0ychr8mhzvlr97aj1k";
+    sha256 = "10saljrman41pjmjhbzan8jw8jbz069yhcf6vvzxmw763x5s3n85";
   };
 
-  modSha256 = "096hq0xc3cq45r13pm0s0q9rxd4z0ia6x0wy4xmwgzfb97jvn20p";
+  modSha256 = "0zfgyv1m7iay3brkqmh35gw1giyr3i3ja56dh4kgm6ai4z1jmvgc";
 
   subPackages = [ "." ];
 

From c089c155df985dfe3212cb1665d092fdeb7c9dc9 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 27 Jul 2019 18:04:23 +0300
Subject: [PATCH 143/562] smartgithg: 18.2.4 -> 18.2.9 Refactored packages:   *
 adds makeDesktopItem and remove install_freedesktop_items   * replaced
 buildCommand with preFixup & installPhase   * replaces makeWrapper with
 wrapGAppsHook

---
 .../version-management/smartgithg/default.nix | 114 +++++++++++-------
 .../smartgithg/install_freedesktop_items.sh   |  11 --
 2 files changed, 70 insertions(+), 55 deletions(-)
 delete mode 100755 pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 38c3da220c9..5c9b5a83c18 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -1,64 +1,90 @@
-{ stdenv, fetchurl, lib, makeWrapper
-, substituteAll
+{ stdenv
+, fetchurl
+, makeDesktopItem
 , jre
-, gtk2, glib
+, gtk3
+, glib
+, gnome3
+, wrapGAppsHook
+, hicolor-icon-theme
 , libXtst
 , which
 }:
 
 stdenv.mkDerivation rec {
-  name = "smartgithg-${version}";
-  version = "18.2.4";
+  pname = "smartgithg";
+  version = "18.2.9";
 
   src = fetchurl {
     url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
-    sha256 = "0ch6vcvndn1fpx05ym9yp2ssfw2af6ac0pw8ssvjkc676zc0jr73";
+    sha256 = "0d08awb2s3w1w8n8048abw2x4wnqhfx96sls9kdsnxj0xrszgz67";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ wrapGAppsHook ];
 
-  buildInputs = [ jre ];
+  buildInputs = [ jre gnome3.adwaita-icon-theme hicolor-icon-theme gtk3 ];
 
-  buildCommand = let
-    pkg_path = "$out/${name}";
-    bin_path = "$out/bin";
-    install_freedesktop_items = substituteAll {
-      inherit (stdenv) shell;
-      isExecutable = true;
-      src = ./install_freedesktop_items.sh;
-    };
-    runtime_paths = lib.makeBinPath [
-      jre
-      #git mercurial subversion # the paths are requested in configuration
-      which
-    ];
-    runtime_lib_paths = lib.makeLibraryPath [
-      gtk2 glib
-      libXtst
-    ];
-  in ''
-    tar xvzf $src
-    mkdir -pv $out
-    mkdir -pv ${pkg_path}
-    # unpacking should have produced a dir named 'smartgit'
-    cp -a smartgit/* ${pkg_path}
-    # prevent using packaged jre
-    rm -r ${pkg_path}/jre
-    mkdir -pv ${bin_path}
-    jre=${jre.home}
-    makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \
-      --prefix PATH : ${runtime_paths} \
-      --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \
+  preFixup = with stdenv.lib; ''
+    gappsWrapperArgs+=( \
+      --prefix PATH : ${makeBinPath [ jre which ]} \
+      --prefix LD_LIBRARY_PATH : ${makeLibraryPath [
+        gtk3
+        glib
+        libXtst
+      ]} \
       --prefix JRE_HOME : ${jre} \
       --prefix JAVA_HOME : ${jre} \
-      --prefix SMARTGITHG_JAVA_HOME : ${jre}
-    sed -i '/ --login/d' ${pkg_path}/bin/smartgit.sh
-    patchShebangs $out
-    cp ${bin_path}/smartgit ${bin_path}/smartgithg
-
-    ${install_freedesktop_items} "${pkg_path}/bin" "$out"
+      --prefix SMARTGITHG_JAVA_HOME : ${jre} \
+    ) \
   '';
 
+  installPhase = ''
+    runHook preInstall
+
+    sed -i '/ --login/d' bin/smartgit.sh
+    mkdir -pv $out/{bin,share/applications,share/icons/hicolor/scalable/apps/}
+    cp -av ./{dictionaries,lib} $out/
+    cp -av bin/smartgit.sh $out/bin/smartgit
+    ln -sfv $out/bin/smartgit $out/bin/smartgithg
+
+    cp -av $desktopItem/share/applications/* $out/share/applications/
+    for icon_size in 32 48 64 128 256; do
+        path=$icon_size'x'$icon_size
+        icon=bin/smartgit-$icon_size.png
+        mkdir -p $out/share/icons/hicolor/$path/apps
+        cp $icon $out/share/icons/hicolor/$path/apps/smartgit.png
+    done
+
+    cp -av bin/smartgit.svg $out/share/icons/hicolor/scalable/apps/
+
+    runHook postInstall
+  '';
+
+  desktopItem = with stdenv.lib; makeDesktopItem rec {
+    name = "smartgit";
+    exec = "smartgit";
+    comment = meta.description;
+    icon = "smartgit";
+    desktopName = "SmartGit";
+    categories = concatStringsSep ";" [
+      "Application"
+      "Development"
+      "RevisionControl"
+    ];
+    mimeType = concatStringsSep ";" [
+      "x-scheme-handler/git"
+      "x-scheme-handler/smartgit"
+      "x-scheme-handler/sourcetree"
+    ];
+    startupNotify = "true";
+    extraEntries = ''
+      Keywords=git
+      StartupWMClass=${name}
+      Version=1.0
+      Encoding=UTF-8
+    '';
+  };
+
   meta = with stdenv.lib; {
     description = "GUI for Git, Mercurial, Subversion";
     homepage = http://www.syntevo.com/smartgit/;
diff --git a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
deleted file mode 100755
index 2ff14dcf099..00000000000
--- a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@shell@
-
-inBinDir=$1
-out=$2
-
-cat $inBinDir/add-menuitem.sh | \
-sed -re 's#xdg-icon-resource[ ]+install[ ]+--size[ ]+([0-9]+)[ ]+("[^"]+")[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/icons/hicolor/\1x\1/apps \&\& cp \2 '${out}'/share/icons/hicolor/\1x\1/apps/\3\.png #' | \
-sed -re 's#xdg-desktop-menu[ ]+install[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/applications \&\& cp \1 '${out}'/share/applications/#' | \
-sed -re 's#Exec="[^"]+"#Exec=smartgit#' |
-sed -re 's#SMARTGIT_BIN=.*#'SMARTGIT_BIN=${inBinDir}'#' \
-| bash

From 3eda38b87ff74f218605511d0d7a7bcbe49e60de Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 3 Aug 2019 11:06:34 -0700
Subject: [PATCH 144/562] libgpiod: unstable-2018-10-07 -> 1.4

---
 pkgs/development/libraries/libgpiod/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index c498ef3460a..5eac024f831 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
+{ stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
 
 stdenv.mkDerivation rec {
-  name = "libgpiod-unstable-${version}";
-  version = "2018-10-07";
+  pname = "libgpiod";
+  version = "1.4";
 
-  src = fetchgit {
-    url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git";
-    rev = "4bf402d3a49336eacd33654441d575bd267780b8";
-    sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d";
+  src = fetchurl {
+    url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
+    sha256 = "17qc2qbrnmaimxx9i3l30831hy890hp9s5a48iapni1dlr1z27p2";
   };
 
   buildInputs = [ kmod ];
@@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-tools=${if enable-tools then "yes" else "no"}"
     "--enable-bindings-cxx"
-    "--prefix=$(out)"
+    "--prefix=${placeholder ''out''}"
   ];
 
   meta = with stdenv.lib; {

From 133411863e7e2b3d5db45c3697c85e98164d817f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 3 Aug 2019 12:13:26 -0700
Subject: [PATCH 145/562] pythonPackages.boltons: 2019-01-07 -> 19.1.0

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

diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix
index 655af7c66f2..b5aa9e6cf03 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 = "2019-01-07";
+  version = "19.1.0";
 
   # No tests in PyPi Tarball
   src = fetchFromGitHub {
     owner = "mahmoud";
     repo = "boltons";
-    rev = "3584ac9399f227a2a11b74153140ee171fd49783";
-    sha256 = "13xngjw249sk4vmr5kqqnia0npw0kpa0gm020a4dqid0cjyvj0rv";
+    rev = version;
+    sha256 = "0b55wly0ksviyl3a4dmih9vzd7bj3p10gr6la4722cs9cx4128q5";
   };
 
   checkInputs = [ pytest ];

From b7ecab3d179f53fe80da2af20d7ec6bf032a59a8 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 3 Aug 2019 15:57:40 -0400
Subject: [PATCH 146/562] python3Packages.cairocffi: correct gdk-pixbuf
 substitution

---
 .../development/python-modules/cairocffi/dlopen-paths-0.9.patch | 2 +-
 pkgs/development/python-modules/cairocffi/dlopen-paths.patch    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
index a1018e6eb33..307cb428c07 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
@@ -19,7 +19,7 @@ index 718aa7f..1a1dcff 100644
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+    'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
++    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
 
 -def dlopen(ffi, *names):
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index 9fd2832b323..10e2294981d 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -19,7 +19,7 @@ index 6061973..3538a58 100644
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+    'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
++    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
 
 -def dlopen(ffi, *names):

From 375d7ad859e20ad23833bd7969ff4fb105892c6a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 3 Aug 2019 16:49:16 -0400
Subject: [PATCH 147/562] typora: 0.9.72 -> 0.9.73

---
 pkgs/applications/editors/typora/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 157204ce1ca..7273b7252ca 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
+{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "typora";
-  version = "0.9.72";
+  version = "0.9.73";
 
   src = fetchurl {
     url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-    sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs";
+    sha256 = "1fgcb4bx5pw8ah5j30d38gw7qi1cmqarfhvgdns9f2n0d57bvvw3";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    makeWrapper ${electron_3}/bin/electron $out/bin/typora \
+    makeWrapper ${electron_5}/bin/electron $out/bin/typora \
       --add-flags $out/share/typora \
       "''${gappsWrapperArgs[@]}" \
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     homepage = https://typora.io;
     license = licenses.unfree;
     maintainers = with maintainers; [ jensbin worldofpeace ];
-    inherit (electron_3.meta) platforms;
+    platforms = [ "x86_64-linux"];
   };
 }

From 1f0253997cd54b2a399584878204316c87e211ea Mon Sep 17 00:00:00 2001
From: Thibaut Marty <github@thibautmarty.fr>
Date: Thu, 1 Aug 2019 18:56:06 +0200
Subject: [PATCH 148/562] urh: add support for Pluto, soundcards, and
 optionally USRP

---
 pkgs/applications/radio/urh/default.nix       | 13 ++++++++-----
 pkgs/development/libraries/libiio/default.nix | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 48c20ecca47..a1b92e7e4e1 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchFromGitHub, python3Packages
-, hackrf, rtl-sdr, airspy, limesuite }:
+{ stdenv, lib, fetchFromGitHub, python3Packages
+, hackrf, rtl-sdr, airspy, limesuite, libiio
+, USRPSupport ? false, uhd }:
 
 python3Packages.buildPythonApplication rec {
   pname = "urh";
@@ -12,14 +13,16 @@ python3Packages.buildPythonApplication rec {
     sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35";
   };
 
-  buildInputs = [ hackrf rtl-sdr airspy limesuite ];
+  buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ]
+    ++ lib.optional USRPSupport uhd;
+
   propagatedBuildInputs = with python3Packages; [
-    pyqt5 numpy psutil cython pyzmq
+    pyqt5 numpy psutil cython pyzmq pyaudio
   ];
 
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/jopohl/urh";
     description = "Universal Radio Hacker: investigate wireless protocols like a boss";
     license = licenses.gpl3;
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index ee8029966dc..df5035461af 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub
 , cmake, flex, bison
 , libxml2, python
+, libusb1, runtimeShell
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +18,17 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" "python" ];
 
   nativeBuildInputs = [ cmake flex bison ];
-  buildInputs = [ libxml2 ];
+  buildInputs = [ libxml2 libusb1 ];
+
+  postPatch = ''
+    substituteInPlace libiio.rules.cmakein \
+      --replace /bin/sh ${runtimeShell}
+  '';
+
+  # since we can't expand $out in cmakeFlags
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DUDEV_RULES_INSTALL_DIR=$out/etc/udev/rules.d"
+  '';
 
   postInstall = ''
     mkdir -p $python/lib/${python.libPrefix}/site-packages/

From 19195a7925b4f9c71cc7168639911aa841ea36f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 14:28:45 -0700
Subject: [PATCH 149/562] aws-google-auth: 0.0.29 -> 0.0.32

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

diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix
index 5d4ba0bfbc8..0fc001d5a19 100644
--- a/pkgs/tools/admin/aws-google-auth/default.nix
+++ b/pkgs/tools/admin/aws-google-auth/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonApplication rec {
   pname = "aws-google-auth";
-  version = "0.0.29";
+  version = "0.0.32";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   # https://github.com/cevoaustralia/aws-google-auth/issues/120
@@ -27,7 +27,7 @@ buildPythonApplication rec {
     owner = "cevoaustralia";
     repo = "aws-google-auth";
     rev = version;
-    sha256 = "06dalrwjy1sbc5wvj5ip4h999izlb0j5g6b6f3l5znnsm0vfvfia";
+    sha256 = "0blsvdkb28g1s3c7f8brjjai7lq9ij76xqr5z6zlxxafc4qqwhh3";
   };
 
   propagatedBuildInputs = [ 

From dc55912d73076bfb2a287ca90919f2d7d903597f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 14:35:28 -0700
Subject: [PATCH 150/562] bind: 9.14.3 -> 9.14.4

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4c4a45cca79..74d0d1341d6 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -8,14 +8,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.14.3"; in
+let version = "9.14.4"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "1ymxr38c62w6961j8g2vllnv0s72z7zk4b2j2k8ixdh1rymqm1yf";
+    sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From c1e4dd89153b40d94b8782ab57536c4614e059c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 14:46:30 -0700
Subject: [PATCH 151/562] birdfont: 2.26.0 -> 2.27.0

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

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 56e7650673e..092c83114e7 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "birdfont";
-  version = "2.26.0";
+  version = "2.27.0";
 
   src = fetchurl {
     url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "0lcbwmwfb18dpr5kpnrl2zx59jhvj7k7vzjld51zv0zhcvl9fg3j";
+    sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q";
   };
 
   nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ];

From 5cae05ecf8ca4979b299e41a11195e9d4df5748f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Aug 2019 16:20:00 -0500
Subject: [PATCH 152/562] pythonPackages.grpcio: 1.18.0 -> 1.22.0

---
 .../python-modules/grpcio/default.nix          | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 9d8814e6531..5c85dd34357 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -1,32 +1,30 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin
-, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig
+{ stdenv, buildPythonPackage, fetchFromGitHub, darwin
+, six, protobuf, enum34, futures, isPy27, pkgconfig
 , cython}:
 
-with stdenv.lib;
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.18.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m";
+    sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz";
   };
 
   nativeBuildInputs = [ cython pkgconfig ]
-                    ++ optional stdenv.isDarwin darwin.cctools;
+                    ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
 
   propagatedBuildInputs = [ six protobuf ]
-                        ++ lib.optionals (isPy27 || isPy34) [ enum34 ]
-                        ++ lib.optionals (isPy27) [ futures ];
+                        ++ stdenv.lib.optionals (isPy27) [ enum34 futures ];
 
-  preBuild = optionalString stdenv.isDarwin "unset AR";
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR";
 
   meta = with stdenv.lib; {
     description = "HTTP/2-based RPC framework";
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
     maintainers = with maintainers; [ vanschelven ];
   };

From 368d8bb02e953cc6845a50c71ee6ce4c9432b840 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Aug 2019 16:21:00 -0500
Subject: [PATCH 153/562] pythonPackages.grpcio-tools: 1.18.0 -> 1.22.0

---
 .../python-modules/grpcio-tools/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index f16a5800bb4..9355db763dc 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, buildPythonPackage, fetchPypi, lib, grpcio}:
+{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }:
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.18.0";
+  version = "1.22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa";
+    sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab";
   };
 
   enableParallelBuilding = true;
 
-  propagatedBuildInputs = [ grpcio ];
+  propagatedBuildInputs = [ protobuf grpcio ];
 
   # no tests in the package
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Protobuf code generator for gRPC";
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
     maintainers = with maintainers; [ vanschelven ];
   };

From 2982050af19e99cb4ce574399b0a193bb86cbfcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 15:29:04 -0700
Subject: [PATCH 154/562] armadillo: 9.600.4 -> 9.600.5

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

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 6619235ab82..f2b038aa379 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "9.600.4";
+  version = "9.600.5";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "1gph9acmk8wqs6n00csvbs94rh153y7ml0w2zlbk9ia8xbgbdbbx";
+    sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x";
   };
 
   nativeBuildInputs = [ cmake ];

From 6e993e3fbc2d3a51cb1658de588d02d3c8c70a4e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 15:42:09 -0700
Subject: [PATCH 155/562] babeld: 1.8.4 -> 1.8.5

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

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 7dfc8e9d7ad..ce372f6b752 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.8.4";
+  name = "babeld-1.8.5";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "11wbs1x17lr7jk2578zwy3cdwc6zhxwv97nnp13z14613320s1wq";
+    sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90";
   };
 
   preBuild = ''

From 2170380abbda75d5f57ba2b686672483d9c3188f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 15:48:34 -0700
Subject: [PATCH 156/562] binaryen: 86 -> 88

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

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 77f051156d1..1b53a142d12 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
 
 let
-  defaultVersion = "86";
+  defaultVersion = "88";
 
   # Map from git revs to SHA256 hashes
   sha256s = {
-    "version_86" = "12h5018rdwg7vjni0mz91vkpdwyqw0nfacig3vg9dvyn4fnfm76z";
+    "version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi";
     "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
   };
 in

From 1f2189861c9f766a69c3ae8206d060d1468854b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 15:51:13 -0700
Subject: [PATCH 157/562] batctl: 2019.2 -> 2019.3

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

diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 58c6a7167e3..537010dea53 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2019.2";
+  ver = "2019.3";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "18qfz209pyksklcnrgvw6hm30iw7dng0rxi2njqxhk3xzw464rgv";
+    sha256 = "0307a01n72kg7vcm60mi8jna6bydiin2cr3ylrixra1596hkzn9b";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d8c7ac87140f7045aead3f871c0f30b1f273cc5c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 15:53:50 -0700
Subject: [PATCH 158/562] bear: 2.4.0 -> 2.4.1

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

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index 5999525def0..ea8ee1f8496 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bear-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = "Bear";
     rev = version;
-    sha256 = "0r5mhacn8v4b2kjni91nxh3b6g86cbkrnlk4f6sj4mdrvx25dp39";
+    sha256 = "0fqhhavyz9ddjc3wgb2ng47bfgk1q4w5bwah74nsa02k8r22pbch";
   };
 
   nativeBuildInputs = [ cmake ];

From d10e05108bfbde35b9e0217a8d43b05e106468fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 16:00:22 -0700
Subject: [PATCH 159/562] checkstyle: 8.22 -> 8.23

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index a1dfd91c29f..95f5a418a61 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.22";
+  version = "8.23";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "0lnpzh4c5m8xkdx8dxywp33i3zrnwj1nhgpqnqgx31aw3x0drw40";
+    sha256 = "0k161c687q33rlm4r8h3f0ks5p2w8pj6kh258zdzk8kjfigfxkmx";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bd9c8e48be85f63aff2c35c94794f3b55e5bbb21 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 16:21:43 -0700
Subject: [PATCH 160/562] claws-mail: 3.17.3 -> 3.17.4

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

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 42f29574eef..bb4c6c54f16 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -31,11 +31,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
-  version = "3.17.3";
+  version = "3.17.4";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "1wnj6c9cbmhphs2l6wfvndkk2g08rmxw0sl2c8k1k008dxd1ykjh";
+    sha256 = "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr";
   };
 
   outputs = [ "out" "dev" ];

From 7ac8906e82a2ef6da5ed7d6895aae39460ed755f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 16:49:22 -0700
Subject: [PATCH 161/562] confluent-platform: 5.2.1 -> 5.3.0

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

diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix
index 34950228920..b29f6eba12e 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@@ -5,11 +5,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "confluent-platform-${version}";
-  version = "5.2.1";
+  version = "5.3.0";
 
   src = fetchurl {
     url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz";
-    sha256 = "11fdcc557aca782e87352ed6e655c37c71fb7b3a003796ee956970b01dedbbb1";
+    sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp";
   };
 
   buildInputs = [ jre makeWrapper bash ];

From e19185e298b6edd4ecb3674d9fb10ccc9ec238b2 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 4 Aug 2019 01:08:50 +0100
Subject: [PATCH 162/562] mdbook: 0.1.8 -> 0.3.1

Last update was over a year ago and the project has progressed a lot
in between. This moves the derivation to the latest tagged version.
---
 pkgs/tools/text/mdbook/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 52d197759ea..68e418a9e8f 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "mdbook-${version}";
-  version = "0.1.8";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "mdBook";
     rev = "v${version}";
-    sha256 = "1xmw4v19ff6mvimwk5l437wslzw5npy60zdb8r4319bjf32pw9pn";
+    sha256 = "0py69267jbs6b7zw191hcs011cm1v58jz8mglqx3ajkffdfl3ghw";
   };
 
-  cargoSha256 = "1xpsc4qff2lrq15mz1gvmw6n5vl88sfwpjbsnp5ja5k1im156lam";
+  cargoSha256 = "0qwhc42a86jpvjcaysmfcw8kmwa150lmz01flmlg74g6qnimff5m";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 

From 28298df9f52df14098e60f15297819063422990f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 20:25:06 -0700
Subject: [PATCH 163/562] crispyDoom: 5.5.2 -> 5.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/crispy-doom/versions
---
 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 5178474ef9e..3897f29c657 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -1,10 +1,10 @@
 { stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "crispy-doom-5.5.2";
+  name = "crispy-doom-5.6";
   src = fetchurl {
     url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz";
-    sha256 = "1pdk7p3r1xskdfcp86jf1n2cny78fyk36z4gbx19h57csc4d5c3a";
+    sha256 = "1icz3ivd7v3mvwlslwwd7s3bpjzr54x4lslihyjg1ckq23sl830j";
   };
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ SDL2 SDL2_mixer SDL2_net ];

From 5fe6fe90787fba696ba4fbe874e56f989b77b9d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 20:45:40 -0700
Subject: [PATCH 164/562] cimg: 2.6.6 -> 2.6.7

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

diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 89dd2b44338..bab0a84ca79 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "cimg-${version}";
-  version = "2.6.6";
+  version = "2.6.7";
 
   src = fetchurl {
     url = "http://cimg.eu/files/CImg_${version}.zip";
-    sha256 = "06a6qgs7q79asfbfp615h5iin23y7g8y1achnmsp3rpkikssskzv";
+    sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m";
   };
 
   nativeBuildInputs = [ unzip ];

From e955860a080fcbfc6038cd1c890add3dc0038689 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 21:26:49 -0700
Subject: [PATCH 165/562] cfr: 0.145 -> 0.146

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

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index aa47ed1186c..1f0d8f28609 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
-  version = "0.145";
+  version = "0.146";
 
   src = fetchurl {
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
-    sha256 = "0xv2v9z9xwym5m7h6bkvcmdgsa9lmkvsl77vk3aykgbzxywh7xqv";
+    sha256 = "16pmn3shhb00x3ba2zazbkprwvc34a6dds8ghc53winbf371xi3c";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c5ec1b12af27647f2d6adc6f311eb6e81e02f092 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 22:26:24 -0700
Subject: [PATCH 166/562] epiphany: 3.32.3 -> 3.32.4

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

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 776da94242f..7b7b7f64aa4 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.32.3";
+  version = "3.32.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0gx386k1p78ppjhvdanv99hfiwana0ccn9d499qrp0rvlicnijrw";
+    sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69";
   };
 
   # Tests need an X display

From ea9bff4c0c82a61374fdc3aca81e00b8456b7398 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 22:38:20 -0700
Subject: [PATCH 167/562] eagle: 9.4.1 -> 9.4.2

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

diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 90b7db4b545..ba1b9e174be 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -13,11 +13,11 @@ let
   in
   stdenv.mkDerivation rec {
     name = "eagle-${version}";
-    version = "9.4.1";
+    version = "9.4.2";
 
     src = fetchurl {
       url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
-      sha256 = "0p3kxryvk853rx24phcadvmqn6f37rnnql8sf6cqn9cqhrrkbvlq";
+      sha256 = "0lrwrvqcb91mcggmicvwjrngccsdy0f06l7a8nfgp9ckn4d9vmg2";
     };
 
     desktopItem = makeDesktopItem {

From 71239d59e40c3214457ec26e4cff98bc125dcd7a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 03:07:25 -0400
Subject: [PATCH 168/562] notejot: 1.5.5 -> 1.5.8

https://github.com/lainsce/notejot/releases/tag/1.5.6
---
 pkgs/applications/misc/notejot/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index a732a5ed536..b359088d6ba 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon
-, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }:
+, gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "notejot";
-  version = "1.5.5";
+  version = "1.5.8";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd";
+    sha256 = "1v7f4xy5iwdjyf4416qpiwzifi68n466faia1hxzsq18fb1ri0af";
   };
 
   nativeBuildInputs = [
@@ -22,16 +22,15 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gnome3.libgee
     gtk3
     gtksourceview
     json-glib
+    libgee
     pantheon.elementary-icon-theme
     pantheon.granite
   ];
 
   postPatch = ''
-    chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
   '';
 

From 1b1f9f95dd2be7eff1f087fdfc03ce08279e770e Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Wed, 31 Jul 2019 23:08:22 +0200
Subject: [PATCH 169/562] ripgrep-all: init at 0.9.2

---
 pkgs/tools/text/ripgrep-all/default.nix | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/text/ripgrep-all/default.nix

diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
new file mode 100644
index 00000000000..a9253b02ddd
--- /dev/null
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg
+, pandoc, poppler_utils, ripgrep, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "ripgrep-all";
+  version = "0.9.2";
+
+  src = fetchFromGitHub {
+    owner = "phiresky";
+    repo = pname;
+    rev = version;
+    sha256 = "1knv0gpanrid9i9mxg7zwqh9igdksp1623wl9iwmysiyaajlbif2";
+  };
+
+  cargoSha256 = "0xwsx0x9n766bxamhnpzibrnvnqsxz3wh1f0rj29kbl32xl8yyfg";
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = lib.optional stdenv.isDarwin Security;
+
+  postInstall = ''
+    wrapProgram $out/bin/rga \
+      --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more";
+    longDescription = ''
+      Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc.
+
+      rga is a line-oriented search tool that allows you to look for a regex in
+      a multitude of file types. rga wraps the awesome ripgrep and enables it
+      to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc.
+    '';
+    homepage = https://github.com/phiresky/ripgrep-all;
+    license = with licenses; [ agpl3Plus ];
+    maintainers = with maintainers; [ zaninime ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d3f900b5a6..2d4d74eea50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3477,6 +3477,10 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  ripgrep-all = callPackage ../tools/text/ripgrep-all {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   grive2 = callPackage ../tools/filesystems/grive2 { };
 
   groff = callPackage ../tools/text/groff {

From f11e4fd747f553b2ac24666a178fb0fbe490dbad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 21:49:11 -0700
Subject: [PATCH 170/562] flexget: 2.21.8 -> 2.21.15

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 1833e641a07..f990f8de529 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -24,11 +24,11 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.21.8";
+  version = "2.21.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a3dz013xxlwxz94i243bahw15k5y45mgk0z1zgkp1xrbiwglwvc";
+    sha256 = "0p1pa5l9apd40mdlgzp9vfpd8x9laqiah2i8l3q9m6nnibk1ipx8";
   };
 
   postPatch = ''

From 6ff56d7f01ef7fc25039d2a9ee0b011772d4143e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 01:00:30 -0700
Subject: [PATCH 171/562] pantheon.elementary-files: 4.1.8 -> 4.1.9

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

diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 99c7afffe7a..ad4cfa86c27 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   pname = "files";
-  version = "4.1.8";
+  version = "4.1.9";
 
   name = "elementary-${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1frslwbqnv3mwv5dpb1sbhxnwl87cps2ambkkhnn9wwckjpm7p8f";
+    sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv";
   };
 
   passthru = {

From ebf4126d8b137dd6ea08813bb61ee71ac4d79ba1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 04:04:49 -0400
Subject: [PATCH 172/562] pantheon.elementary-gtk-theme: 5.2.4 -> 5.2.5

https://github.com/elementary/stylesheet/releases/tag/5.2.5
---
 .../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 1ce18a1ec40..e30252bb71c 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "stylesheet";
-  version = "5.2.4";
+  version = "5.2.5";
 
   name = "elementary-gtk-theme-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1zhh9s4bmmk69k6j0klvfjmyv32wnwf0g575brm6gswn47nr2fni";
+    sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65";
   };
 
   passthru = {

From 644a9dcb663f8329f2e45cb415a4e27fa639967d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 04:23:10 -0400
Subject: [PATCH 173/562] ephemeral: 5.1.1 ->  5.2.1

https://github.com/cassidyjames/ephemeral/releases/tag/5.2.0
---
 pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index ce6a89f2997..6226cb338d9 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "5.1.1";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "1mfg3iksk4z65qkc652vbc6pl34vxw5s560flhcj9g87n6444hqw";
+    sha256 = "01mj5gksz2qcwhp28zyk8qswmrw93db1g7mw3mg4klz99vzcry74";
   };
 
   nativeBuildInputs = [

From 5122702087ef52e6e53b0c7c3c1f10680a52a407 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 03:14:46 -0400
Subject: [PATCH 174/562] sequeler: 0.7.0 -> 0.7.1

https://github.com/Alecaddd/sequeler/releases/tag/v0.7.1
---
 pkgs/applications/misc/sequeler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 4947bcf60bd..764e6c0048e 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -11,13 +11,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "sequeler";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "Alecaddd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1x2ikagjsgnhhhwkj09ihln17mq4wjq3wwbnf02j2p3jpp4i8w1i";
+    sha256 = "1803bhw20vb6w4s9phab95mgi2n0g30n57mc07h3xg3p114qxwir";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ];

From 66ba3c583bf4940e06eb50d80a7aeda9f41f047d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 03:19:37 -0400
Subject: [PATCH 175/562] quilter: 1.9.2 -> 1.9.3

https://github.com/lainsce/quilter/releases/tag/1.9.3
---
 pkgs/applications/editors/quilter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 43ff16deb2d..f5c62b6f36e 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "10r6d695avxj31yghb82ymgnd7f1dawwbqz3gfy0rycjza9dxvv8";
+    sha256 = "09acknajbkfpw8f5pay2qj69dzhwbiplsvpp1hy9ma6msmxkr6cm";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Focus on your writing - designed for elementary OS";
     homepage = https://github.com/lainsce/quilter;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ worldofpeace ];
+    maintainers = pantheon.maintainers;
     platforms = platforms.linux;
   };
 }

From ac17e43d8d6d9632bd0a5f6f067829f1cb3f9dcd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 03:25:10 -0400
Subject: [PATCH 176/562] aesop: 1.1.1 -> 1.1.2

https://github.com/lainsce/aesop/releases/tag/1.1.2
---
 pkgs/applications/office/aesop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index 470eabdf6e4..b71334a6a72 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aesop";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "191azshc2z9pzc61fhmzv5cxnihh5wh3nj803kvi3rnk6nl9mhzh";
+    sha256 = "1vadm8295jb7jaah2qykf3h9zvl5c013sanmxqi4snmmq4pa32ax";
   };
 
   nativeBuildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "The simplest PDF viewer around";
     homepage = https://github.com/lainsce/aesop;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ worldofpeace ];
+    maintainers = pantheon.maintainers;
     platforms = platforms.linux;
   };
 }

From c91d616881aa57486cdfc88ffae1208ef3bacc29 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 03:30:04 -0400
Subject: [PATCH 177/562] hashit: 1.0.0 -> 1.1.0

https://github.com/artemanufrij/hashit/blob/1.1.0/data/com.github.artemanufrij.hashit.appdata.xml.in#L36
---
 pkgs/tools/misc/hashit/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix
index b773fc5d680..6d928524713 100644
--- a/pkgs/tools/misc/hashit/default.nix
+++ b/pkgs/tools/misc/hashit/default.nix
@@ -1,32 +1,31 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "hashit";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "artemanufrij";
     repo = pname;
     rev = version;
-    sha256 = "1ba38qmwdk7vkarsxqn89irbymzx52gbks4isx0klg880xm2z4dv";
+    sha256 = "1s8fbzg1z2ypn55xg1pfm5xh15waq55fkp49j8rsqiq8flvg6ybf";
   };
 
   nativeBuildInputs = [
     desktop-file-utils
-    gobject-introspection
     meson
     ninja
+    pantheon.vala
     pkgconfig
     python3
-    pantheon.vala
     wrapGAppsHook
   ];
 
   buildInputs = [
-    pantheon.elementary-icon-theme
-    gnome3.libgee
-    pantheon.granite
     gtk3
+    libgee
+    pantheon.elementary-icon-theme
+    pantheon.granite
   ];
 
   postPatch = ''
@@ -35,10 +34,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A simple app for checking usual checksums";
+    description = "A simple app for checking usual checksums - Designed for elementary OS";
     homepage = https://github.com/artemanufrij/hashit;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ worldofpeace ];
+    maintainers = pantheon.maintainers;
     platforms = platforms.linux;
   };
 }

From d03c72cf43aaff2ff4fb1ab222906b0e9d935def Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 05:08:33 -0400
Subject: [PATCH 178/562] wire-desktop: add a proper throw

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

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 69b8ae9ee0c..10b7eb7d439 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -13,17 +13,19 @@ let
 
   inherit (stdenv.hostPlatform) system;
 
+  throwSystem = throw "Unsupported system: ${system}";
+
   pname = "wire-desktop";
 
   version = {
     "x86_64-linux" = "3.9.2895";
     "x86_64-darwin" = "3.9.2943";
-  }.${system} or "";
+  }.${system} or throwSystem;
 
   sha256 = {
     "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5";
     "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k";
-  }.${system};
+  }.${system} or throwSystem;
 
   meta = with stdenv.lib; {
     description = "A modern, secure messenger for everyone";

From a9d9fea4b7b76c469daa41628434b4773e2f34ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 02:14:01 -0700
Subject: [PATCH 179/562] digikam: 6.1.0 -> 6.2.0

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index cf2376b3733..f0f90a71cd5 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -52,13 +52,13 @@
 
 mkDerivation rec {
   pname   = "digikam";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "digikam";
     rev    = "v${version}";
-    sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8";
+    sha256 = "1l1nb1nwicmip2jxhn5gzr7h60igvns0zs3kzp36r6qf4wvg3v2z";
   };
 
   nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];

From cfe25d8a6464093780048ca3d7796d6b5cd3d61a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 02:22:28 -0700
Subject: [PATCH 180/562] gkrellm: 2.3.10 -> 2.3.11

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

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index b4fac899f66..f44cdd0bad7 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "gkrellm-2.3.10";
+  name = "gkrellm-2.3.11";
 
   src = fetchurl {
     url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2";
-    sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
+    sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From bdb37efc6f7679bf24d24b10504b6eb2d4981ae3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 02:34:15 -0700
Subject: [PATCH 181/562] freeswitch: 1.8.5 -> 1.8.7

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

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index c37eaad2f7f..a55d1cf14cd 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,6 +1,6 @@
 let
 
-# the default list from v1.8.5, except with applications/mod_signalwire also disabled
+# the default list from v1.8.7, except with applications/mod_signalwire also disabled
 defaultModules = mods: with mods; [
   applications.commands
   applications.conference
@@ -86,11 +86,11 @@ modulesConf = let
 in
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.8.5";
+  name = "freeswitch-1.8.7";
 
   src = fetchurl {
     url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
-    sha256 = "00xdrx84pw2v5pw1r5gfbb77nmvlfj275pmd48yfrc9g8c91j1sr";
+    sha256 = "0k52mxdfc5w9fdnz8kvfjiwnnjjhnpkirnyrfkhq7bad84m731z4";
   };
   postPatch = ''
     patchShebangs     libs/libvpx/build/make/rtcd.pl

From 60358cdd9e83d49d4f9f34b2e239bfcaa3d5297b Mon Sep 17 00:00:00 2001
From: David Meister <thedavidmeister@gmail.com>
Date: Sun, 4 Aug 2019 19:37:12 +1000
Subject: [PATCH 182/562] ledger-live-desktop: init at 1.12.0 (#62753)

---
 .../altcoins/ledger-live-desktop/default.nix  | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/altcoins/ledger-live-desktop/default.nix

diff --git a/pkgs/applications/altcoins/ledger-live-desktop/default.nix b/pkgs/applications/altcoins/ledger-live-desktop/default.nix
new file mode 100644
index 00000000000..0417d2913de
--- /dev/null
+++ b/pkgs/applications/altcoins/ledger-live-desktop/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, appimage-run }:
+
+stdenv.mkDerivation rec {
+  pname = "ledger-live-desktop";
+  version = "1.12.0";
+
+  src = fetchurl {
+    url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
+    sha256 = "0sn0ri8kqvy36d6vjwsb0mh54nwic58416m6q5drl1schsn6wyvj";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ appimage-run ];
+
+  desktopIcon = fetchurl {
+    url = "https://raw.githubusercontent.com/LedgerHQ/${pname}/v${version}/build/icon.png";
+    sha256 = "1mmfaf0yk7xf1kgbs3ka8wsbz1qgh60xj6z91ica1i7lw2qbdd5h";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = pname;
+    exec = "${placeholder "out"}/bin/${pname}";
+    icon = pname;
+    desktopName = "Ledger Live";
+    categories = "Utility;";
+  };
+
+  unpackPhase = ":";
+
+  installPhase = ''
+    runHook preInstall
+
+    ${desktopItem.buildCommand}
+    install -D $src $out/share/${src.name}
+    install -Dm -x ${desktopIcon} \
+      $out/share/icons/hicolor/1024x1024/apps/${pname}.png
+    makeWrapper ${appimage-run}/bin/appimage-run $out/bin/${pname} \
+      --add-flags $out/share/${src.name}
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Wallet app for Ledger Nano S and Ledger Blue";
+    homepage = "https://www.ledger.com/live";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thedavidmeister ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98004a6ce8c..09d7c8f91de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4387,6 +4387,8 @@ in
 
   leatherman = callPackage ../development/libraries/leatherman { };
 
+  ledger-live-desktop = callPackage ../applications/altcoins/ledger-live-desktop { };
+
   ledmon = callPackage ../tools/system/ledmon { };
 
   leela = callPackage ../tools/graphics/leela { };

From 9e2a710117d4ed705e05243dd740586e558d1899 Mon Sep 17 00:00:00 2001
From: bake <bake@192k.pw>
Date: Sat, 22 Jun 2019 19:18:51 +0200
Subject: [PATCH 183/562] nixos/gitolite: dataDir group-readable

---
 nixos/modules/services/misc/gitolite.nix | 29 ++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index c7f2a168f8a..cbe2c06ab65 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -143,21 +143,37 @@ in
     users.users.${cfg.user} = {
       description     = "Gitolite user";
       home            = cfg.dataDir;
-      createHome      = true;
       uid             = config.ids.uids.gitolite;
       group           = cfg.group;
       useDefaultShell = true;
     };
     users.groups."${cfg.group}".gid = config.ids.gids.gitolite;
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.dataDir}'/.gitolite - ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.dataDir}'/.gitolite/logs - ${cfg.user} ${cfg.group} - -"
+
+      "Z ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services."gitolite-init" = {
       description = "Gitolite initialization";
       wantedBy    = [ "multi-user.target" ];
       unitConfig.RequiresMountsFor = cfg.dataDir;
 
-      serviceConfig.User = "${cfg.user}";
-      serviceConfig.Type = "oneshot";
-      serviceConfig.RemainAfterExit = true;
+      environment = {
+        GITOLITE_RC = ".gitolite.rc";
+        GITOLITE_RC_DEFAULT = "${rcDir}/gitolite.rc.default";
+      };
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = cfg.user;
+        Group = cfg.group;
+        WorkingDirectory = "~";
+        RemainAfterExit = true;
+      };
 
       path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.diffutils config.programs.ssh.package ];
       script =
@@ -187,11 +203,6 @@ in
           '';
       in
         ''
-          cd ${cfg.dataDir}
-          mkdir -p .gitolite/logs
-
-          GITOLITE_RC=.gitolite.rc
-          GITOLITE_RC_DEFAULT=${rcDir}/gitolite.rc.default
           if ( [[ ! -e "$GITOLITE_RC" ]] && [[ ! -L "$GITOLITE_RC" ]] ) ||
              ( [[ -f "$GITOLITE_RC" ]] && diff -q "$GITOLITE_RC" "$GITOLITE_RC_DEFAULT" >/dev/null ) ||
              ( [[ -L "$GITOLITE_RC" ]] && [[ "$(readlink "$GITOLITE_RC")" =~ ^/nix/store/ ]] )

From e2007a9e3bfb587cabaeed29f6634f5274706e50 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 03:00:33 -0700
Subject: [PATCH 184/562] gallery-dl: 1.8.6 -> 1.10.1

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

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index cb04be4b6ea..1ce9bfb1f67 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.8.6";
+  version = "1.10.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0in47v6c82a6mqg4wzxrji7wd8a9qh5386rsr77s3a8613am1n2x";
+    sha256 = "174d2q7w0kwa6xx9k3bl5gdwmk0gklvch963g7vl979wqsf7nskw";
   };
 
   doCheck = false;

From 0680b8f1a75b2a6605f987527f756c2e79ac0489 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 03:06:01 -0700
Subject: [PATCH 185/562] go-protobuf: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix
index e64d61478e6..f818569dd00 100644
--- a/pkgs/development/tools/go-protobuf/default.nix
+++ b/pkgs/development/tools/go-protobuf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   name = "go-protobuf-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "protobuf";
     rev = "v${version}";
-    sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+    sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
   };
 
   modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";

From 06c777026cd80595976851460bc28b38fac82e3f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 4 Aug 2019 06:18:09 -0400
Subject: [PATCH 186/562] openjpeg: disable tests for aarch64 linux

Fails on hydra https://hydra.nixos.org/build/98332124
---
 pkgs/development/libraries/openjpeg/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 9cd645ed1d4..e26f4160921 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libpng libtiff lcms2 ];
 
-  doCheck = testsSupport;
+  doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux
   checkPhase = ''
     substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \
       --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # "

From 558cdf0e11247f69585234e057deb22166e63793 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sun, 4 Aug 2019 12:20:16 +0200
Subject: [PATCH 187/562] vault-bin: use sourceRoot instead of custom
 unpackPhase

---
 pkgs/tools/security/vault/vault-bin.nix | 42 +++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index 7befface3b5..b58e41d850d 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -1,12 +1,10 @@
 { stdenv, fetchurl, unzip }:
 
 let
-
   version = "1.1.3";
+
   sources = let
-
     base = "https://releases.hashicorp.com/vault/${version}";
-
   in {
     "x86_64-linux" = fetchurl {
       url = "${base}/vault_${version}_linux_amd64.zip";
@@ -30,28 +28,26 @@ let
     };
   };
 
-in
-  stdenv.mkDerivation {
+in stdenv.mkDerivation {
+  name = "vault-bin-${version}";
 
-    src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+  src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
-    name = "vault-bin-${version}";
+  nativeBuildInputs = [ unzip ];
 
-    nativeBuildInputs = [ unzip ];
+  sourceRoot = ".";
 
-    unpackPhase = "unzip $src -d vault";
+  installPhase = ''
+    mkdir -p $out/bin $out/share/bash-completion/completions
+    mv vault $out/bin
+    echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
+  '';
 
-    installPhase = ''
-      mkdir -p $out/bin $out/share/bash-completion/completions
-      mv vault/vault $out/bin
-      echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = https://www.vaultproject.io;
-      description = "A tool for managing secrets, this binary includes the UI";
-      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ];
-      license = licenses.mpl20;
-      maintainers = with maintainers; [ offline psyanticy ];
-    };
-  }
\ No newline at end of file
+  meta = with stdenv.lib; {
+    homepage = https://www.vaultproject.io;
+    description = "A tool for managing secrets, this binary includes the UI";
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ];
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ offline psyanticy ];
+  };
+}

From fb801947d089a6d64d4331c116553f3b68279cd4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 03:35:32 -0700
Subject: [PATCH 188/562] gnome-builder: 3.32.3 -> 3.32.4

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

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 748fbfc42d5..740d65838c3 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -42,11 +42,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gnome-builder";
-  version = "3.32.3";
+  version = "3.32.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1vlr69sgiv3kg2qa3n7aw3913bmvlcpyhy3w8lls13wjrgif4wny";
+    sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr";
   };
 
   nativeBuildInputs = [

From f9ed3a6754fb54d7238a95da48eeb6d409f331e8 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Wed, 17 Jul 2019 16:20:06 +0700
Subject: [PATCH 189/562] qutebrowser: add wrapQtAppsHook

This commit fixes the error:

Could not find the Qt platform plugin "xcb" in ""

Closes #65895
---
 .../networking/browsers/qutebrowser/default.nix   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 5283d2e3c5d..e247fd4a45c 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchzip, python3Packages
-, makeWrapper, wrapGAppsHook, qtbase, glib-networking
+, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
 , libxslt, gst_all_1 ? null
 , withPdfReader        ? true
@@ -19,7 +19,7 @@ let
     stripRoot = false;
   };
 
-in python3Packages.buildPythonApplication rec {
+in mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
   version = "1.6.3";
 
@@ -41,7 +41,7 @@ in python3Packages.buildPythonApplication rec {
   ]);
 
   nativeBuildInputs = [
-    makeWrapper wrapGAppsHook asciidoc
+    wrapQtAppsHook wrapGAppsHook asciidoc
     docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
   ];
 
@@ -57,6 +57,9 @@ in python3Packages.buildPythonApplication rec {
     ./fix-restart.patch
   ];
 
+  dontWrapGApps = true;
+  dontWrapQtApps = true;
+
   postPatch = ''
     substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
 
@@ -95,6 +98,12 @@ in python3Packages.buildPythonApplication rec {
     done
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/qutebrowser \
+      "''${gappsWrapperArgs[@]}" \
+      "''${qtWrapperArgs[@]}"
+  '';
+
   meta = with stdenv.lib; {
     homepage    = https://github.com/The-Compiler/qutebrowser;
     description = "Keyboard-focused browser with a minimal GUI";

From fa7716c6b527e6cbb636ca678fb1a470f0ae21e7 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 19 Jul 2019 17:54:11 +0200
Subject: [PATCH 190/562] qutebrowser: 1.6.3 -> 1.7.0

pdfjs: 1.10.100 -> 2.1.266
---
 .../networking/browsers/qutebrowser/default.nix      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index e247fd4a45c..05eafb48e72 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null;
 
 let
   pdfjs = let
-    version = "1.10.100";
+    version = "2.1.266";
   in
   fetchzip rec {
     name = "pdfjs-${version}";
     url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
-    sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq";
+    sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby";
     stripRoot = false;
   };
 
 in mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.6.3";
+  version = "1.7.0";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy";
+    sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i";
   };
 
   # Needs tox
@@ -74,8 +74,8 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
 
   postInstall = ''
     install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
-    install -Dm644 misc/qutebrowser.desktop \
-        "$out/share/applications/qutebrowser.desktop"
+    install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \
+        "$out/share/applications/org.qutebrowser.qutebrowser.desktop"
 
     # Install icons
     for i in 16 24 32 48 64 128 256 512; do

From 1ac4c0f2463a856cb95a5ad66d54ff91168b4d9e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sun, 4 Aug 2019 13:05:30 +0200
Subject: [PATCH 191/562] confluent-platform: add jre to PATH

---
 pkgs/servers/confluent-platform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix
index b29f6eba12e..4d2b9a0b1fb 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       wrapProgram $p \
         --set JAVA_HOME "${jre}" \
         --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \
-        --prefix PATH : "${bash}/bin:${gnused}/bin"
+        --prefix PATH : "${jre}/bin:${bash}/bin:${gnused}/bin"
     done
   '';
 

From 5f3787932f6b2dc85af8eee6c4c4b4d701298066 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 04:16:21 -0700
Subject: [PATCH 192/562] gmsh: 4.4.0 -> 4.4.1

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

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 1a3ba8096e2..fbdbac003dc 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "4.4.0"; in
+let version = "4.4.1"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "0b0h15cmi6zy31cii7r9jmfm9xksljff255dn6l9frhdjymkmx7l";
+    sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45";
   };
 
   buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined

From b8d3548a560790163ffa735aa621b814edc710b3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jaka@x-truder.net>
Date: Sun, 4 Aug 2019 13:05:59 +0200
Subject: [PATCH 193/562] confluent-platform: add confluent-cli tool

---
 pkgs/servers/confluent-platform/default.nix | 23 +++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix
index 4d2b9a0b1fb..84985b8f0eb 100644
--- a/pkgs/servers/confluent-platform/default.nix
+++ b/pkgs/servers/confluent-platform/default.nix
@@ -1,20 +1,35 @@
-{ stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }:
+{ stdenv, lib, fetchurl, fetchFromGitHub
+, jre, makeWrapper, bash, gnused }:
 
-let 
-  scalaVersion = "2.12"; 
-in
 stdenv.mkDerivation rec {
   name = "confluent-platform-${version}";
   version = "5.3.0";
+  scalaVersion = "2.12";
 
   src = fetchurl {
     url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz";
     sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp";
   };
 
+  confluentCli = fetchFromGitHub {
+    owner = "confluentinc";
+    repo = "confluent-cli";
+    rev = "v${version}";
+    sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j";
+  };
+
   buildInputs = [ jre makeWrapper bash ];
 
   installPhase = ''
+    cp -R $confluentCli confluent-cli
+    chmod -R +w confluent-cli
+
+    (
+      export CONFLUENT_HOME=$PWD
+      cd confluent-cli
+      make install
+    )
+
     mkdir -p $out
     cp -R bin etc share src $out
     rm -rf $out/bin/windows

From d798b5ee92061198bb163d6dc0609cc29428de11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 05:07:35 -0700
Subject: [PATCH 194/562] groonga: 9.0.4 -> 9.0.5

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

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 2d9f6b11b27..f86596150ea 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "9.0.4";
+  version = "9.0.5";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "00cyzvk8303y0xcmb0hiy45wj2j6baqqzrfda9f6fv3zlfna1n2g";
+    sha256 = "15y5dddvziw9lbl24z4j5yf1ibv79bn052lmx08rbxh78777csw3";
   };
 
   buildInputs = with stdenv.lib;

From 3683719957b58c72a805e90d71264c801120ee05 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 05:18:53 -0700
Subject: [PATCH 195/562] gImageReader: 3.3.0 -> 3.3.1

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

diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 062bca5b215..9a34694e2f2 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gImageReader-${version}";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner= "manisandro";
     repo = "gImageReader";
     rev = "v${version}";
-    sha256 = "0pjk4kr7bc5q4hi1xf7na2zln9fyqdazgzq62r3bg41nzy7fakcz";
+    sha256 = "17hz2dgxx2j7hsk0lx3riidqvlsg0ylnicjd2gphsi3yp7w20zdj";
   };
 
   nativeBuildInputs = [

From bfdca24dd3824bff88eab48c33395baaa1a5879e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 05:23:28 -0700
Subject: [PATCH 196/562] terminus_font: 4.47 -> 4.48

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

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 4198fe2cbe6..57356398004 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "terminus-font";
-  version = "4.47";
+  version = "4.48";
   name = "${pname}-${version}"; # set here for use in URL below
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
-    sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg";
+    sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
   };
 
   nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];

From f3d53023d831a68bf07366c9ec4d724067167d5f Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 4 Aug 2019 14:35:41 +0200
Subject: [PATCH 197/562] highlight: 3.52 -> 3.53

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

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 34dacc80d92..46fe9ab1cd7 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "highlight-${version}";
-  version = "3.52";
+  version = "3.53";
 
   src = fetchFromGitLab {
     owner = "saalen";
     repo = "highlight";
     rev = "v${version}";
-    sha256 = "0zhn1k70ck82ks7ckzsy1yiz686ym2ps7c28wjmkgxfpyjanilrq";
+    sha256 = "11szws4q6qyffq2fsvh1vksh1d0kcwg6smyyba9yr61hzx6zmzgr";
   };
 
   enableParallelBuilding = true;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Source code highlighting tool";
-    homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php;
+    homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
     platforms = platforms.unix;
     maintainers = with maintainers; [ ndowens willibutz ];
   };

From b4628764a8bb991e8a0c856bd2436f2830e94214 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 05:59:51 -0700
Subject: [PATCH 198/562] icingaweb2: 2.6.3 -> 2.7.0

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

diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix
index 11bfb99782d..9216464f1e4 100644
--- a/pkgs/servers/icingaweb2/default.nix
+++ b/pkgs/servers/icingaweb2/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec {
   name = "icingaweb2-${version}";
-  version = "2.6.3";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "Icinga";
     repo = "icingaweb2";
     rev = "v${version}";
-    sha256 = "0xcsf45m85d4ww5y2d5i73rjbp3hmc8lljc67lz9fl6f90y9gb22";
+    sha256 = "0akz2v9zfdchagnzdqcvzrxyw9bkmg8pp23wwdpwdrw67z2931zj";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8cc4edde3e2da04fce687911ac2d206792016b7f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 17:14:03 -0700
Subject: [PATCH 199/562] debianutils: 4.8.6.2 -> 4.8.6.3

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

diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index 3613905db48..b42c302a38f 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "debianutils";
-  version = "4.8.6.2";
+  version = "4.8.6.3";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
-    sha256 = "1fhbn62v85ydcap4pjx6jb37bly42lf3l64ig4ppr7yiaax8i8xc";
+    sha256 = "08g2gdm6n66w5m8qwm4f48wzgs3ymkpki6dg01nwzwbdzhxdxirc";
   };
 
   meta = with stdenv.lib; {

From 55565b0f6930ad9a7538e98b997d0347e99af043 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Sat, 3 Aug 2019 12:56:26 +0200
Subject: [PATCH 200/562] yubioath-desktop: use qt wrapped mkDerivation

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

diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index 3d4718990cb..843bc0c1c23 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, mkDerivation
 , qmake, qtbase, qtquickcontrols
 , python3, pyotherside
 , pcsclite, yubikey-personalization
 , yubikey-manager, makeWrapper }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "yubioath-desktop";
   version = "4.3.6";
 

From be21b66ffcace1d8d74e1c8db3c35229bbd332a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 06:07:15 -0700
Subject: [PATCH 201/562] hwinfo: 21.66 -> 21.67

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

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index ff937638056..eba8c8f41b4 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.66";
+  version = "21.67";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "1f841hzh9ik02690h9b1k3ysqv91avsb0zir2ykqz8qj39c5qsxz";
+    sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji";
   };
 
   patchPhase = ''

From 64c3c32da327999361a711f0acceda35b2eaf04d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 06:14:01 -0700
Subject: [PATCH 202/562] jgmenu: 3.1 -> 3.3

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

diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 64c693092b0..879f344a5af 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jgmenu";
-  version = "3.1";
+  version = "3.3";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03lk89d6wvqv234qciksd4zm0z4lkvrxfh6r9ff0d8yzg67m7rd0";
+    sha256 = "02qpvlmcis7217hkqilhszza4g1smb4byx4gihgp5207aj8qhz0l";
   };
 
   nativeBuildInputs = [

From 5d76be906dd097a4604cf0bc050a145e14b92353 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 06:18:22 -0700
Subject: [PATCH 203/562] jackett: 0.11.457 -> 0.11.559

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 1091e31cf9f..d2ead585e7d 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.11.457";
+  version = "0.11.559";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "139ga5qra6jrn3mkp08a5p495alxq78a8imfj4k8ywv1s05kw7dw";
+    sha256 = "1ds263q92igvgn0dirl506cmrzy374msaxl1x13gax0i0ggf09mq";
   };
 
   buildInputs = [ makeWrapper ];

From c2e8451a97d442db7a541108c40a8fac909f12f6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 4 Aug 2019 15:06:29 +0200
Subject: [PATCH 204/562] wt3: 3.3.11 -> 3.4.0

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

diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index e1c339d1e0f..74117b3a298 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -34,7 +34,7 @@ let
       ];
 
       meta = with stdenv.lib; {
-        homepage = https://www.webtoolkit.eu/wt;
+        homepage = "https://www.webtoolkit.eu/wt";
         description = "C++ library for developing web applications";
         platforms = platforms.linux;
         license = licenses.gpl2;
@@ -43,8 +43,8 @@ let
     };
 in {
   wt3 = generic {
-    version = "3.3.11";
-    sha256 = "1s1bwg3s7brnspr9ya1vg5mr29dbvhf05s606fiv409b7ladqvxq";
+    version = "3.4.0";
+    sha256 = "0y0b2h9jf5cg1gdh48dj32pj5nsvipab1cgygncxf98c46ikhysg";
   };
 
   wt4 = generic {

From 16d75edc90d4be710cf57fe0e02564cbe96e01c9 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 4 Aug 2019 15:06:58 +0200
Subject: [PATCH 205/562] wt4: 4.0.5 -> 4.1.0

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

diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix
index 74117b3a298..ba77189b2a5 100644
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -48,7 +48,7 @@ in {
   };
 
   wt4 = generic {
-    version = "4.0.5";
-    sha256 = "1gn8f30mjmn9aaxdazk49wijz37nglfww15ydrjiyhl6v5xhsjdv";
+    version = "4.1.0";
+    sha256 = "1a9nl5gs8m8pssf2l3z6kbl2rc9fw5ad7lfslw5yr3gzi0zqn05x";
   };
 }

From 33a58b36e259fd627e5a94b4cb171cb01ad95763 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 3 Aug 2019 10:17:01 -0700
Subject: [PATCH 206/562] cpp-netlib: 0.12.0 -> 0.13.0-final

---
 pkgs/development/libraries/cpp-netlib/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index badfc630a47..a4729cdeaed 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, cmake, boost, openssl, asio }:
+{ stdenv, fetchFromGitHub, cmake, boost, openssl, asio }:
 
 stdenv.mkDerivation rec {
-  name = "cpp-netlib-${version}";
-  version = "0.12.0";
+  pname = "cpp-netlib";
+  version = "0.13.0-final";
 
-  src = fetchurl {
-    url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
-    sha256 = "0h7gyrbr3madycnj8rl8k1jzk2hd8np2k5ad9mijlh0fizzzk3h8";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "18782sz7aggsl66b4mmi1i0ijwa76iww337fi9sygnplz2hs03a3";
+    fetchSubmodules = true;
   };
 
   buildInputs = [ cmake boost openssl ];

From 08aa9c9aa466d7a4458025cb758c3f544d139657 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 07:27:55 -0700
Subject: [PATCH 207/562] homebank: 5.2.6 -> 5.2.7

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 9f45a70e8b8..727a68c440a 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.2.6";
+  name = "homebank-5.2.7";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "10cqii1bsc7dmg8nzj6xhmk44r390vca49vbsw4g504h0bvwn54s";
+    sha256 = "0pzbn0wlppwbap19isbv8vv3cq7xswladhc272ykaya78r1bxvcf";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From a489bcbbe1d762da6e465927df7abf1317e493b3 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhav.sagar@obsidian.systems>
Date: Tue, 19 Mar 2019 16:32:01 -0400
Subject: [PATCH 208/562] smlnjBootstrap: 110.84 -> 110.91

---
 pkgs/development/compilers/smlnj/bootstrap.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index 2fe1f1f3f5a..21cfd408298 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, cpio, rsync, makeWrapper }:
+{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "smlnj-bootstrap-${version}";
 
-  version = "110.84";
+  version = "110.91";
 
   src = fetchurl {
     url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg";
-    sha256 = "17fpnlxcfwx2ysg6y9c5wwx6s3jca981nb0pawfcg6xg9wcapyfz";
+    sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4";
   };
 
   buildInputs = [ cpio rsync makeWrapper ];
 
   unpackPhase = ''
-    /usr/bin/xar -xf $src
+    ${xar}/bin/xar -xf $src
     cd smlnj.pkg
   '';
 

From 88770b01d5399c987e539896f28b38609d93e8f6 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 4 Aug 2019 10:41:03 -0400
Subject: [PATCH 209/562] mysql57: 5.7.25 -> 5.7.27

---
 pkgs/servers/sql/mysql/5.7.x.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 249a5af5d48..6636c099e83 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, bison
+{ stdenv, fetchurl, cmake, bison, pkgconfig
 , boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
 , cctools, CoreServices, developer_cmds }:
 
@@ -6,12 +6,12 @@
 
 let
 self = stdenv.mkDerivation rec {
-  name = "mysql-${version}";
-  version = "5.7.25";
+  pname = "mysql";
+  version = "5.7.27";
 
   src = fetchurl {
-    url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "0gvjcdnba7nf2dx3fbqk1qyg49zclfvaihb78l8h6qc08di1qxak";
+    url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
+    sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
@@ -19,13 +19,11 @@ self = stdenv.mkDerivation rec {
     export PATH=$PATH:$TMPDIR
   '';
 
-  nativeBuildInputs = [ cmake bison ];
+  nativeBuildInputs = [ cmake bison pkgconfig ];
 
   buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
      ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
 
-  enableParallelBuilding = true;
-
   outputs = [ "out" "static" ];
 
   cmakeFlags = [
@@ -76,7 +74,7 @@ self = stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://www.mysql.com/;
+    homepage = "https://www.mysql.com/";
     description = "The world's most popular open source database";
     platforms = platforms.unix;
     license = with licenses; [

From f1faec8249eb74ee7a8a74e52cbffb50386cab25 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 4 Aug 2019 10:41:55 -0400
Subject: [PATCH 210/562] nixos/mysql: test the mysql package, not just mariadb

---
 nixos/tests/mysql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index abf9606aa36..05bd968de02 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -19,7 +19,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         services.mysql.initialScript = pkgs.writeText "mysql-init.sql" ''
           CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123';
         '';
-        services.mysql.package = pkgs.mysql;
+        services.mysql.package = pkgs.mysql57;
       };
 
     mariadb =

From 7fd109e23f893f49291066bf296760dbb2e972b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 06:26:56 -0700
Subject: [PATCH 211/562] ipset: 7.2 -> 7.3

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

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index c831c14031a..57255b4a382 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "ipset-7.2";
+  name = "ipset-7.3";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${name}.tar.bz2";
-    sha256 = "06268dchlk4x8x27rhn569hjkm99jk2iid3ara2xr7k66i2kh4rf";
+    sha256 = "0nm3vagr1pb5hr1028qrwx6v6s8bxf1m4qjx72vak42y032wfi26";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 997ed4eca242f0eabebe03fdacfbc81b80002a9f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 4 Aug 2019 17:58:29 +0200
Subject: [PATCH 212/562] digikam: enable parallel build

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f0f90a71cd5..1fc15af7244 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -105,6 +105,8 @@ mkDerivation rec {
     threadweaver
   ];
 
+  enableParallelBuilding = true;
+
   cmakeFlags = [
     "-DENABLE_MYSQLSUPPORT=1"
     "-DENABLE_INTERNALMYSQL=1"

From b74113e193a857fa898680668bad482d3ec5b8c7 Mon Sep 17 00:00:00 2001
From: ysander <ysander@techfak.uni-bielefeld.de>
Date: Sun, 4 Aug 2019 18:02:00 +0200
Subject: [PATCH 213/562] Add dependency and patch files (refs: #65786)

---
 .../interpreters/love/0.7-gl-prototypes.patch | 21 +++++++++++++++++++
 pkgs/development/interpreters/love/0.7.nix    |  6 +++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/love/0.7-gl-prototypes.patch

diff --git a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch
new file mode 100644
index 00000000000..0b6778f6a90
--- /dev/null
+++ b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch
@@ -0,0 +1,21 @@
+diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp
+--- love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp	2019-03-14 12:46:55.032982224 -0400
++++ love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp	2019-03-14 12:47:22.356175299 -0400
+@@ -1,3 +1,5 @@
++#define GL_GLEXT_PROTOTYPES
++
+ #include "Framebuffer.h"
+ #include <common/Matrix.h>
+ 
+diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp
+--- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp	2019-03-14 12:46:55.032982224 -0400
++++ love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp	2019-03-14 12:47:33.346119890 -0400
+@@ -18,6 +18,8 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+ 
++#define GL_GLEXT_PROTOTYPES
++
+ #include "SpriteBatch.h"
+ 
+ // STD
diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
index 884225b6483..7f39259c298 100644
--- a/pkgs/development/interpreters/love/0.7.nix
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -2,6 +2,7 @@
 , SDL, libGLU_combined, openal, lua
 , libdevil, freetype, physfs
 , libmodplug, mpg123, libvorbis, libogg
+, libmng
 }:
 
 stdenv.mkDerivation rec {
@@ -11,10 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
   };
 
+  # see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
+  patches = [ ./0.7-gl-prototypes.patch ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     SDL libGLU_combined openal lua
-    libdevil freetype physfs libmodplug mpg123 libvorbis libogg
+    libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
   ];
 
   preConfigure = ''

From d940b4413794f85435ccb02be40d288faefedf36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Sun, 4 Aug 2019 18:16:16 +0200
Subject: [PATCH 214/562] tcslib: init at version v0.3

build for tcslib as contribution as well as usage example for the new buildOasisPackage
---
 .../ocaml-modules/tcslib/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tcslib/default.nix

diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix
new file mode 100644
index 00000000000..40481c89937
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocamlPackages, buildOasisPackage }:
+
+buildOasisPackage rec {
+  name = "tcslib";
+  version = "v0.3";
+
+  minimumSupportedOCamlVersion = "4.03.0";
+
+  src = fetchFromGitHub {
+    owner  = "tcsprojects";
+    repo   = "tcslib";
+    rev    = version;
+    sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi";
+  };
+
+  buildInputs = with ocamlPackages; [ ounit ];
+  propagatedBuildInputs = with ocamlPackages; [ ocaml_extlib num ];
+
+  meta = {
+    homepage = https://github.com/tcsprojects/tcslib;
+    description = "A multi-purpose library for OCaml";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bac8e411bbd..1ca56235c65 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -721,6 +721,8 @@ let
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
+    tcslib = callPackage ../development/ocaml-modules/tcslib { };
+
     toml = callPackage ../development/ocaml-modules/toml { };
 
     topkg = callPackage ../development/ocaml-modules/topkg { };

From 8aa218bf8299f4147771b4abdbba2c04116e2aae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 10:10:53 -0700
Subject: [PATCH 215/562] krita: 4.2.2 -> 4.2.5

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

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index cc46ac2d3bb..83489e1a24c 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   pname = "krita";
-  version = "4.2.2";
+  version = "4.2.5";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1pzk5bqp3kh22djhvsvmsc7ybirs4hsnkpg1y9677m2gxwbqnnps";
+    sha256 = "1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];

From fc0138f980b6822c40daa3d9cedb052bb826e5fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 10:36:55 -0700
Subject: [PATCH 216/562] kronometer: 2.2.2 -> 2.2.3

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

diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 0307cd86df8..4e83c2479f1 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -6,14 +6,14 @@
 
 let
   pname = "kronometer";
-  version = "2.2.2";
+  version = "2.2.3";
 in
 mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "142f1kqygil6d4pvh6pallin355h2rq5s1hs6gd11plcin6rkg2j";
+    sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm";
   };
 
   meta = with lib; {

From a7b7c8c78688674851cdc152ab5fa5da68bdb6e6 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Sun, 4 Aug 2019 19:39:08 +0200
Subject: [PATCH 217/562] fstl: use qt's mkDerivation

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

diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index b1437508a50..bdb1e87d70e 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -1,5 +1,6 @@
-{stdenv, fetchFromGitHub, qtbase, mesa_glu}:
-stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }:
+
+mkDerivation rec {
   name = "fstl-${version}";
   version = "0.9.3";
 

From 0a02aed96c05fdfd84909117e8e1c8c17d567f35 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 11:01:28 -0700
Subject: [PATCH 218/562] lesspipe: 1.83 -> 1.84

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

diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix
index 9bb46f113fd..bb99521cc27 100644
--- a/pkgs/tools/misc/lesspipe/default.nix
+++ b/pkgs/tools/misc/lesspipe/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lesspipe";
-  version = "1.83";
+  version = "1.84";
 
   buildInputs = [ perl ];
   preConfigure = "patchShebangs .";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "wofr06";
     repo = "lesspipe";
     rev = version;
-    sha256 = "1vqch6k4fz5pyf8szlnqm3qhlvgs9l4njd13yczjh4kpaxpn0rxb";
+    sha256 = "124ffhzrikr88ab14rk6753n8adxijpmg7q3zx7nmqc52wpkfd8q";
   };
 
   patches = [

From 30817f9779ac1bfed088510b55689532706fce2b Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 4 Aug 2019 21:03:55 +0200
Subject: [PATCH 219/562] coloursum: init at 0.1.0

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

diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
new file mode 100644
index 00000000000..49db5e13d72
--- /dev/null
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "coloursum-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "ticky";
+    repo = "coloursum";
+    rev = "v${version}";
+    sha256 = "18ikwi0ihn0vadazrkh85jfz8a2f0dkfb3zns5jzh7p7mb0ylrr2";
+  };
+
+  cargoSha256 = "0f73vqa82w4ccr0cc95mxga3r8jgd92jnksshxzaffbpx4s334p3";
+
+  meta = with stdenv.lib; {
+    description = "Colourise your checksum output";
+    homepage = "https://github.com/ticky/coloursum";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1cfa099bca..f74db430c96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1367,6 +1367,8 @@ in
 
   colorls = callPackage ../tools/system/colorls { };
 
+  coloursum = callPackage ../tools/text/coloursum { };
+
   compsize = callPackage ../os-specific/linux/compsize { };
 
   coturn = callPackage ../servers/coturn { };

From dc98a1a61b7cb94f2ae1b93253f3240aaf011708 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 12:07:10 -0700
Subject: [PATCH 220/562] mbuffer: 20190127 -> 20190725

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

diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 6cf8de2fea0..59ed474e9bc 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,12 +3,12 @@
  } :
 
 stdenv.mkDerivation rec {
-  version = "20190127";
+  version = "20190725";
   name = "mbuffer-${version}";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "1p7d9jaiyqcg5q14hlcji6llhjqkg6izc9cfz23jwgq8z2a6zjy5";
+    sha256 = "1hjhyh3q0q22czq3s2wk5mcky1jrq9xw8fppw6r7cix1riq74m91";
   };
 
   buildInputs = [ openssl ];

From 730741f3c138c128089a023b149c4d93bbe9dd34 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 4 Aug 2019 19:54:44 +0000
Subject: [PATCH 221/562] lnd: 0.7.0-beta -> 0.7.1-beta (#65865)

---
 pkgs/applications/altcoins/lnd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/altcoins/lnd.nix
index 7fcaca487b1..27f10c963c0 100644
--- a/pkgs/applications/altcoins/lnd.nix
+++ b/pkgs/applications/altcoins/lnd.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lnd";
-  version = "0.7.0-beta";
+  version = "0.7.1-beta";
 
   src = fetchFromGitHub {
     owner = "lightningnetwork";
     repo = "lnd";
     rev = "v${version}";
-    sha256 = "0d6m1vfy33rg6d7qmkpydiypav1girxsnxan9njyjz0vhinmq0sx";
+    sha256 = "1c0sm0lavdai4w6d283q54knggw9d42vvqmglnv2h9swbw1l23ry";
   };
 
-  modSha256 = "0akxi7xhyz7xx0vc003abidva02sp940cc2gfjg4fmzkc95cajc9";
+  modSha256 = "13hjaf4bswk8g57lyxzdlqqp4a6ddl3qm6n4jja4b1h58mlbil73";
 
   meta = with lib; {
     description = "Lightning Network Daemon";

From 7b4209f69c4c34d4f2d795552f50a7498fa91a48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 13:00:46 -0700
Subject: [PATCH 222/562] libqalculate: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 49490e1f785..1b73af7037b 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.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "0f82jss3kjxsk8znvrg1vfh756nnc15sbzr34ww1dvvrxipi7sns";
+    sha256 = "1qgsngi9z1sr6pzgcq6kgng62arpc5xn2ai1ks69myzzmgwk8adp";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 5bb58479d7f51615d76739b717ad8dfc85c987f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 13:09:13 -0700
Subject: [PATCH 223/562] jmol: 14.29.46 -> 14.29.49 (#65951)

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

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 84c01cbfd67..00231113d2c 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.29.46";
+  version = "14.29.49";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "00ig1f1fz5qbkam0h06vs1gsb95hdqa0iyhsp4qbyjjfxir7m59l";
+    sha256 = "19fyr4ldvbd5rbw19hslg9fpwc42wxmyx7r3z78k6dw653vb1ml5";
   };
 
   patchPhase = ''

From f6ebeb801da4984c886f3377b2e542d4bbe98664 Mon Sep 17 00:00:00 2001
From: Dave Nicponski <dave.nicponski@gmail.com>
Date: Sun, 28 Jul 2019 03:31:00 -0400
Subject: [PATCH 224/562] crawl: use static config for data files.

This allows the game to be executed from anywhere, not just
the install directory in the nix store.
---
 pkgs/games/crawl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 203afa93b45..2179c2bff76 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -49,8 +49,9 @@ stdenv.mkDerivation rec {
 
   fontsPath = lib.optionalString tileMode dejavu_fonts;
 
-  makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
+  makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
                 "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
+                "DATADIR=${placeholder "out"}"
               ] ++ lib.optional tileMode "TILES=y"
                 ++ lib.optional enableSound "SOUND=y";
 

From 784c69adfad9d5b1c1e29bbaf34e1a6127268f66 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sun, 4 Aug 2019 15:43:32 -0500
Subject: [PATCH 225/562] curaLulzbot: move dependencies into sequestered
 corner of source tree

---
 .../lulzbot/curaengine.nix}                   |  2 +-
 .../cura/{lulzbot.nix => lulzbot/default.nix} | 34 +++++++++++++------
 .../misc/cura/lulzbot/libarcus.nix}           |  0
 .../misc/cura/lulzbot/libsavitar.nix}         |  0
 .../cura/lulzbot/uranium-qt512-support.patch} |  0
 .../misc/cura/lulzbot/uranium.nix}            |  4 +--
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/python-packages.nix            |  3 --
 8 files changed, 27 insertions(+), 19 deletions(-)
 rename pkgs/applications/misc/{curaengine/lulzbot.nix => cura/lulzbot/curaengine.nix} (90%)
 rename pkgs/applications/misc/cura/{lulzbot.nix => lulzbot/default.nix} (69%)
 rename pkgs/{development/python-modules/libarcus/lulzbot.nix => applications/misc/cura/lulzbot/libarcus.nix} (100%)
 rename pkgs/{development/python-modules/libsavitar/lulzbot.nix => applications/misc/cura/lulzbot/libsavitar.nix} (100%)
 rename pkgs/{development/python-modules/uranium/qt512-support.patch => applications/misc/cura/lulzbot/uranium-qt512-support.patch} (100%)
 rename pkgs/{development/python-modules/uranium/lulzbot.nix => applications/misc/cura/lulzbot/uranium.nix} (91%)

diff --git a/pkgs/applications/misc/curaengine/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
similarity index 90%
rename from pkgs/applications/misc/curaengine/lulzbot.nix
rename to pkgs/applications/misc/cura/lulzbot/curaengine.nix
index 0df3e19b318..e44f43d22bf 100644
--- a/pkgs/applications/misc/curaengine/lulzbot.nix
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
+{ stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
 
 stdenv.mkDerivation rec {
   name = "curaengine-lulzBot-${version}";
diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot/default.nix
similarity index 69%
rename from pkgs/applications/misc/cura/lulzbot.nix
rename to pkgs/applications/misc/cura/lulzbot/default.nix
index 9073c5fae49..2d32d1895f9 100644
--- a/pkgs/applications/misc/cura/lulzbot.nix
+++ b/pkgs/applications/misc/cura/lulzbot/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit, curaengineLulzbot, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }:
+{ lib, callPackage, fetchgit, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }:
 
 let
   # admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
@@ -8,10 +8,22 @@ let
     rev = "cdc046494bbfe1f65bfb34659a257eef9a0100a0";
     sha256 = "0v0s036gxdjiglas2yzw95alv60sw3pq5k1zrrhmw9mxr4irrblb";
   };
-  curaengine = curaengineLulzbot;
-  libarcus = python3Packages.libarcusLulzbot;
-  uranium = python3Packages.uraniumLulzbot;
-  libsavitar = python3Packages.libsavitarLulzbot;
+
+  libarcusLulzbot = callPackage ./libarcus.nix {
+    inherit (python3Packages) buildPythonPackage sip pythonOlder;
+  };
+  libsavitarLulzbot = callPackage ./libsavitar.nix {
+    inherit (python3Packages) buildPythonPackage sip pythonOlder;
+  };
+
+  inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
+  curaengine = callPackage ./curaengine.nix {
+    inherit libarcusLulzbot;
+  };
+  uraniumLulzbot = callPackage ./uranium.nix {
+    inherit callPackage libarcusLulzbot;
+    inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
+  };
 in
 python3Packages.buildPythonApplication rec {
   name = "cura-lulzbot-${version}";
@@ -26,11 +38,11 @@ python3Packages.buildPythonApplication rec {
   format = "other"; # using cmake to build
   buildInputs = [ qtbase qtquickcontrols2 ];
   # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
-  propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitar uranium libarcus ]; # numpy-stl
+  propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
   nativeBuildInputs = [ cmake python3Packages.wrapPython ];
 
   cmakeFlags = [
-    "-DURANIUM_DIR=${uranium.src}"
+    "-DURANIUM_DIR=${uraniumLulzbot.src}"
     "-DCURA_VERSION=${version}"
   ];
 
@@ -42,16 +54,16 @@ python3Packages.buildPythonApplication rec {
   preFixup = ''
     substituteInPlace "$out/bin/cura-lulzbot" --replace 'import cura.CuraApplication' 'import Savitar; import cura.CuraApplication'
     ln -sT "${curaBinaryData}/cura/resources/firmware" "$out/share/cura/resources/firmware"
-    ln -sT "${uranium}/share/uranium" "$out/share/uranium"
+    ln -sT "${uraniumLulzbot}/share/uranium" "$out/share/uranium"
     ${jq}/bin/jq --arg out "$out" '.build=$out' >"$out/version.json" <<'EOF'
     ${builtins.toJSON {
       cura = version;
       cura_version = version;
       binarydata = curaBinaryDataVersion;
       engine = curaengine.version;
-      libarcus = libarcus.version;
-      libsavitar = libsavitar.version;
-      uranium = uranium.version;
+      libarcus = libarcusLulzbot.version;
+      libsavitar = libsavitarLulzbot.version;
+      uranium = uraniumLulzbot.version;
     }}
     EOF
   '';
diff --git a/pkgs/development/python-modules/libarcus/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
similarity index 100%
rename from pkgs/development/python-modules/libarcus/lulzbot.nix
rename to pkgs/applications/misc/cura/lulzbot/libarcus.nix
diff --git a/pkgs/development/python-modules/libsavitar/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
similarity index 100%
rename from pkgs/development/python-modules/libsavitar/lulzbot.nix
rename to pkgs/applications/misc/cura/lulzbot/libsavitar.nix
diff --git a/pkgs/development/python-modules/uranium/qt512-support.patch b/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch
similarity index 100%
rename from pkgs/development/python-modules/uranium/qt512-support.patch
rename to pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch
diff --git a/pkgs/development/python-modules/uranium/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix
similarity index 91%
rename from pkgs/development/python-modules/uranium/lulzbot.nix
rename to pkgs/applications/misc/cura/lulzbot/uranium.nix
index fd95110fd19..43869a0edc6 100644
--- a/pkgs/development/python-modules/uranium/lulzbot.nix
+++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
+{ stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ cmake doxygen ];
 
   # Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee
-  patches = [ ./qt512-support.patch ];
+  patches = [ ./uranium-qt512-support.patch ];
 
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e28a4dd65f..247914152b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20204,13 +20204,12 @@ in
   };
 
   curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; };
-  curaengineLulzbot = callPackage ../applications/misc/curaengine/lulzbot.nix { inherit (python3.pkgs) libarcusLulzbot; };
 
   cura = qt5.callPackage ../applications/misc/cura { };
 
   curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
 
-  curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot.nix { };
+  curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { };
 
   curaByDagoma = callPackage ../applications/misc/curabydagoma { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62586866c26..e957fe5746c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3238,7 +3238,6 @@ in {
   fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
 
   libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
-  libarcusLulzbot = callPackage ../development/python-modules/libarcus/lulzbot.nix { inherit (pkgs) protobuf; };
 
   libcloud = callPackage ../development/python-modules/libcloud { };
 
@@ -3259,7 +3258,6 @@ in {
   };
 
   libsavitar = callPackage ../development/python-modules/libsavitar { };
-  libsavitarLulzbot = callPackage ../development/python-modules/libsavitar/lulzbot.nix { };
 
   libplist = disabledIf isPy3k
     (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
@@ -5539,7 +5537,6 @@ in {
   twilio = callPackage ../development/python-modules/twilio { };
 
   uranium = callPackage ../development/python-modules/uranium { };
-  uraniumLulzbot = callPackage ../development/python-modules/uranium/lulzbot.nix { };
 
   uuid = callPackage ../development/python-modules/uuid { };
 

From 52ffaefb6d86a33bb2f2456a6313dc78940a873e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 4 Aug 2019 21:55:28 +0100
Subject: [PATCH 226/562] mdbook: fix license entry (actually MPL 2.0)

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

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 68e418a9e8f..de395f183d1 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   meta = with stdenv.lib; {
     description = "Create books from MarkDown";
     homepage = https://github.com/rust-lang-nursery/mdbook;
-    license = [ licenses.asl20 licenses.mit ];
+    license = [ licenses.mpl20 ];
     maintainers = [ maintainers.havvy ];
     platforms = platforms.all;
   };

From eb1ada708cf2b9a79e1d4dae84846c74d95b3d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Mon, 5 Aug 2019 00:11:09 +0300
Subject: [PATCH 227/562] mixxx: use qt5.mkDerivation

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

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 9fbcf8b7ac2..d0c8f4d9ebe 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, chromaprint
+{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint
 , fftw, flac, faad2, glibcLocales, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
@@ -6,7 +6,7 @@
 , qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "mixxx-${version}";
   version = "2.2.1";
 

From 58f7d41483f6c21bbf0b0e425c8509cf9fdc58ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 14:25:09 -0700
Subject: [PATCH 228/562] man-pages: 5.01 -> 5.02

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 04130f25f30..c4ce2750172 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
-  version = "5.01";
+  version = "5.02";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "09xn8d8xxwgms6h1bvjlgn3mxz51vxf3ra0ry9f5dqi29qry3z3x";
+    sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From 12a22535e8ad4e34ea690239e68a5f008f7150ec Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 4 Aug 2019 23:29:34 +0200
Subject: [PATCH 229/562] pythonPackages.webrtcvad: init at 2.0.10

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

diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix
new file mode 100644
index 00000000000..7bd0f20bfa1
--- /dev/null
+++ b/pkgs/development/python-modules/webrtcvad/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "webrtcvad";
+  version = "2.0.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f1bed2fb25b63fb7b1a55d64090c993c9c9167b28485ae0bcdd81cf6ede96aea";
+  };
+
+  # required WAV files for testing are not included in the tarball
+  doCheck = false;
+
+  meta = {
+    description = "Interface to the Google WebRTC Voice Activity Detector (VAD)";
+    homepage = https://github.com/wiseman/py-webrtcvad;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0896322e510..e0a96a0dac8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6094,6 +6094,8 @@ in {
   fastapi = callPackage ../development/python-modules/fastapi { };
 
   stringcase = callPackage ../development/python-modules/stringcase { };
+
+  webrtcvad = callPackage ../development/python-modules/webrtcvad { };
 });
 
 in fix' (extends overrides packages)

From 409763027b657931fa761ada45cf51913e2bbe7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 14:35:27 -0700
Subject: [PATCH 230/562] libimagequant: 2.12.3 -> 2.12.5

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

diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
index 83afd26bf1d..9c2dd920c9f 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libimagequant";
-  version = "2.12.3";
+  version = "2.12.5";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = pname;
     rev = version;
-    sha256 = "0qsfq1kv1m5jzn9v9iz0bac66k4clcis1c9877qabnwzwmwma5v0";
+    sha256 = "0cp68w04ja5pv77ssfafsn958w9hh9zb8crrlb5j3gsrcmdc032k";
   };
 
   preConfigure = ''

From 6d9aa0d7de985a12f0393c2de68539f2f97b1d27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 14:58:38 -0700
Subject: [PATCH 231/562] lmdb: 0.9.23 -> 0.9.24

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

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 9d57d472182..690a42cfb30 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.23";
+  version = "0.9.24";
 
   src = fetchFromGitHub {
     owner = "LMDB";
     repo = "lmdb";
     rev = "LMDB_${version}";
-    sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6";
+    sha256 = "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

From 9f3dd81f86e7363999ef40496ae667fc62838b4b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 16:19:03 -0700
Subject: [PATCH 232/562] minizincide: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 48a29901ca3..799623d34cc 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
 let
-  version = "2.3.0";
+  version = "2.3.1";
 in
 stdenv.mkDerivation {
   name = "minizinc-ide-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
     rev = version;
-    sha256 = "0458k7m97qxxylcl60qvp026kicfc4ilxwlb1p3jvjhi9384r00a";
+    sha256 = "0w9p5j2i7q4khmxyk2lr7a3qb2kd6ff1hfssxhgpm7zgzixm2300";
   };
 
   sourceRoot = "source/MiniZincIDE";

From 558fe63cb2719ec61b44ba62aec424c16f88cb34 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 17:15:27 -0700
Subject: [PATCH 233/562] mediainfo-gui: 19.04 -> 19.07

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

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 0d9fffd1bb7..8e6965bfc4f 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "19.04";
+  version = "19.07";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
+    sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 40934322f83ee068c3ed444e82e7ecf5d25d6b1a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 18:05:41 -0700
Subject: [PATCH 234/562] nagios: 4.4.3 -> 4.4.4

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

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 3459a5fe8f7..92713a43ea2 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-${version}";
-  version = "4.4.3";
+  version = "4.4.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
-    sha256 = "0rwzlj6qp8hq931rw6s255b33ggmc2fcxs74g9x2zxwcvklg1a5v";
+    sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57";
   };
 
   patches = [ ./nagios.patch ];

From f2068d3aa43ed490ad05d480fa19ca8add66b5d2 Mon Sep 17 00:00:00 2001
From: marius851000 <mariusdavid@laposte.net>
Date: Sat, 3 Aug 2019 20:50:55 +0200
Subject: [PATCH 235/562] dolphinEmuMaster: update to the latest upstream
 version

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 6f32e91044c..4f48f1248f4 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,13 +20,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "dolphin-emu-${version}";
-  version = "5.0-9976";
+  version = "5.0-10751";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "63f30cc44da248b0226e1c8724b3e53ecf4c768f";
-    sha256 = "0lkf571kzmw26fybl1lqpvhc81jkbh4hcvi3766bb7mvvzapkybd";
+    rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f";
+    sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3";
   };
 
   enableParallelBuilding = true;

From 500738811ba141e6264d7ce288f8af5287a86230 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 18:15:40 -0700
Subject: [PATCH 236/562] monero-gui: 0.14.1.0 -> 0.14.1.2

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

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index c10cc34ad44..fe4be499938 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "monero-gui-${version}";
-  version = "0.14.1.0";
+  version = "0.14.1.2";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31";
+    sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
   };
 
   nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];

From 8dcfc107d3bcd75a45c798d342f667aade5b0366 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 10:50:58 -0700
Subject: [PATCH 237/562] kotlin: 1.3.40 -> 1.3.41

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index f49d63168d4..32659d5be56 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.40";
+  version = "1.3.41";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "14n3x0771d0a1yqncig97lk4bigkx2nvx20khpcnvf873c2b3h28";
+    sha256 = "0ch1fynqjfsb7jklw3pa6fygrgnl8nz4x4v0id06wq4md23bcjn4";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 2669e51dcc32e072a529f1538a737c946e5c66fc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Aug 2019 21:58:15 -0400
Subject: [PATCH 238/562] linux: 4.14.135 -> 4.14.136

---
 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 57d9ad8fc16..57b0585ea4e 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.135";
+  version = "4.14.136";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0x2v0pj4hjb71qkxbqn4ymg6zmyabp91kylyzd270nbig7i234a2";
+    sha256 = "0w6z5fhwqgpqnz2js8vj9j5dl6isx8n7rnzrm0vr9r8njaazz396";
   };
 } // (args.argsOverride or {}))

From 08f910a5eab847ad082ffdc0f77e74aed69e84f2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Aug 2019 21:59:07 -0400
Subject: [PATCH 239/562] linux: 4.19.63 -> 4.19.64

---
 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 a1192b68b3f..dc404f0ef6a 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.63";
+  version = "4.19.64";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0pfjwpa6szvdr941y13806hlsgsbslfsvkrd5534p1iip5h8g63m";
+    sha256 = "1gasmcdsrsk81dscslmrsxqsvkfp5xxdx3ay95izggpk7piqnvvs";
   };
 } // (args.argsOverride or {}))

From aa2522f586981ef4b8030f9bd974989c2b114ebe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Aug 2019 21:59:46 -0400
Subject: [PATCH 240/562] linux: 4.4.186 -> 4.4.187

---
 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 366bf1ad265..000ba6073a3 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.186";
+  version = "4.4.187";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "113rjf8842glzi23y1g1yrwncihv2saah6wz0r726r06bk9p64hb";
+    sha256 = "1dlzb5yzcsicd41myj3q4dq2ql8xcc49brs5f7xjmc5ynvvjjgnc";
   };
 } // (args.argsOverride or {}))

From b99e9484830d3bb9b3e013a1f2c4582ce8a42a2c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Aug 2019 22:00:34 -0400
Subject: [PATCH 241/562] linux: 4.9.186 -> 4.9.187

---
 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 8fe5d3dfcb2..de15a2700a9 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.186";
+  version = "4.9.187";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0sjbp7m6d625rw06wv34a0805d1lgldii4pxiqfpja871m1q8914";
+    sha256 = "1iyimwl4ysnk6m66m73sg0cnp4vac56d6yy174shfpnj5h2csjq1";
   };
 } // (args.argsOverride or {}))

From d95b1185541afdbefde5ea1997e5b6b77a22dc6f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 4 Aug 2019 22:01:06 -0400
Subject: [PATCH 242/562] linux: 5.2.5 -> 5.2.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index 9a0551c4d06..d74f8548b3b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.5";
+  version = "5.2.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "15ndscsp3yqgas901g6inpmyvinz4cwr5y3md516j2pr8cl40if6";
+    sha256 = "1whzgdz1wnjzkb78yqz4xs3mad02rv17ksmwaf4ykp4lfgxml45y";
   };
 } // (args.argsOverride or {}))

From ab9294b6ed6d4c346a0664e4a2d6ba804f3ec051 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 3 Aug 2019 09:30:03 -0700
Subject: [PATCH 243/562] disper: 0.3.1 -> 0.3.1.1

---
 pkgs/tools/misc/disper/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
index 22951eecf53..167b4a547f8 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/pkgs/tools/misc/disper/default.nix
@@ -1,9 +1,19 @@
-{stdenv, fetchurl, python, xorg, makeWrapper}:
+{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "disper-0.3.1";
+  pname = "disper";
+  version = "0.3.1.1";
 
-  buildInputs = [python makeWrapper];
+  src = fetchFromGitHub {
+    owner = "apeyser";
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "1kl4py26n95q0690npy5mc95cv1cyfvh6kxn8rvk62gb8scwg9zn";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ python ];
 
   preConfigure = ''
     export makeFlags="PREFIX=$out"
@@ -14,11 +24,6 @@ stdenv.mkDerivation rec {
         --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
   '';
 
-  src = fetchurl {
-    url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz;
-    sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw";
-  };
-
   meta = {
     description = "On-the-fly display switch utility";
     homepage = http://willem.engen.nl/projects/disper/;

From 020468512626f9b078801155b4016d14b2d43dec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 19:16:49 -0700
Subject: [PATCH 244/562] openapi-generator-cli: 4.0.1 -> 4.0.3

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

diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix
index 4f2a26de327..363963b1b14 100644
--- a/pkgs/tools/networking/openapi-generator-cli/default.nix
+++ b/pkgs/tools/networking/openapi-generator-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.1";
+  version = "4.0.3";
   pname = "openapi-generator-cli";
 
   jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
-    sha256 = "1fglvn6ricvb0csbrjkjfp902y6drjf6cby5fihmr5v9m7pjym1y";
+    sha256 = "1x09db62i81gamj6pm9bng994z54y7gqc6wvj8hnn0j0ay9gkcf5";
   };
 
   phases = [ "installPhase" ];

From 3fdf3d3e567f654ac3afd0241f439a28b53e2501 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 19:33:58 -0700
Subject: [PATCH 245/562] parallel: 20190622 -> 20190722

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 49611aa0c3f..06ae22c86ff 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20190622";
+  name = "parallel-20190722";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1v5fbrxw9l1navmvxapb1raa2jr19vfjw3i28h7fgdqd8n6gs79z";
+    sha256 = "19xwdkmia2dw2hry9sbaq0ln79qy9dsqx11hq2s9dcyvhhqqdl0f";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f2d8928923c6a496c43d407af61a9ecc8dfb24e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 19:42:10 -0700
Subject: [PATCH 246/562] ocamlPackages.cmdliner: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 0a1a30a3473..271ec1f2af9 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -8,8 +8,8 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
-    version = "1.0.3";
-    sha256 = "0g3w4hvc1cx9x2yp5aqn6m2rl8lf9x1dn754hfq8m1sc1102lxna";
+    version = "1.0.4";
+    sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
   } else {
     version = "1.0.2";
     sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";

From 32526e65bd94535194dd74a912dbdb71e3992712 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Aug 2019 11:46:24 +0800
Subject: [PATCH 247/562] mtr: 0.92 -> 0.93

---
 pkgs/tools/networking/mtr/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 3c2ced1712f..59242551f92 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -1,38 +1,42 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, libcap, ncurses
 , withGtk ? false, gtk2 ? null }:
 
 assert withGtk -> gtk2 != null;
 
 stdenv.mkDerivation rec {
-  name="mtr-${version}";
-  version="0.92";
+  pname = "mtr";
+  version = "0.93";
 
   src = fetchFromGitHub {
     owner  = "traviscross";
     repo   = "mtr";
     rev    = "v${version}";
-    sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d";
+    sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw";
   };
 
-  preConfigure = ''
+  # we need this before autoreconfHook does its thing
+  postPatch = ''
     echo ${version} > .tarball-version
+  '';
 
-    ./bootstrap.sh
-
-    substituteInPlace Makefile.in --replace ' install-exec-hook' ""
+  # and this after autoreconfHook has generated Makefile.in
+  preConfigure = ''
+    substituteInPlace Makefile.in \
+      --replace ' install-exec-hook' ""
   '';
 
   configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2;
+  buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2;
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A network diagnostics tool";
-    homepage    = http://www.bitwizard.nl/mtr/;
+    homepage    = "https://www.bitwizard.nl/mtr/";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ koral orivej raskin ];
     platforms   = platforms.unix;

From febd3c7c30a3435633075b642b7e15cb682cc11d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 21:18:24 -0700
Subject: [PATCH 248/562] pdns-recursor: 4.1.14 -> 4.2.0

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

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 684dc02dcf3..fcddd569b36 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pdns-recursor-${version}";
-  version = "4.1.14";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "055zhxp58883722dr9y5bi91bk1ypc0whdyi96nklsga7gxbikkz";
+    sha256 = "1hn2nw8v6gccwxwm36xczsac4bhxf8b8r7akri2wdp3gh70p4g7h";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From bebe7acc99bd4d547ddd96f3d6b86f682d456ecc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 21:54:56 -0700
Subject: [PATCH 249/562] openimageio2: 2.0.9 -> 2.0.10

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

diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index 837446190fb..e582b5ee052 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openimageio";
-  version = "2.0.9";
+  version = "2.0.10";
 
   src = fetchFromGitHub {
     owner = "OpenImageIO";
     repo = "oiio";
     rev = "Release-${version}";
-    sha256 = "17diyfk586hll54cl476kbhbcm3nihw6cb4bgjkjxxzxbd3wx839";
+    sha256 = "0k60kgfahsqcgmydsf1kh1qzshn8mksaw772z48a40qnx28pfjys";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];

From 775fd25a47172e7a74fb2133fb8e42cdcf77910e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 22:42:01 -0700
Subject: [PATCH 250/562] pagemon: 0.01.15 -> 0.01.16

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

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index da2f73ec1b3..e1525a951a9 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.15";
+  version = "0.01.16";
 
   src = fetchFromGitHub {
-    sha256 = "0vbwpyik26zavpqsanmg8p7snk44nyz66flvkkqmhwx1ada9d181";
+    sha256 = "0fpxjw6sg6r9r7yy03brri37wmmc32rhzayzlmwgmzay8rifmm7i";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";

From 0b9b95d5b195b6f061ff763aa58a963cfb41d08b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Aug 2019 10:57:16 +0800
Subject: [PATCH 251/562] neovim-qt: 0.2.11 -> 0.2.12

---
 pkgs/applications/editors/neovim/qt.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 3004bf544c4..83b14b4ea37 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
+{ stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
 , msgpack, neovim, pythonPackages, qtbase }:
 
 let
-  unwrapped = stdenv.mkDerivation rec {
+  unwrapped = mkDerivation rec {
     pname = "neovim-qt-unwrapped";
-    version = "0.2.11";
+    version = "0.2.12";
 
     src = fetchFromGitHub {
       owner  = "equalsraf";
       repo   = "neovim-qt";
       rev    = "v${version}";
-      sha256 = "0pc1adxc89p2rdvb6nxyqr9sjzqz9zw2dg7a4ardxsl3a8jga1wh";
+      sha256 = "09s3044j0y8nmyi8ykslfii6fx7k9mckmdvb0jn2xmdabpb60i20";
     };
 
     cmakeFlags = [
@@ -24,7 +24,7 @@ let
       jinja2 python msgpack
     ]);
 
-    nativeBuildInputs = [ cmake doxygen makeWrapper ];
+    nativeBuildInputs = [ cmake doxygen ];
 
     enableParallelBuilding = true;
 

From 29f2f04ded458e298e70884c2fd10e05e336f598 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Sat, 13 Jul 2019 00:42:02 +0200
Subject: [PATCH 252/562] ghc: always use ld.gold

gold is known to speed up GHC builds considerably, saving up to many seconds
when linking large Haskell applications, so this patch configures all
non-binary GHC derivations to use gold.
---
 pkgs/development/compilers/ghc/8.2.2.nix | 2 +-
 pkgs/development/compilers/ghc/8.4.4.nix | 2 +-
 pkgs/development/compilers/ghc/8.6.4.nix | 2 +-
 pkgs/development/compilers/ghc/8.6.5.nix | 2 +-
 pkgs/development/compilers/ghc/8.8.1.nix | 2 +-
 pkgs/development/compilers/ghc/head.nix  | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 9b942da25a6..ba4933363c1 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -166,7 +166,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index a355f57a5c7..a90af60de43 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index ff9ef0a5c38..97ca95812d6 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index 44ad6da2ff5..d264cfda2a3 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 07b9cd1e1aa..6899ad4fd48 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 2edb49bd463..539d0408681 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -119,7 +119,8 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    # and more generally have a faster linker.
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

From 011c29f60cd7b2efb60b49b42c68d89aad0e57a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 Aug 2019 02:30:38 +0200
Subject: [PATCH 253/562] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.14.4-2-ge532a45 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ef90590dd2717f8a4a02038557645334a4f4bb55.
---
 .../haskell-modules/hackage-packages.nix      | 577 +++++++++++++-----
 1 file changed, 427 insertions(+), 150 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 04209b9e16f..d5e5aa7ef56 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -30928,8 +30928,8 @@ self: {
      }:
      mkDerivation {
        pname = "arithmetic";
-       version = "1.3";
-       sha256 = "09zfwp38ydg7gzivym6k4aid93jm78g1dad04zd0g6zsqb8gpcvb";
+       version = "1.4";
+       sha256 = "1qydk2sxrm0xfv23b354lfilyl2cnc0gc0842rz3672j3xwzrrfa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37571,6 +37571,8 @@ self: {
        pname = "bimap";
        version = "0.4.0";
        sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi";
+       revision = "1";
+       editedCabalFile = "111wyqh17a6pkjhyaz8n1891m69hwr2gybqcpacw4xdmarxmi7f5";
        libraryHaskellDepends = [ base containers deepseq exceptions ];
        testHaskellDepends = [
          base containers deepseq exceptions QuickCheck template-haskell
@@ -43511,6 +43513,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bulmex" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, jsaddle
+     , jsaddle-dom, lens, network-uri, reflex, reflex-dom-core
+     , reflex-dom-helpers, text, time, witherable
+     }:
+     mkDerivation {
+       pname = "bulmex";
+       version = "2.0.0";
+       sha256 = "0nzgzg17av87i1777rjakiyamcgkszfcw3ch150536vkp1jaqlm5";
+       libraryHaskellDepends = [
+         aeson base bytestring containers jsaddle jsaddle-dom lens
+         network-uri reflex reflex-dom-core reflex-dom-helpers text time
+         witherable
+       ];
+       description = "Reflex infused with bulma (css)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bumper" = callPackage
     ({ mkDerivation, base, Cabal, containers, fclabels, process
      , regex-compat, split, strict
@@ -46585,6 +46605,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "call-stack_0_2_0" = callPackage
+    ({ mkDerivation, base, nanospec }:
+     mkDerivation {
+       pname = "call-stack";
+       version = "0.2.0";
+       sha256 = "1iz0wkbcqchyji72c4j4zb72vfsfdp2ys8pf9mqqsxaq774r7ilm";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base nanospec ];
+       description = "Use GHC call-stacks in a backward compatible way";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "camfort" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, flint, fortran-src, GenericPretty
@@ -46664,8 +46697,8 @@ self: {
     ({ mkDerivation, base, deepseq, hspec, should-not-typecheck }:
      mkDerivation {
        pname = "can-i-haz";
-       version = "0.1.0.0";
-       sha256 = "1nsbw6k550n5vc2d17463sjci8a8k2f09519gp8hmdj19a9dlnc7";
+       version = "0.1.0.1";
+       sha256 = "1nay2hrvf8cxazsy5ha3affwxayirznjf0zlir0n7vbyl5w92im0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq hspec should-not-typecheck ];
        description = "Generic implementation of the Has pattern";
@@ -52487,6 +52520,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cmake-syntax" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, raw-strings-qq, trifecta
+     }:
+     mkDerivation {
+       pname = "cmake-syntax";
+       version = "0.1.0.0";
+       sha256 = "1d4pdnf4yb630iiw2iviidhzddfx15z2w6gamf92bdl17886i4jr";
+       libraryHaskellDepends = [
+         base bytestring raw-strings-qq trifecta
+       ];
+       testHaskellDepends = [
+         base bytestring hspec raw-strings-qq trifecta
+       ];
+       description = "Parser for the CMake syntax (CMakeLists.txt and .cmake files)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cmark" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, cheapskate
      , criterion, discount, HUnit, markdown, sundown, text
@@ -59008,6 +59058,8 @@ self: {
        pname = "cpkg";
        version = "0.2.3.1";
        sha256 = "0nw1h6zgx3dizx92nwzdf9ny8bzyfa2n28lpv34xvw38fz9yq16w";
+       revision = "2";
+       editedCabalFile = "15bn9c0zvr8xdhq4hgnq3hhqwvv8pc5a7bdvw58psn7dwhcac6nh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66767,6 +66819,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dependent-map_0_3" = callPackage
+    ({ mkDerivation, base, constraints-extras, containers
+     , dependent-sum
+     }:
+     mkDerivation {
+       pname = "dependent-map";
+       version = "0.3";
+       sha256 = "1azy6yrnd0adga4z2mlp9knbp55xhlj4v9c3rb2lr1sd2l8cgf80";
+       libraryHaskellDepends = [
+         base constraints-extras containers dependent-sum
+       ];
+       description = "Dependent finite maps (partial dependent products)";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dependent-monoidal-map" = callPackage
     ({ mkDerivation, aeson, base, constraints, constraints-extras
      , dependent-map, dependent-sum, dependent-sum-aeson-orphans
@@ -66809,15 +66877,13 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "dependent-sum_0_5" = callPackage
-    ({ mkDerivation, base }:
+  "dependent-sum_0_6_1" = callPackage
+    ({ mkDerivation, base, constraints-extras }:
      mkDerivation {
        pname = "dependent-sum";
-       version = "0.5";
-       sha256 = "1n5ln2fain1x9zkrzy1sknwm528lrdsnsg52z1d0hfpy5sngndsr";
-       revision = "2";
-       editedCabalFile = "1vxg9v2b5479qm7q9qzjyh9rmcdpr634s3kpjx0skqq0r68bc36s";
-       libraryHaskellDepends = [ base ];
+       version = "0.6.1";
+       sha256 = "077pq10kldxk47zlrz022a1m7a5qpr2xa2wapa01xa2hrlgv5xh4";
+       libraryHaskellDepends = [ base constraints-extras ];
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66855,6 +66921,23 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "dependent-sum-template_0_1_0_0" = callPackage
+    ({ mkDerivation, base, constraints-extras, dependent-sum
+     , template-haskell, th-extras
+     }:
+     mkDerivation {
+       pname = "dependent-sum-template";
+       version = "0.1.0.0";
+       sha256 = "07z95f27jpdb8y01f904z0fi6kjllsbcm2zg0k1v9y8c6rwavw0f";
+       libraryHaskellDepends = [
+         base dependent-sum template-haskell th-extras
+       ];
+       testHaskellDepends = [ base constraints-extras dependent-sum ];
+       description = "Template Haskell code to generate instances of classes in dependent-sum package";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "depends" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hspec
      , process, QuickCheck, transformers, yaml-config
@@ -75492,8 +75575,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-bridge";
-       version = "0.5.1";
-       sha256 = "0d9544s892rhy0dkhzz6w3nryhbl26yahs4k1nkpgdqsxsnv4rvn";
+       version = "0.5.2";
+       sha256 = "1ls4c4lrjbmms1kcaz88nnxn3ih3wbx51adjggbvyvfj52bc5cvp";
        libraryHaskellDepends = [ aeson base template-haskell ];
        testHaskellDepends = [
          aeson base containers hspec QuickCheck text
@@ -77002,6 +77085,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "envy_2_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hspec, mtl
+     , QuickCheck, quickcheck-instances, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "envy";
+       version = "2.0.0.0";
+       sha256 = "0l3rg9kvx5pp8ly1wl86g0nfp4161vdbf1cavpm2s84hahq9wg0z";
+       libraryHaskellDepends = [
+         base bytestring containers mtl text time transformers
+       ];
+       testHaskellDepends = [
+         base bytestring hspec mtl QuickCheck quickcheck-instances text time
+         transformers
+       ];
+       description = "An environmentally friendly way to deal with environment variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "epanet-haskell" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79800,6 +79903,19 @@ self: {
        broken = true;
      }) {};
 
+  "express" = callPackage
+    ({ mkDerivation, base, leancheck, template-haskell }:
+     mkDerivation {
+       pname = "express";
+       version = "0.1.0";
+       sha256 = "1bm2bzkkjnwrzf67g7291pw7cvlxg86mz69fnlrigmlxcx3kxbn4";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base leancheck ];
+       benchmarkHaskellDepends = [ base leancheck ];
+       description = "Express";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "expression-parser" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79975,8 +80091,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.6";
-       sha256 = "14cqsg4lamnhbdccdc0wfwzjzkpj93g92s93wmpg4214ykvr2gvf";
+       version = "0.6.1";
+       sha256 = "1h96kn622qyx27xap79ywq4kx4q82x4b3kxviakhqwxlvf2sklg2";
        libraryHaskellDepends = [
          aeson barbies base bytestring cassava comonad constraints deepseq
          exceptions ghc-prim hashable membership monad-skeleton mtl
@@ -80196,6 +80312,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extrapolate_0_4_0" = callPackage
+    ({ mkDerivation, base, express, leancheck, speculate
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "extrapolate";
+       version = "0.4.0";
+       sha256 = "0qlpgpwzdvc2my332krjs8pqwzrhpkw9l3irfx6gx8fpmgasfd8n";
+       libraryHaskellDepends = [
+         base express leancheck speculate template-haskell
+       ];
+       testHaskellDepends = [ base express leancheck speculate ];
+       description = "generalize counter-examples of test properties";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ez-couch" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
      , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit
@@ -87472,6 +87605,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ft-generator" = callPackage
+    ({ mkDerivation, base, mtl, parsec }:
+     mkDerivation {
+       pname = "ft-generator";
+       version = "1.0";
+       sha256 = "1kgh8w1ny0zsrbf53vqabkap6zp6fmq2hx35nxw2hcfw7b0pvavk";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base mtl parsec ];
+       description = "implementation accompanying a WFLP'19 submission";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ftdi" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, safe
      , transformers, usb
@@ -93004,15 +93150,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
-  "gi-atk_2_0_20" = callPackage
+  "gi-atk_2_0_21" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.20";
-       sha256 = "0pgmsd486l7ym8yi8png1zw90zk505jbdxj6jmh2hn096dl9wdrw";
+       version = "2.0.21";
+       sha256 = "0npcz82l5ssbrgzr99a94nlirmfdy9z5p2k0nrk7357bawpiv7sk";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93048,15 +93194,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
-  "gi-cairo_1_0_22" = callPackage
+  "gi-cairo_1_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.22";
-       sha256 = "1kk91v31pw14jdk8q2jkhiknw7qx4pll2cljxs8ahraclinakj1r";
+       version = "1.0.23";
+       sha256 = "1y479ll6pzf5qjf18ziqgvfi6zq4jyajkq9zlggmh9pjhxpwj8nh";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -93130,8 +93276,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
-       version = "0.4.6";
-       sha256 = "0yyd6hyfzkpq2qn1bsj2gqgxk35z8ggi6rs8nnz908fcr0k1zr2m";
+       version = "0.4.7";
+       sha256 = "0av2628vylmkk566f2zbzbwygni4rawrk14yamc6m9s9rsw2scf9";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93152,8 +93298,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-dbusmenugtk3";
-       version = "0.4.7";
-       sha256 = "143xhf8d968bj5w443211vfl0vs27ygj65cdzdsidfz3vh56ms9r";
+       version = "0.4.8";
+       sha256 = "0ncn2i0bvsqsi785bjhdxr77hyxsp2dm26ihn7nxbvdkvn0mafhz";
        setupHaskellDepends = [
          base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib
          gi-gobject gi-gtk haskell-gi
@@ -93191,16 +93337,16 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gdk_3_0_21" = callPackage
+  "gi-gdk_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
-     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
+     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.21";
-       sha256 = "0lfsmq3kfcz7g16zhvz84x0vqc59ifagcbkm1vv2g0lk10j7zg5x";
+       version = "4.0.1";
+       sha256 = "1b2azv7c3c9ni9f258ag2cxy97sh8ax78v0hym0gpvrky741vqwq";
        setupHaskellDepends = [
          base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango
          haskell-gi
@@ -93210,11 +93356,11 @@ self: {
          gi-gobject gi-pango haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gtk3 ];
+       libraryPkgconfigDepends = [ gtk4 ];
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gtk3;};
+     }) {gtk4 = null;};
 
   "gi-gdkpixbuf" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
@@ -93235,15 +93381,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk-pixbuf;};
 
-  "gi-gdkpixbuf_2_0_22" = callPackage
+  "gi-gdkpixbuf_2_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.22";
-       sha256 = "1mj7h1053ib8bzgka4zfn7mxyd1m05az7l0dijw531v32378s5kq";
+       version = "2.0.23";
+       sha256 = "0jphrxqdbls3l73is1k93fizghbxgkf14q57l4w3m559vgk34anp";
        setupHaskellDepends = [
          base Cabal gi-gio gi-glib gi-gobject haskell-gi
        ];
@@ -93264,8 +93410,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkx11";
-       version = "3.0.8";
-       sha256 = "0vz26ls00m16a4mfbiw4vwmnr3plyds4wr914q5jx9xrhr3mp202";
+       version = "3.0.9";
+       sha256 = "0z3vwwpv8a85nvg2bc4cdaa8w4jmdl5mm5bxfpwmssyxcnm1xdnc";
        setupHaskellDepends = [
          base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi
        ];
@@ -93288,8 +93434,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ggit";
-       version = "1.0.7";
-       sha256 = "1x84yi4c97jg6f4spp3s1bxcm5ny310yyji5s9izkd3dzagb2kxf";
+       version = "1.0.8";
+       sha256 = "151qgcwp2spa957nr3jdb9ac35f1r1gyi2d5vzgxy8xzc3993wmq";
        setupHaskellDepends = [
          base Cabal gi-gio gi-glib gi-gobject haskell-gi
        ];
@@ -93323,15 +93469,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gio_2_0_24" = callPackage
+  "gi-gio_2_0_25" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.24";
-       sha256 = "0f49a3bqv0izwz9pbc9yxb5ysg8hwjmw85qjyfzsqndanmjsrlrz";
+       version = "2.0.25";
+       sha256 = "0w42ls035a69c2wyf050zvqxwyql3ln3ifwn9k4m187icj345qnz";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93350,8 +93496,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.21";
-       sha256 = "15i5p1s8qj5f2m6kf69xzjndisgbi5184vya88py1b12284klvrv";
+       version = "1.0.22";
+       sha256 = "1m7gnam8a46zbbnxgcszv1wn8zgzdrpki6k3fgy5xjnb4gp5pvpj";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93383,15 +93529,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-glib_2_0_22" = callPackage
+  "gi-glib_2_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.22";
-       sha256 = "0wb494n9zci7kchw3043108rmdymycj0rkv83gib7l01gilpgjjl";
+       version = "2.0.23";
+       sha256 = "1wsix558lj58i8mdwikb2q78941dxl3pchhd75xkk5hq8rknp37x";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -93422,15 +93568,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gobject_2_0_21" = callPackage
+  "gi-gobject_2_0_22" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.21";
-       sha256 = "0il4z77wm6njilqx2jjjkldlgp0fk9m5lwwhfnalqasb7h2i90mn";
+       version = "2.0.22";
+       sha256 = "0c1ia60793dly5y5xd2s1qs5a37f0r3jypzc21r0yswgqdlsi7g6";
        setupHaskellDepends = [ base Cabal gi-glib haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi haskell-gi-base
@@ -93442,6 +93588,49 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
+  "gi-graphene" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-graphene";
+       version = "1.0.1";
+       sha256 = "04aiq9zqjxaky48j57nakx0alhc9j1g6ydki7fww7r4jajmf6pjv";
+       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ graphene-gobject ];
+       description = "Graphene bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {graphene-gobject = null;};
+
+  "gi-gsk" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdk, gi-glib, gi-gobject, gi-graphene, gi-pango, gtk4
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gsk";
+       version = "4.0.1";
+       sha256 = "0645dyifg6d3x03zrzf2andfah32s878rcyqzw891prn2dvga3nx";
+       setupHaskellDepends = [
+         base Cabal gi-cairo gi-gdk gi-glib gi-gobject gi-graphene gi-pango
+         haskell-gi
+       ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdk gi-glib gi-gobject
+         gi-graphene gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk4 ];
+       description = "Gsk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {gtk4 = null;};
+
   "gi-gst" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gstreamer, haskell-gi, haskell-gi-base
@@ -93449,8 +93638,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.21";
-       sha256 = "1nj1iyhfvi3a5mwkr4x0gn26bykdjdam3gwsl1hkbg21zvjkd087";
+       version = "1.0.22";
+       sha256 = "0qicgvy9wm1xs5y6fda8sxdilwfg2y6albdqy3jg2n5qn7c9p0f6";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93470,8 +93659,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.20";
-       sha256 = "09v36n019ka4nj65x082gkg2j4r3q0ibvrcq5p6ka7kq8rhfxhx0";
+       version = "1.0.21";
+       sha256 = "0zrcplkd0hfdfvwq7gbg8wyvsk2an8k5yj342adq1ar0zgfh064n";
        setupHaskellDepends = [
          base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
        ];
@@ -93493,8 +93682,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.21";
-       sha256 = "03awzmc62hw1nmw0b3xczmxmk5drrlhq0clh7lhxlj1r1nzq2ack";
+       version = "1.0.22";
+       sha256 = "1y7hf5kcm4kj185glb298zr6x39m61hvqrdwskk9043nrd8ifcxx";
        setupHaskellDepends = [
          base Cabal gi-glib gi-gobject gi-gst haskell-gi
        ];
@@ -93517,8 +93706,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstpbutils";
-       version = "1.0.20";
-       sha256 = "10kbk7mk829xc0rkzzhpz53v39xfl5f6my1smjdqdwdnxxgcsl5w";
+       version = "1.0.21";
+       sha256 = "15kg01g8cgaw98khf6nrr9sjbfss3a3d43g9zgbbv5h5qnzvjazb";
        setupHaskellDepends = [
          base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag
          gi-gstvideo haskell-gi
@@ -93542,8 +93731,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gsttag";
-       version = "1.0.20";
-       sha256 = "1jhly2jhfy2a79maj4x2p7idqr1f82znizfimkyvdnf8rbrr1h3h";
+       version = "1.0.21";
+       sha256 = "061xy3vx41pgyyg6mcbc7saj50n5zwfc72l8dw54kgv09vykp7ji";
        setupHaskellDepends = [
          base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
        ];
@@ -93565,8 +93754,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.21";
-       sha256 = "05sv1an6za2ywxh6dzy4d79g1dm0jyypqkhz40g0pk5kxvgi4gkm";
+       version = "1.0.22";
+       sha256 = "0fr9pfcfsjajl5cd6p05a4kp83acmllzzdm0kc2nxnr0kmjifi5v";
        setupHaskellDepends = [
          base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi
        ];
@@ -93604,31 +93793,31 @@ self: {
        broken = true;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gtk_3_0_31" = callPackage
+  "gi-gtk_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-pango, gtk3, haskell-gi, haskell-gi-base
+     , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.31";
-       sha256 = "00bfy8hn56cm5zm005vdnwwzsw5bzangipxv47n01jp4ksn3wdpx";
+       version = "4.0.1";
+       sha256 = "1brn4pyjvnc00bwqwf3d77dhbiknak5yjqs9xyk9mknw2pb98ppv";
        setupHaskellDepends = [
          base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi
+         gi-gobject gi-graphene gi-gsk gi-pango haskell-gi
        ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
+         gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gtk3 ];
+       libraryPkgconfigDepends = [ gtk4 ];
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) gtk3;};
+     }) {gtk4 = null;};
 
   "gi-gtk-declarative" = callPackage
     ({ mkDerivation, async, base, data-default-class, gi-gdk, gi-glib
@@ -93694,15 +93883,15 @@ self: {
        broken = true;
      }) {};
 
-  "gi-gtk-hs_0_3_7_0" = callPackage
+  "gi-gtk-hs_0_3_8_0" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
      , text, transformers
      }:
      mkDerivation {
        pname = "gi-gtk-hs";
-       version = "0.3.7.0";
-       sha256 = "0z64avmb13k7cvps51xj6j3jrxsdnqnpkh9038lm68vkkadv2dag";
+       version = "0.3.8.0";
+       sha256 = "0cpykq24fjpidxb1hh6qi74xv5lh6nrz8q1l4iqy8jx26qlzri5l";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -93720,17 +93909,16 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtkosxapplication";
-       version = "2.0.16";
-       sha256 = "11wfmvjgl6lmmdanz5jmmvf4289c9jiylxfn006shc4pby7ay6i8";
-       revision = "1";
-       editedCabalFile = "1fixrfjmqqrik38fl90h4f3lh34g6zilscibq9r9x1j8d33qmin4";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
+       version = "2.0.17";
+       sha256 = "1h6j61wg9krvd3kqbkafd90vk534hhz9mrlvj2h182f5kp5rybl8";
+       setupHaskellDepends = [
+         base Cabal gi-gdkpixbuf gi-gobject gi-gtk haskell-gi
+       ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk
          haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
-       doHaddock = false;
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93761,7 +93949,7 @@ self: {
        broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
-  "gi-gtksource_3_0_21" = callPackage
+  "gi-gtksource_3_0_22" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
@@ -93769,8 +93957,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.21";
-       sha256 = "1y64hlcpy536x053p7xkhm6jgb7ahhj0zkgzgf962d8mqadaqzr0";
+       version = "3.0.22";
+       sha256 = "08b3ffjdgyr5xapx37kkwx3z8fsd42ydvdwk3nvh2ysfq9q86cjh";
        setupHaskellDepends = [
          base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-gtk gi-pango haskell-gi
@@ -93795,8 +93983,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-handy";
-       version = "0.0.5";
-       sha256 = "1a4ihmmqx82gmyn0lhwqcpijswciqjxq7dl17vbgycpvzabhpvyl";
+       version = "0.0.6";
+       sha256 = "134dspf2vhwl76g25mjjj3gmdis748qg3rschmypd9w4zr2l651w";
        setupHaskellDepends = [
          base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk
          haskell-gi
@@ -93834,15 +94022,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
-  "gi-javascriptcore_4_0_20" = callPackage
+  "gi-javascriptcore_4_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.20";
-       sha256 = "0n8aiazjsh74f8k2nbjia619401pwackdxmnb2chzpsqad9kqxrh";
+       version = "4.0.21";
+       sha256 = "0zl2lanysqir9qhndai7v4yp6sq671115mi5k9q58rwkmvkm6w04";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93861,8 +94049,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.20";
-       sha256 = "0dr9zs6j3cbdxfd6ja2d5ch87scrqlnzp4xlj1dx6inwnhl150yq";
+       version = "0.7.21";
+       sha256 = "13ifi60jlfm9jypf6gam224s5rgq2kd1cj98wfl1dg9crahghbls";
        setupHaskellDepends = [
          base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi
        ];
@@ -93884,8 +94072,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.11";
-       sha256 = "0gwxdc4rddndvnw1izwapvi926dl6v0ljpp5504k67a8kszaycx0";
+       version = "1.0.12";
+       sha256 = "0j7nd4ylz4whnsdfbn6ra7kvvnx6l6bqv2y57rgk1nnac3cc6201";
        setupHaskellDepends = [
          base Cabal gi-gio gi-glib gi-gobject haskell-gi
        ];
@@ -93924,15 +94112,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
-  "gi-pango_1_0_21" = callPackage
+  "gi-pango_1_0_22" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.21";
-       sha256 = "1adlwkwqlqnck3fq601my22iqh9lbvjy4vvy5zbmcs942j3lj691";
+       version = "1.0.22";
+       sha256 = "09dz13wai7cyp24vhc6wxyyg2g89dsqq40r80j56xgpyvfki8yf2";
        setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -93956,8 +94144,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.22";
-       sha256 = "09axv2wn686xwsdmrh2v71j8p0qkchvws30aamkzcdclbfwxa3aw";
+       version = "1.0.23";
+       sha256 = "0la2ga1hprwm4fnia48y0q1cg8il0aq42nwvaj5gndx6id42a1i6";
        setupHaskellDepends = [
          base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi
        ];
@@ -93983,8 +94171,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.20";
-       sha256 = "1jkzrrzdkn60akiijyzbq5sf0digawrzxm556dirxcjksh829zby";
+       version = "0.18.21";
+       sha256 = "1mfi3yn7yrwg2cdpqp0av4cabmmqpmm2hywsrm5d78cxix4z1s7f";
        setupHaskellDepends = [
          base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi
        ];
@@ -94006,8 +94194,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-secret";
-       version = "0.0.10";
-       sha256 = "1ylgn8yvrksf8swk1gw6n8kw0dqvr92l9fj4jzxzpskfrmgk82ln";
+       version = "0.0.11";
+       sha256 = "1s3vwy0aff4m1rvkbcvfa4zwbbalaiz46ij3ymmsx319v2mwwiib";
        setupHaskellDepends = [
          base Cabal gi-gio gi-glib gi-gobject haskell-gi
        ];
@@ -94029,8 +94217,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "2.4.21";
-       sha256 = "01zqzp4mpwkg3cfgx91harjds3bbxs0giqr4lly9z37ksbr2siv0";
+       version = "2.4.22";
+       sha256 = "0vgvcq9nysw9xfyjddi1qzngw7pfrfx4g1f3zngf56jcvxf8q6rw";
        setupHaskellDepends = [
          base Cabal gi-gio gi-glib gi-gobject haskell-gi
        ];
@@ -94068,7 +94256,7 @@ self: {
        broken = true;
      }) {vte_291 = pkgs.vte;};
 
-  "gi-vte_2_91_24" = callPackage
+  "gi-vte_2_91_25" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
@@ -94076,8 +94264,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.24";
-       sha256 = "1grqallhd1sklcmfhrrmjisj5yp9znx1yqzdn3v5awldjcj54025";
+       version = "2.91.25";
+       sha256 = "0h6kqbbdr7zgpq6sfqs2pfx99c7wj1aabpzna9fryn6zhaha8j3c";
        setupHaskellDepends = [
          base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango
          haskell-gi
@@ -94125,8 +94313,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.24";
-       sha256 = "1sxn9v361bp0arl3mq3dg9k1igaf9gcwxx0p7xlwqvqabgs4nr2q";
+       version = "4.0.25";
+       sha256 = "1xg4xy24nnz0ngv46m58jkmaka72nv4954g03f6ixpvwappim0vm";
        setupHaskellDepends = [
          base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk
          gi-javascriptcore gi-soup haskell-gi
@@ -94150,8 +94338,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.23";
-       sha256 = "073rkgfp120ccabxk7nh72p3h7qs7b9qaqr3d1wlcb18grhnvyl4";
+       version = "4.0.24";
+       sha256 = "0lnf173c6myrswk0kdnwkhs925imvcpyvpmy50krqljnv6f2ksxn";
        setupHaskellDepends = [
          base Cabal gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup
          haskell-gi
@@ -94175,8 +94363,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-wnck";
-       version = "3.0.6";
-       sha256 = "10x5ijcbxvgbrzi4l7mjx336q83kz1kmayan7kpa46zimvj8vn6g";
+       version = "3.0.7";
+       sha256 = "02kgbp3h5ny7y0qmddsfng0a1gqpdmadl6yy45hmk98ws02rk9bx";
        setupHaskellDepends = [
          base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi
        ];
@@ -94199,8 +94387,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-xlib";
-       version = "2.0.7";
-       sha256 = "0rcl4wxnghlbyc2ddf131pm7wkj2psjzbqfhgv92av3kvz9y513z";
+       version = "2.0.8";
+       sha256 = "0gixgql24zx04sph7kn4n5gmgmz5xbw2f15mqfw0i5igad2pvsj3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -95173,19 +95361,24 @@ self: {
      }) {};
 
   "githud" = callPackage
-    ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, unix
+    ({ mkDerivation, base, bytestring, daemons, data-default, directory
+     , mtl, network, parsec, process, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, unix, utf8-string
      }:
      mkDerivation {
        pname = "githud";
-       version = "2.1.0";
-       sha256 = "19j0vy427n3rzi1nfmh7kjn8jj1ji3xrbrs957hyns9sy4wwrfly";
+       version = "3.0.0";
+       sha256 = "1zr7d5h0x1fsnwb2pg9vn34ir0m144h1vnlh0avickazz2ljx2xr";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mtl parsec process text unix ];
+       libraryHaskellDepends = [
+         base bytestring daemons data-default directory mtl network parsec
+         process text unix utf8-string
+       ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         base daemons mtl parsec tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
        ];
        description = "More efficient replacement to the great git-radar";
        license = stdenv.lib.licenses.bsd3;
@@ -108253,7 +108446,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
-  "haskell-gi_0_22_6" = callPackage
+  "haskell-gi_0_23_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobject-introspection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -108261,8 +108454,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.22.6";
-       sha256 = "0m1ixnxv1vq2ywnvf9fihipn81ka1ixbgga4fsmgmk9hl1ai48mm";
+       version = "0.23.0";
+       sha256 = "04d2lxmbbq7g0yrc5rz9n7zscza9g63vvbz0qv3427y7hbq1xn4a";
        libraryHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath
          haskell-gi-base mtl pretty-show process regex-tdfa safe text
@@ -108287,12 +108480,12 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_22_2" = callPackage
+  "haskell-gi-base_0_23_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.22.2";
-       sha256 = "0rv46x4xgsdk25s1vd3zm95cjgc5vy4rwsbaxk1hyc5ga5qjyzx0";
+       version = "0.23.0";
+       sha256 = "1f22d4pvmyy52w9hqa36b6psw34j562rayqgk052ng1ax9yvwzn0";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -146446,8 +146639,8 @@ self: {
        pname = "lens";
        version = "4.17.1";
        sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7";
-       revision = "1";
-       editedCabalFile = "1zknh9h72qzszwrz9h25c5ssdr2pv5z67w6kv526sk1y8rnrbxk1";
+       revision = "2";
+       editedCabalFile = "1bh868l69nisdhw8qw5y51nj2w0pbbq7mxqiwf42iq0vcb6h0ybv";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -149888,13 +150081,15 @@ self: {
      }) {};
 
   "list-witnesses" = callPackage
-    ({ mkDerivation, base, decidable, profunctors, singletons, vinyl }:
+    ({ mkDerivation, base, decidable, microlens, profunctors
+     , singletons, vinyl
+     }:
      mkDerivation {
        pname = "list-witnesses";
-       version = "0.1.1.0";
-       sha256 = "16dlyk9hxz5fbsj726w1sgindryhyhsgvhs37zqygwmfzvqdbasd";
+       version = "0.1.1.1";
+       sha256 = "13h5gckpysf4p5wjfnq7l5v66rmxi3i9cmykf18ld3hnilgd7wa7";
        libraryHaskellDepends = [
-         base decidable profunctors singletons vinyl
+         base decidable microlens profunctors singletons vinyl
        ];
        description = "Witnesses for working with type-level lists";
        license = stdenv.lib.licenses.bsd3;
@@ -151255,20 +151450,19 @@ self: {
   "log4hs" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, directory
      , filepath, hspec, hspec-core, process, QuickCheck
-     , template-haskell, text, time, unordered-containers
+     , template-haskell, text, time
      }:
      mkDerivation {
        pname = "log4hs";
-       version = "0.0.2.0";
-       sha256 = "08z8lyh0q4wpxvvzbf1w0bxvbm90ic4wzxyac2b0ddm4zn8zdn9s";
+       version = "0.0.3.0";
+       sha256 = "0bbl1cfa85dr1kxiikykh32x0141bkgfabvkjp37m52sv3vs9mvi";
        libraryHaskellDepends = [
          aeson base containers data-default directory filepath
-         template-haskell text time unordered-containers
+         template-haskell text time
        ];
        testHaskellDepends = [
          aeson base containers data-default directory filepath hspec
          hspec-core process QuickCheck template-haskell text time
-         unordered-containers
        ];
        description = "A python logging style log library";
        license = stdenv.lib.licenses.bsd3;
@@ -156037,14 +156231,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mbox-utility_0_0_3" = callPackage
+  "mbox-utility_0_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, hsemail, non-empty, parsec
      , spreadsheet, time, utility-ht
      }:
      mkDerivation {
        pname = "mbox-utility";
-       version = "0.0.3";
-       sha256 = "1y24y0n81f0v9c9829y4va22h42n0wmjndaj1d15n07xvhn4xdps";
+       version = "0.0.3.1";
+       sha256 = "0vh9ibh4g3fssq9jfzrmaa56sk4k35r27lmz2xq4fhc62fmkia92";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -161349,6 +161543,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-validate" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, exceptions, hspec
+     , monad-control, mtl, scientific, text, transformers
+     , transformers-base, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "monad-validate";
+       version = "1.0.0.0";
+       sha256 = "0d2r54jhy5zkjph57f85syw6g0fmvj3csas8ki2hg7lfiqj6yq4q";
+       revision = "1";
+       editedCabalFile = "0zdxr266655w77zgzfqiw2aij64rhlys310c38myq1g6vgcxlbc2";
+       libraryHaskellDepends = [
+         base exceptions monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base exceptions hspec monad-control mtl scientific
+         text transformers transformers-base unordered-containers vector
+       ];
+       description = "A monad transformer for data validation";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "monad-var" = callPackage
     ({ mkDerivation, base, base-compat, stm }:
      mkDerivation {
@@ -166866,8 +167082,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider";
-       version = "0.3.1.1";
-       sha256 = "0p0vwj438mbiwjgn7sqf3cb4bl48ygwi8n61wap9a9nc6fwrjmi8";
+       version = "0.3.2.0";
+       sha256 = "0b9k2gxb9nmjd59pcz7x8jrk2vycf8jk448ifpfc9spk6ylkh4gh";
        libraryHaskellDepends = [
          aeson base containers data-interval extended-reals greskell
          greskell-websocket hashable monad-logger safe-exceptions scientific
@@ -166880,6 +167096,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "net-spider-cli" = callPackage
+    ({ mkDerivation, aeson, base, doctest, doctest-discover
+     , greskell-core, hashable, hspec, net-spider, optparse-applicative
+     , text
+     }:
+     mkDerivation {
+       pname = "net-spider-cli";
+       version = "0.1.0.1";
+       sha256 = "1qfzdfkiri3v344mk5zkc8mhxig3xmplcbw8382hkhsdmy4ny4ga";
+       libraryHaskellDepends = [
+         aeson base greskell-core hashable net-spider optparse-applicative
+         text
+       ];
+       testHaskellDepends = [
+         base doctest doctest-discover hspec net-spider optparse-applicative
+       ];
+       description = "CLI option parsers for NetSpider objects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "net-spider-pangraph" = callPackage
     ({ mkDerivation, base, bytestring, doctest, doctest-discover
      , greskell, hspec, net-spider, pangraph, text, time
@@ -191862,8 +192098,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-arbitrary-template";
-       version = "0.2.0.0";
-       sha256 = "1bn0g3gg7cpjwap1vgvahw91yjn0v8sy1hiy60w54gdg5rrll5j9";
+       version = "0.2.1.0";
+       sha256 = "1g9b39bhjcx44l8mwj5hwbjkd575prd46v16jz895q4f3ibqnfvp";
        libraryHaskellDepends = [ base QuickCheck safe template-haskell ];
        testHaskellDepends = [
          base QuickCheck safe tasty tasty-golden tasty-hunit
@@ -196459,16 +196695,18 @@ self: {
      }) {};
 
   "reflex-dom-helpers" = callPackage
-    ({ mkDerivation, base, reflex, reflex-dom, template-haskell }:
+    ({ mkDerivation, base, reflex, reflex-dom-core, template-haskell
+     , text
+     }:
      mkDerivation {
        pname = "reflex-dom-helpers";
-       version = "0.1.0.0";
-       sha256 = "0fzvw9wd8465a0i0qnvnqngfs2fql13skxsrr9m1qivr3n3h7jhi";
+       version = "0.2.0.1";
+       sha256 = "1c0sa8i4rln7whmivmwlmivrj8zc45v25zsi1qwqx5d00mjbmkyk";
        libraryHaskellDepends = [
-         base reflex reflex-dom template-haskell
+         base reflex reflex-dom-core template-haskell text
        ];
        testHaskellDepends = [ base ];
-       description = "Element tag helpers for working with reflex-dom";
+       description = "Html tag helpers for reflex-dom";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -196609,6 +196847,29 @@ self: {
        broken = true;
      }) {};
 
+  "reflex-vty" = callPackage
+    ({ mkDerivation, base, bimap, containers, data-default
+     , dependent-map, dependent-sum, exception-transformers, mtl
+     , primitive, ref-tf, reflex, stm, text, time, transformers, vty
+     }:
+     mkDerivation {
+       pname = "reflex-vty";
+       version = "0.1.1.0";
+       sha256 = "1nhi33d0yqx2pjccrcbsgwp2l56sdmqpl11vpvkvx4wkxckyz2qf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bimap containers data-default dependent-map dependent-sum
+         exception-transformers mtl primitive ref-tf reflex stm text time
+         transformers vty
+       ];
+       executableHaskellDepends = [
+         base containers reflex text time transformers vty
+       ];
+       description = "Reflex FRP host and widgets for vty applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reform" = callPackage
     ({ mkDerivation, base, containers, mtl, semigroups, text }:
      mkDerivation {
@@ -210787,8 +211048,8 @@ self: {
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "2.0.2";
-       sha256 = "1cmn5y72wp9dlzqzrv4rmfb1zm3zw517la0kf0vgyv3nhsn58397";
+       version = "2.1.0";
+       sha256 = "139sqr50bba74h2r6gdivzsgkqjwq1gcah54zw2jkwzhlfk03fm1";
        libraryHaskellDepends = [
          array base bytestring containers deepseq invertible-grammar
          prettyprinter recursion-schemes scientific semigroups text
@@ -218776,6 +219037,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "speculate_0_4_0" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, express, leancheck }:
+     mkDerivation {
+       pname = "speculate";
+       version = "0.4.0";
+       sha256 = "12h4lci5547fb1g21xh3fbq1d7fmn3w54ppqdnh8h35aa0jqw9hl";
+       libraryHaskellDepends = [
+         base cmdargs containers express leancheck
+       ];
+       testHaskellDepends = [ base express leancheck ];
+       benchmarkHaskellDepends = [ base express leancheck ];
+       description = "discovery of properties about Haskell functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "speculation" = callPackage
     ({ mkDerivation, base, ghc-prim, stm, transformers }:
      mkDerivation {

From 4201da90e891242b98189669d193b69da33cd0a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Aug 2019 07:54:18 +0200
Subject: [PATCH 254/562] all-cabal-hashes: update to Hackage at
 2019-07-07T09:46:56Z

---
 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 0eb3dbefe41..eeee8d56664 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/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz";
-  sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4db96602103463d72e59ce214d0da8af35405f07.tar.gz";
+  sha256 = "14r7m3555ngfafk2wgdj4lnv7zzajcc4j4fiws4k3kr3xwbrwrxr";
 }

From 3bfd09b76dac9702feb1b3fc912f9d9f5cd65123 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 23:04:42 -0700
Subject: [PATCH 255/562] picard-tools: 2.20.3 -> 2.20.4

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

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index d58b4bf8c4d..70c72779c52 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.20.3";
+  version = "2.20.4";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0qgj062c983w6qlgfkj6in5cl5rmvpak7rdwmjg2gv972kcfs7lp";
+    sha256 = "1z2zpwqhk8i7l9awajdrzxwij0vcmkwq7rajzjil7n65apj2hz9i";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b3a44e1214397b5524672b626f9c74711e16e981 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 19:19:25 -0700
Subject: [PATCH 256/562] osinfo-db: 20190611 -> 20190726

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

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 19872bef7fe..39cdd29c94b 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osinfo-db";
-  version = "20190611";
+  version = "20190726";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h";
+    sha256 = "0kcdq8g324a368bqvki718ms5kdcc3dzfmpgzyxwl0mkxbmhmirr";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From 924108c5bff3d3e71a174959330800381ba9a42e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 23:47:57 -0700
Subject: [PATCH 257/562] python37Packages.BTrees: 4.5.1 -> 4.6.0

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

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 665d5347bba..828e243af9c 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "BTrees";
-  version = "4.5.1";
+  version = "4.6.0";
 
   buildInputs = [ transaction ];
   propagatedBuildInputs = [ persistent zope_interface ];
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786";
+    sha256 = "0bmkpg6z5z47p21340nyrfbdv2jkfp80yv085ndgbwaas1zi7ac9";
   };
 
   meta = with stdenv.lib; {

From 95eccc43c35bb13b004d44838a354c782524628d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 23:50:46 -0700
Subject: [PATCH 258/562] python37Packages.azure-mgmt-keyvault: 1.1.0 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 3b786cbf760..b640f7eef0c 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-keyvault";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "05a15327a922441d2ba32add50a35c7f1b9225727cbdd3eeb98bc656e4684099";
+    sha256 = "057ii54h8yr7rhfnbl0r29xbsg7mhf031hjffmdv0zf93552kmja";
   };
 
   propagatedBuildInputs = [

From 27106f3211f2c2834d4c8dd7ea9817086ffa2024 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 23:58:40 -0700
Subject: [PATCH 259/562] python37Packages.azure-batch: 6.0.1 -> 7.0.0

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

diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix
index 35ba2d25d5a..8297c67b90d 100644
--- a/pkgs/development/python-modules/azure-batch/default.nix
+++ b/pkgs/development/python-modules/azure-batch/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "azure-batch";
-  version = "6.0.1";
+  version = "7.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "d5b0de3db0058cd69baf30e059874094abf865e24ccd82e3cd25f3a48b9676d1";
+    sha256 = "1q8mdjdbz408z2j0y1zxqg9zg8j1v84p0dnh621vq73a2x1g298j";
   };
 
   propagatedBuildInputs = [

From 2f85d3591f75aa3d5fb9f9ff5b5e98d6a3844f20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 00:01:23 -0700
Subject: [PATCH 260/562] python37Packages.biopython: 1.73 -> 1.74

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

diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index beb03c894be..e60d4c60aea 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/pkgs/development/python-modules/biopython/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "biopython";
-  version = "1.73";
+  version = "1.74";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q55jhf76z3k6is3psis0ckbki7df26x7dikpcc3vhk1vhkwribh";
+    sha256 = "1h4hcpx1vqrcddpcznyxy14zzvy2yanlkz0117w5n869w8djq595";
   };
 
   propagatedBuildInputs = [ numpy ];

From 8d8c82dc14ca681a964acea798f641549d8f83f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 00:25:50 -0700
Subject: [PATCH 261/562] python37Packages.asgiref: 3.1.4 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 84c157e1bcd..0e779a284df 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
 buildPythonPackage rec {
-  version = "3.1.4";
+  version = "3.2.0";
   pname = "asgiref";
 
   disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "0rmasjrvf083c7855xnggy251gm8vaxyv970b2rd6198h8s3rldh";
+    sha256 = "1rzglzdf0v9gcmjmrb7h843z1kcmz1pbbn1h40h8a7b910gxvq82";
   };
 
   propagatedBuildInputs = [ async-timeout ];

From 6aef4e92fb16fd2d28f999611a256aa1c41a2658 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 00:46:11 -0700
Subject: [PATCH 262/562] python37Packages.azure-mgmt-eventgrid: 2.0.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index 8887a8b2776..93f3006966c 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-eventgrid";
-  version = "2.0.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "9a1da1085d39163b13dee14215b02f18eab93ede10ffe83dc6030ecf2163d2f1";
+    sha256 = "1hqwcl33r98lriz3fp6h8ir36bv9danx27290idv63fj7s95h866";
   };
 
   propagatedBuildInputs = [

From 49f6c9bbb09e6b94c0a4c06d863003ca3a308989 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 00:56:25 -0700
Subject: [PATCH 263/562] python37Packages.asyncssh: 1.17.0 -> 1.17.1

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

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 42335a0393f..ba94e395f67 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "1.17.0";
+  version = "1.17.1";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qrpkdyl77956qg6g7g66bbd6bfvb2nwi2sjy3v3li8m3irx8d7d";
+    sha256 = "0gyqms4zs9j9k7dgy24va4w42vf20x75yx9jvsds0sg42mqlkd5v";
   };
 
   patches = [

From 73e4865e87eecb1f3da1d884dd50300264b80d4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 00:58:53 -0700
Subject: [PATCH 264/562] python37Packages.azure-mgmt-monitor: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 0a6f045dc4b..3233e9bc00e 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-monitor";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "5a804dae2c3e31bfd6f1b0482d49761b9a56f7eefa9b190cd76ef5fe1d504ef2";
+    sha256 = "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2";
   };
 
   propagatedBuildInputs = [

From fbf5a794d5e8891bd6489aa861451b290e9ff352 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 5 Aug 2019 10:02:38 +0200
Subject: [PATCH 265/562] dbeaver: 6.1.3 -> 6.1.4

---
 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 3e1a87a641b..82d77b65f66 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "6.1.3";
+  version = "6.1.4";
 
   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 = "1ngfypx0wbq98rv791zls07h46rnj69qixpslw0xn9bb3ky4snbf";
+    sha256 = "1l4skcannbzddhm773dm3hwv3a7b3xy569gydcfczgdlgzgmlfjq";
   };
 
   installPhase = ''

From 3299c2eef5e9d696d1025bd9e0de91da9be2923a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 01:15:40 -0700
Subject: [PATCH 266/562] python37Packages.azure-mgmt-signalr: 0.1.1 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index d1671e02ec1..5751bfb042c 100644
--- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-signalr";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "8a6266a59a5c69102e274806ccad3ac74b06fd2c226e16426bbe248fc2174903";
+    sha256 = "0k39hf6r2rfy2wyxd9czha2mwmcqf6sc1v69jyh6ml3slbliivlz";
   };
 
   propagatedBuildInputs = [

From e7c0323f75fe7c259ed1c4f2c34a66559a21ab09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 01:18:16 -0700
Subject: [PATCH 267/562] python37Packages.azure-mgmt-dns: 2.1.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index 6f802eb6144..55b5633cfe9 100644
--- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-dns";
-  version = "2.1.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "3730b1b3f545a5aa43c0fff07418b362a789eb7d81286e2bed90ffef88bfa5d0";
+    sha256 = "0zxkcczf01b64qfwj98jqdvnwqahygcyccf37rcxpdcfgpkg9kbf";
   };
 
   propagatedBuildInputs = [

From 2b07800798654b0a0a0dabd160d5ebb934e93799 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Mon, 5 Aug 2019 08:32:21 +0000
Subject: [PATCH 268/562] pgcli: 2.0.2 -> 2.1.1

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

diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 31ffff3804f..632e4e80bf0 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pgcli";
-  version = "2.0.2";
+  version = "2.1.1";
 
   # Python 2 won't have prompt_toolkit 2.x.x
   # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408

From c72fff2e030d843cd6d50a34ced4ec3c85d2cef3 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Mon, 5 Aug 2019 08:33:42 +0000
Subject: [PATCH 269/562] Revert "pgcli: 2.0.2 -> 2.1.1"

This reverts commit 2b07800798654b0a0a0dabd160d5ebb934e93799.
---
 pkgs/development/tools/database/pgcli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 632e4e80bf0..31ffff3804f 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pgcli";
-  version = "2.1.1";
+  version = "2.0.2";
 
   # Python 2 won't have prompt_toolkit 2.x.x
   # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408

From 016cc8e7901c75250bb736f5cdc1f447c565923e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 01:38:16 -0700
Subject: [PATCH 270/562] python2Packages.ase: freeze at 3.17

---
 pkgs/development/python-modules/ase/3.17.nix | 36 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix           |  5 ++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/ase/3.17.nix

diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix
new file mode 100644
index 00000000000..3a466170c77
--- /dev/null
+++ b/pkgs/development/python-modules/ase/3.17.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, numpy
+, scipy
+, matplotlib
+, flask
+, pillow
+, psycopg2
+}:
+
+buildPythonPackage rec {
+  pname = "ase";
+  version = "3.17.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
+  };
+
+  propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
+
+  checkPhase = ''
+    $out/bin/ase test
+  '';
+
+  # tests just hang most likely due to something with subprocesses and cli
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Atomic Simulation Environment";
+    homepage = https://wiki.fysik.dtu.dk/ase/;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0896322e510..224075a528e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -183,7 +183,10 @@ in {
 
   asciitree = callPackage ../development/python-modules/asciitree { };
 
-  ase = callPackage ../development/python-modules/ase { };
+  ase = if isPy27 then
+          callPackage ../development/python-modules/ase/3.17.nix { }
+        else
+          callPackage ../development/python-modules/ase { };
 
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
 

From 0a643dd96d7394d4b589c2ce113ded404d9767a3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 5 Aug 2019 01:42:43 -0700
Subject: [PATCH 271/562] python3Packages.ase: 3.17.0 -> 3.18.0

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

diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index 3a466170c77..643bafe617a 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -1,6 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
+, isPy27
 , numpy
 , scipy
 , matplotlib
@@ -11,11 +12,12 @@
 
 buildPythonPackage rec {
   pname = "ase";
-  version = "3.17.0";
+  version = "3.18.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g";
+    sha256 = "1ycp1yksysiiz902gn762030sfmirxm950pwpw2rcrpjvq95zm1r";
   };
 
   propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];

From 466fe8690cbab923ac8160e3e24f6d524a36039f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 01:53:17 -0700
Subject: [PATCH 272/562] python37Packages.apprise: 0.7.8 -> 0.7.9

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

diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index e067504987d..7b8885de169 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -1,21 +1,21 @@
 { lib, buildPythonPackage, fetchPypi
-, Babel, decorator, requests, requests_oauthlib, oauthlib, urllib3, six, click, markdown, pyyaml
+, Babel, decorator, requests, requests_oauthlib, six, click, markdown, pyyaml
 , pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox
 }:
 
 buildPythonPackage rec {
   pname = "apprise";
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15xv7lhivjhgsaw5j30w1fkk8y33r8nkr2hwp8z1jmsxhdv9l03y";
+    sha256 = "0zqnk255d311ibird08sv0c21fw1r1xhldhyx5lnl3ji1xkv9173";
   };
 
   nativeBuildInputs = [ Babel ];
 
   propagatedBuildInputs = [
-    decorator requests requests_oauthlib oauthlib urllib3 six click markdown pyyaml
+    decorator requests requests_oauthlib six click markdown pyyaml
   ];
 
   checkInputs = [

From 67d5ba2f4520f4ac6db35df61f44f21e1d199c8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 02:08:51 -0700
Subject: [PATCH 273/562] python37Packages.cfgv: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix
index f9eda427963..2487caea608 100644
--- a/pkgs/development/python-modules/cfgv/default.nix
+++ b/pkgs/development/python-modules/cfgv/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cfgv";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zn3nc7cyfsvg9gp7558656n2sn1m01j30l79ci22ibgvq4vxv9j";
+    sha256 = "0i1iam461bd6bphd402r7payr2m71xivy5zp6k2gjnv67fa8gczd";
   };
 
   propagatedBuildInputs = [ six ];

From bc1417c5578002a8349f04329a9510f643b24500 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Jul 2019 06:40:34 +0000
Subject: [PATCH 274/562] coqPackages.flocq: 3.1.0 -> 3.2.0

Ensures compatibility with Coq 8.10
---
 pkgs/development/coq-modules/flocq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 09fbd580845..6e2ec3626fb 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -2,9 +2,9 @@
 
 let params =
   if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
-    version = "3.1.0";
-    uid = "37901";
-    sha256 = "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c";
+    version = "3.2.0";
+    uid = "38103";
+    sha256 = "1snvzyyj6l1fv7nb70x5w8rjnhk483g9x8gszl9ls8qn2gd35fs0";
   } else {
     version = "2.6.1";
     uid = "37454";
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ];
   };
 }

From 5b0fdad5dfa736dfe06932fe537d188d4b29a505 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 31 Jul 2019 09:40:10 +0000
Subject: [PATCH 275/562] coqPackages.flocq: fetch sources from gitlab

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

diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 6e2ec3626fb..d9ad7d6e3be 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, bash, which, autoconf, automake, fetchurl, coq }:
+{ stdenv, bash, which, autoconf, automake, fetchzip, coq }:
 
 let params =
   if stdenv.lib.versionAtLeast coq.coq-version "8.7" then {
     version = "3.2.0";
-    uid = "38103";
-    sha256 = "1snvzyyj6l1fv7nb70x5w8rjnhk483g9x8gszl9ls8qn2gd35fs0";
+    sha256 = "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l";
   } else {
     version = "2.6.1";
-    uid = "37454";
-    sha256 = "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin";
+    sha256 = "1y4czkfrd8p37vwv198nns4hz1brfv71na17pxsidwpxy7qnyfw1";
   }
 ; in
 
@@ -17,8 +15,8 @@ stdenv.mkDerivation rec {
   name = "coq${coq.coq-version}-flocq-${version}";
   inherit (params) version;
 
-  src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/flocq-${version}.tar.gz";
+  src = fetchzip {
+    url = "https://gitlab.inria.fr/flocq/flocq/-/archive/flocq-${version}.tar.gz";
     inherit (params) sha256;
   };
 

From 955c2b8a5f6508e91b70d80349a8220e654a0a59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 02:25:21 -0700
Subject: [PATCH 276/562] python37Packages.azure-mgmt-recoveryservicesbackup:
 0.3.0 -> 0.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-azure-mgmt-recoveryservicesbackup/versions
---
 .../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 49247e87801..0b91309cac3 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.3.0";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1e55b6cbb808df83576cef352ba0065f4878fe505299c0a4c5a97f4f1e5793df";
+    sha256 = "0zssvzdip23yzaxlac9rlzg9mlyjl97fwr0gj8y27z8j58pwj72i";
   };
 
   propagatedBuildInputs = [

From 7385e92641d98a185b32a4e8f9a18e8c9774c142 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 4 Aug 2019 23:07:18 -0700
Subject: [PATCH 277/562] plantuml: 1.2019.7 -> 1.2019.8

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 42d03c06b87..1cf64362e6d 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.7";
+  version = "1.2019.8";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm";
+    sha256 = "0kbyjsy8zp3325syg9g91rfgy2dzkffdj2ji82b5h9zy3rkrz08p";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 399ff42d7330c5a1a9a34485656a3afafb596a57 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 05:42:35 -0400
Subject: [PATCH 278/562] nixos/pantheon: set GTK_CSD

Causes various issues when not set
* https://github.com/elementary/files/issues/971
* https://github.com/elementary/default-settings/pull/103
* https://github.com/cassidyjames/ideogram/issues/26

However this can cause certain problems in gala
* https://github.com/elementary/gala/issues/244
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index e27a479adad..46a15b723e1 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -102,6 +102,9 @@ in
           # Makes qt applications look less alien
           export QT_QPA_PLATFORMTHEME=gtk3
           export QT_STYLE_OVERRIDE=adwaita
+
+          # Settings from elementary-default-settings
+          export GTK_CSD=1
       fi
     '';
 

From d745487c1efe124687c3d787c09bcc2ab8303a28 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 05:43:48 -0400
Subject: [PATCH 279/562] nixos/pantheon: use filechooser module

Setting GTK_CSD=1 works around the issue
we were having with this [0]

[0]: https://github.com/elementary/files/issues/971
---
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 46a15b723e1..8e1272f3c92 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -105,6 +105,7 @@ in
 
           # Settings from elementary-default-settings
           export GTK_CSD=1
+          export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module
       fi
     '';
 

From 1d0a54f4b0766119c2ff21799455ca9fe84f36f9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 05:44:01 -0400
Subject: [PATCH 280/562] pantheon.elementary-files: multi outputs

---
 pkgs/desktops/pantheon/apps/elementary-files/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ad4cfa86c27..7f284672653 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
 
   name = "elementary-${pname}-${version}";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;

From c76f10fd0140fe63ef7ed0225b0f7022fe4bed1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 02:45:34 -0700
Subject: [PATCH 281/562] python37Packages.django_2_2: 2.2.3 -> 2.2.4

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

diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix
index 34b31bb35ab..efc13e455e5 100644
--- a/pkgs/development/python-modules/django/2_2.nix
+++ b/pkgs/development/python-modules/django/2_2.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.2.3";
+  version = "2.2.4";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sn0a7yjipwxrplh1x4kr77a93xzik1inh07bxwaqaw94qdzc8sd";
+    sha256 = "1s5ad5zlmwdn4h5lwn4s4m8mqy0gz4w9nfzyknn815sr252db98n";
   };
 
   patches = stdenv.lib.optional withGdal

From 2b54c29451775a50ad17fb3e2068e43f148c9997 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 02:57:52 -0700
Subject: [PATCH 282/562] python37Packages.azure-mgmt-servicefabric: 0.2.0 ->
 0.3.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 54c695a5079..3dad2bccdc2 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-servicefabric";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "b2bf2279b8ff8450c35e78e226231655021482fdbda27db09975ebfc983398ad";
+    sha256 = "0cirsp8wnsswba6gbmw4s2ljsjwi3855my063gvi2mqr55spvx2n";
   };
 
   propagatedBuildInputs = [

From 37c8c6371b0580094712259623cdc11597adb79e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 5 Aug 2019 12:05:36 +0200
Subject: [PATCH 283/562] pythonPackages.django_1_11: 1.11.22 -> 1.11.23

See https://docs.djangoproject.com/en/1.11/releases/1.11.23/ for release
note.
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 30db075bcf3..8b60155b50a 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "1.11.22";
+  version = "1.11.23";
 
   src = fetchurl {
     url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "0if8p7sgbvpy3m8d25pw1x232s14ndd60w5s5d88jl3hl505s3c3";
+    sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 34eca41af087a14cf361856c1be8f7c80bc66e42 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 5 Aug 2019 12:06:23 +0200
Subject: [PATCH 284/562] python3Packages.django_2_1: 2.1.10 -> 2.1.11

See https://docs.djangoproject.com/en/2.1/releases/2.1.11/ for release
notes.
---
 pkgs/development/python-modules/django/2_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
index da14dd4bd9c..e5d08381055 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/pkgs/development/python-modules/django/2_1.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.1.10";
+  version = "2.1.11";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n794x17x8q2jzjm12glb900y53r3bxg8dafvl65djiglm4abqk5";
+    sha256 = "1m9bs78sh91slsjxkhxgkg715gbsgph9ky7d74czs0z2mhg86h8s";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 91ad920b2ad312e1f20b8b44033ca0800aaeb7c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 03:07:58 -0700
Subject: [PATCH 285/562] python37Packages.dockerfile-parse: 0.0.14 -> 0.0.15

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

diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix
index 678276b1b31..2f9e32f088e 100644
--- a/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
 
 buildPythonPackage rec {
-  version = "0.0.14";
+  version = "0.0.15";
   pname = "dockerfile-parse";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b829a9e25ac9af17a0affa41c0fca6541a03b8edb0178f60dc036e2ce59eeb5";
+    sha256 = "1s05s1hc834yk6qxj2yv3fh7grj3q52d6jjy0sv1p05938baprfm";
   };
 
   postPatch = ''

From 28e4a2d4ad7e9acb98c2755f6c47c76ed8dd1ffa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 03:10:29 -0700
Subject: [PATCH 286/562] pspg: 1.6.5 -> 1.6.8

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

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index ea304d2aa89..1aaed4feafe 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pspg-${version}";
-  version = "1.6.5";
+  version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = "${version}";
-    sha256 = "0zz924fl0b99a09gi5l3vxv9dmxnkv1v679w6k9zf365b44z91ki";
+    sha256 = "1lwzyimn28a7q8k2c8z7and4qhrdil0za8lixh96z6x4lcb0rz5q";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 55cfffe385bccd87f56dba8b6754eab204897f42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 03:12:58 -0700
Subject: [PATCH 287/562] python37Packages.azure-mgmt-web: 0.41.0 -> 0.42.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index f2beeb99ffb..019d5bdc1e0 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-web";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "5f170f25c72119ff4b4e2f39d46ce21bdb2f399f786ea24eedc15c12cfba3054";
+    sha256 = "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn";
   };
 
   propagatedBuildInputs = [

From d21d6544c3640a90cf145e3c3300d383774091bf Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Mon, 5 Aug 2019 12:28:25 +0300
Subject: [PATCH 288/562] zeal: use qt5's mkDerivation

ref #65399
---
 pkgs/data/documentation/zeal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 63fe26f069c..9bca390f96e 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
-, qtbase, qtimageformats, qtwebkit, qtx11extras
+, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation
 , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "zeal-${version}";
   version = "0.6.1";
 

From 6b1aab34617ce7f3078cb8c5eddafeb5ed0f7c01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 03:40:48 -0700
Subject: [PATCH 289/562] python37Packages.django_compressor: 2.2 -> 2.3

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

diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
index 30343f76570..0ee392756d3 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -2,11 +2,11 @@
   rcssmin, rjsmin, django_appconf }:
 buildPythonPackage rec {
     pname = "django_compressor";
-    version = "2.2";
+    version = "2.3";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f";
+      sha256 = "1pbygd00l0k5p1r959131khij1km1a1grfxg0r59ar2wyx3n7j27";
     };
     postPatch = ''
       substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \

From dc95dd445e9a1bb73b086f69cea7b2451feb9f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Sun, 4 Aug 2019 23:51:44 +0300
Subject: [PATCH 290/562] qjackctl: use qt5's mkDerivation

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

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 15901915201..9b8c8035239 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
+{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   version = "0.5.9";
   name = "qjackctl-${version}";
 

From abbb1738919bc78d69fb03cef6190439facdc355 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 04:42:50 -0700
Subject: [PATCH 291/562] python37Packages.azure-mgmt-rdbms: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 881727e383b..2c5e2d1f2ea 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-rdbms";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "40abbe4f9c59d7906594ceed067d0e7d09fef44be0d16aded5d5717f1a8aa5ea";
+    sha256 = "0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r";
   };
 
   propagatedBuildInputs = [

From f0ccd4002bd6860044b08a668bb34a90bffd85f8 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 5 Aug 2019 17:55:06 +0900
Subject: [PATCH 292/562] mininet: 2.3.0d4 -> 2.3.0d6

---
 pkgs/tools/virtualization/mininet/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix
index a2f4b165087..0ee27d36e0a 100644
--- a/pkgs/tools/virtualization/mininet/default.nix
+++ b/pkgs/tools/virtualization/mininet/default.nix
@@ -8,8 +8,8 @@ let
   pyEnv = python.withPackages(ps: [ ps.setuptools ]);
 in
 stdenv.mkDerivation rec {
-  name = "mininet-${version}";
-  version = "2.3.0d4";
+  pname = "mininet";
+  version = "2.3.0d6";
 
   outputs = [ "out" "py" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "mininet";
     repo = "mininet";
     rev = version;
-    sha256 = "02hsqa7r5ykj8m1ycl32xwn1agjrw78wkq87xif0dl2vkzln41i4";
+    sha256 = "0wc6gni9dxj9jjnw66a28jdvcfm8bxv1i776m5dh002bn5wjcl6x";
   };
 
   buildFlags = [ "mnexec" ];
@@ -40,8 +40,9 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Emulator for rapid prototyping of Software Defined Networks";
     license = {
-      fullName = "Mininet 2.3.0d4 License";
+      fullName = "Mininet 2.3.0d6 License";
     };
+    platforms = platforms.linux;
     homepage = https://github.com/mininet/mininet;
     maintainers = with maintainers; [ teto ];
   };

From aac0e163dc3e8a8f10dd28bbbf72e12ba245a926 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 05:33:50 -0700
Subject: [PATCH 293/562] python37Packages.APScheduler: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 5c8ec07f4bb..4032b527e88 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,11 +20,11 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0q22lgp001hkk4z4xs2b2hlix84ka15i576p33fmgp69zn4bhmlg";
+    sha256 = "1c56066rx09xk1zbd156whsynlakxazqq64i509id17015wzp6jj";
   };
 
   buildInputs = [

From a3d17f253c265135475f20914489e29301abc7aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 05:36:28 -0700
Subject: [PATCH 294/562] python37Packages.azure-mgmt-datamigration: 2.1.0 ->
 2.2.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index 26b90029977..9d1bdb7a013 100644
--- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datamigration";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "49e6e68093e2d647c1c54a4027dee5b1d57f7e7c21480ae386c55cb3d5fa14bc";
+    sha256 = "0bixyya9afas0sv2wji7ivfi64z4dvv8p1gjnppibi5zas1mb4zw";
   };
 
   propagatedBuildInputs = [

From 38089d7e30f094698e111797a08bddb029901603 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 05:47:12 -0700
Subject: [PATCH 295/562] pulumi-bin: 0.17.17 -> 0.17.27

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

diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 12734cdcf9a..49e32da7a6d 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 let
 
-  version = "0.17.17";
+  version = "0.17.27";
 
   # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
   pulumiArchPackage = {
     "x86_64-linux" = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
-      sha256 = "1h1z8bngix1gvma3hahfyprrx3af5yncgvrsvr1cdsaa79bzvc5c";
+      sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
     };
     "x86_64-darwin" = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";

From 3619512b37440344251f70b7f1924390867e01a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:02:16 -0700
Subject: [PATCH 296/562] python37Packages.emoji: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index c00ca778bc6..01cd9190647 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9ae01495fc3fcc04e9136ca1af8cae58726ec5dfaaa92f61f0732cbae9a12fa9";
+    sha256 = "0kn6qq1h0d6cg70wk0hji6bcwg5s18ys6gfmlmfmx8420ka150dn";
   };
 
   checkInputs = [ nose ];

From d52b972b9983876afced8be36e00e848f4ae4626 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:04:49 -0700
Subject: [PATCH 297/562] python37Packages.azure-mgmt-containerinstance: 1.4.1
 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index e32182225f1..fd74008c1bf 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerinstance";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "87919f3e618ec0a40fd163d763113eef908e78c50d8b76bf4dd795444cb069fd";
+    sha256 = "1kd8lxm5kzk0wxbw1f3vin10hlhb4sygrxqd5c8k715s0ipkhmdh";
   };
 
   propagatedBuildInputs = [

From d6a490266261e5d0f8b2610d1629063c33b23064 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 5 Aug 2019 15:00:03 +0200
Subject: [PATCH 298/562] nixos/unifi: create data directory with correct
 permissions

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

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 9057a1e12b3..6239c88b7e4 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -148,7 +148,7 @@ in
 
     systemd.tmpfiles.rules = [
       "e '${stateDir}' 0700 unifi - - -"
-      "e '${stateDir}/data' 0700 unifi - - -"
+      "d '${stateDir}/data' 0700 unifi - - -"
     ];
 
     systemd.services.unifi = {

From a22190478dcd52664e52bf6129456e2882154bb5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:09:54 -0700
Subject: [PATCH 299/562] python37Packages.azure-mgmt-search: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 6ae9693e7f5..cc287589809 100644
--- a/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-search";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0ec5de861bd786bcb8691322feed6e6caa8d2f0806a50dc0ca5d640591926893";
+    sha256 = "0085c7qi9z1ayxd8683ck79nfnldkrwl481hzav84flyg8d0m94j";
   };
 
   propagatedBuildInputs = [

From 9a8e4c0da15c17897f22774e4e81349f4327b646 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sat, 3 Aug 2019 17:13:59 +0200
Subject: [PATCH 300/562] github-commenter: init at 0.5.0

---
 .../tools/github-commenter/default.nix        |  25 +++++
 .../tools/github-commenter/deps.nix           | 102 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 129 insertions(+)
 create mode 100644 pkgs/development/tools/github-commenter/default.nix
 create mode 100644 pkgs/development/tools/github-commenter/deps.nix

diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix
new file mode 100644
index 00000000000..969d7950cb9
--- /dev/null
+++ b/pkgs/development/tools/github-commenter/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  pname = "github-commenter";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "cloudposse";
+    repo = pname;
+    rev = version;
+    sha256 = "0y7yw7x8gqfbkqdfrwd9lffx3rrp62nz1aa86liy2dja97dacpij";
+  };
+
+  goPackagePath = "github.com/cloudposse/${pname}";
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues";
+    license = licenses.asl20;
+    homepage = "https://github.com/cloudposse/github-commenter";
+    maintainers = [ maintainers.mmahut ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/github-commenter/deps.nix b/pkgs/development/tools/github-commenter/deps.nix
new file mode 100644
index 00000000000..4b6be6c6d62
--- /dev/null
+++ b/pkgs/development/tools/github-commenter/deps.nix
@@ -0,0 +1,102 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/Masterminds/goutils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/goutils";
+      rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0";
+      sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
+    };
+  }
+  {
+    goPackagePath = "github.com/Masterminds/semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/semver";
+      rev = "0fd41f6ff0825cf7efae00e706120bdd48914d93";
+      sha256 = "0jf1c03c9cibfci7qaxbk8h758gmc9i0115jdw57v5c45hklw9ah";
+    };
+  }
+  {
+    goPackagePath = "github.com/Masterminds/sprig";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/sprig";
+      rev = "7525b3376b8792ab24d07381324e4e2463e3356b";
+      sha256 = "05ia4r8b86s7pk8r3jmjq5x7pgsmp6wvcm42z8vl6vdhdr28bfrg";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-github";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-github";
+      rev = "24f172eae1a0c53c780f259d8492979900e9af2e";
+      sha256 = "1bxklfrl1wx2691qindiikkbyixd9p8pfqjn0xqi4riy5hcgz96s";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev = "c8c88dbee036db4e4808d1f2ec8c2e15e11c3f80";
+      sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";
+      sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h";
+    };
+  }
+  {
+    goPackagePath = "github.com/huandu/xstrings";
+    fetch = {
+      type = "git";
+      url = "https://github.com/huandu/xstrings";
+      rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d";
+      sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx";
+    };
+  }
+  {
+    goPackagePath = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d";
+      sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
+      sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285";
+      sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "ca1201d0de80cfde86cb01aea620983605dfe99b";
+      sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9235c30ffb..1cc9f75dc66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -802,6 +802,8 @@ in
 
   github-changelog-generator = callPackage ../development/tools/github-changelog-generator { };
 
+  github-commenter = callPackage ../development/tools/github-commenter { };
+
   gitless = callPackage ../applications/version-management/gitless { };
 
   gitter = callPackage  ../applications/networking/instant-messengers/gitter { };

From 71b5635bb953b981afef62758f83420ca2936e2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:19:16 -0700
Subject: [PATCH 301/562] python37Packages.betamax-serializers: 0.2.0 -> 0.2.1

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

diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix
index 2ad23f1f9e6..41341c24481 100644
--- a/pkgs/development/python-modules/betamax-serializers/default.nix
+++ b/pkgs/development/python-modules/betamax-serializers/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "betamax-serializers";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yqzwx204m4lxlpg04cwv6iwzmcpdzr19wvj97vvxchp0g4qg83d";
+    sha256 = "0ja9isbjmzzhxdj69s0kdsvw8nkp073w6an6a4liy5vk3fdl2p1l";
   };
 
   buildInputs = [ betamax pyyaml ];

From 40335f102ff5139da2b33a491090cd3242c78239 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:21:48 -0700
Subject: [PATCH 302/562] python37Packages.azure-mgmt-authorization: 0.51.1 ->
 0.52.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
index c94620e0b15..7953234f6e2 100644
--- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-authorization";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "d2789e21c6b85591b38d5d4e9b835b6546824c14e14aaa366da0ef50a95d2478";
+    sha256 = "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
   };
 
   propagatedBuildInputs = [

From baae27021c0a52fad9ea9572ac0eceea039b37f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:40:36 -0700
Subject: [PATCH 303/562] python37Packages.azure-mgmt-eventhub: 2.6.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
index 1c0c3c5a866..188789e171c 100644
--- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-eventhub";
-  version = "2.6.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8";
+    sha256 = "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp";
   };
 
   propagatedBuildInputs = [

From a0a860344ddc1f04ab6ce27a1e588f4331875bdd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:52:40 -0700
Subject: [PATCH 304/562] python37Packages.azure-graphrbac: 0.61.0 -> 0.61.1

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

diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix
index c47c10f1418..f5c1131f660 100644
--- a/pkgs/development/python-modules/azure-graphrbac/default.nix
+++ b/pkgs/development/python-modules/azure-graphrbac/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.61.0";
+  version = "0.61.1";
   pname = "azure-graphrbac";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "4ab27db29d730e4d35f420466500f8ee60a26a8151dbd121a6c353ccd9d4ee55";
+    sha256 = "1qmjhpqw0sgy406ij5xyzkffisjah9m1pfz9x54v66bwrbi8msak";
   };
 
   propagatedBuildInputs = [

From 4039ed6d49f61136b9b865a6b61d72a0f1bb858f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 06:56:11 -0700
Subject: [PATCH 305/562] python37Packages.azure-mgmt-cosmosdb: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 6741686b0d4..72be0b3dbb9 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cosmosdb";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0g4znanx540p983gzr55z0n0jyzfnzmnzlshl92hm4gldwjdd91d";
+    sha256 = "1d9xzf9ydlhwlsk7ij64ji1r2j0l7bwaykwngcy5lh8sdxax305r";
   };
 
   propagatedBuildInputs = [

From 4d50ce93aa0b20534e8a2e8456e89cfeb58bd422 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Wed, 3 Jul 2019 13:00:27 +0200
Subject: [PATCH 306/562] kops: restructure package to maintain multiple
 versions in the future

kops versions are bound to the version of the kubernetes cluster they
are targeted to maintain (kops 1.12 -> k8s 1.12, kops 1.13 -> k8s 1.13,
etc). Upgrading kops should therefore be done very deliberately
as it may affect the cluster it is working with in drastic ways.
This change introduces the ability to maintain multiple versions of
kops in nixpkgs, giving the users the ability to pin it to their target
cluster version when installing
---
 .../networking/cluster/kops/default.nix       | 81 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 96f3354023c..cd6cd9ee22b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,44 +1,57 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }:
-
-buildGoPackage rec {
-  name = "kops-${version}";
-  version = "1.12.1";
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
 
+let
   goPackagePath = "k8s.io/kops";
 
-  src = fetchFromGitHub {
-    rev = version;
-    owner = "kubernetes";
-    repo = "kops";
-    sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y";
-  };
+  generic = { version, sha256, ...}@attrs:
+    let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
+      buildGoPackage {
+        name = "kops-${version}";
 
-  buildInputs = [go-bindata];
-  subPackages = ["cmd/kops"];
+        inherit goPackagePath;
 
-  buildFlagsArray = ''
-    -ldflags=
-        -X k8s.io/kops.Version=${version}
-        -X k8s.io/kops.GitVersion=${version}
-  '';
+        src = fetchFromGitHub {
+          rev = version;
+          owner = "kubernetes";
+          repo = "kops";
+          inherit sha256;
+        };
 
-  preBuild = ''
-    (cd go/src/k8s.io/kops
-     go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...)
-  '';
+        buildInputs = [go-bindata];
+        subPackages = ["cmd/kops"];
 
-  postInstall = ''
-    mkdir -p $bin/share/bash-completion/completions
-    mkdir -p $bin/share/zsh/site-functions
-    $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops
-    $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops
-  '';
+        buildFlagsArray = ''
+          -ldflags=
+              -X k8s.io/kops.Version=${version}
+              -X k8s.io/kops.GitVersion=${version}
+        '';
 
-  meta = with stdenv.lib; {
-    description = "Easiest way to get a production Kubernetes up and running";
-    homepage = https://github.com/kubernetes/kops;
-    license = licenses.asl20;
-    maintainers = with maintainers; [offline zimbatm];
-    platforms = platforms.unix;
+        preBuild = ''
+          (cd go/src/k8s.io/kops
+           go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...)
+        '';
+
+        postInstall = ''
+          mkdir -p $bin/share/bash-completion/completions
+          mkdir -p $bin/share/zsh/site-functions
+          $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops
+          $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops
+        '';
+
+        meta = with stdenv.lib; {
+          description = "Easiest way to get a production Kubernetes up and running";
+          homepage = https://github.com/kubernetes/kops;
+          license = licenses.asl20;
+          maintainers = with maintainers; [offline zimbatm];
+          platforms = platforms.unix;
+        };
+      } // attrs';
+in rec {
+
+  mkKops = generic;
+
+  kops_1_12 = mkKops {
+    version = "1.12.2";
+    sha256 = "0937crwifnld7r5pf5gvab9ibmf8k44dafr9y3hld2p01ijrari1";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77563721c58..5c1b2017788 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23635,7 +23635,11 @@ in
 
   kontemplate = callPackage ../applications/networking/cluster/kontemplate { };
 
-  kops = callPackage ../applications/networking/cluster/kops { };
+  inherit (callPackage ../applications/networking/cluster/kops {})
+    mkKops
+    kops_1_12
+    ;
+  kops = kops_1_12;
 
   lguf-brightness = callPackage ../misc/lguf-brightness { };
 

From 2f99b0d6053a42a54b38a6cbc19d9010a26acb7e Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Mon, 5 Aug 2019 16:05:25 +0200
Subject: [PATCH 307/562] kops_1_12: 1.12.2 -> 1.12.3

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

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index cd6cd9ee22b..d06ce7b2cdb 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -51,7 +51,7 @@ in rec {
   mkKops = generic;
 
   kops_1_12 = mkKops {
-    version = "1.12.2";
-    sha256 = "0937crwifnld7r5pf5gvab9ibmf8k44dafr9y3hld2p01ijrari1";
+    version = "1.12.3";
+    sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly";
   };
 }

From 48395480f77cefbaffda949eb375a81d98c5e9ae Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Mon, 5 Aug 2019 16:03:44 +0200
Subject: [PATCH 308/562] kops_1_13: init at 1.13.0

---
 pkgs/applications/networking/cluster/kops/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index d06ce7b2cdb..6a721ef14c1 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -54,4 +54,9 @@ in rec {
     version = "1.12.3";
     sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly";
   };
+
+  kops_1_13 = mkKops {
+    version = "1.13.0";
+    sha256 = "04kbbg3gqzwzzzq1lmnpw2gqky3pfwfk7pc0laxv2yssk9wac5k1";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c1b2017788..9d022733584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23638,8 +23638,9 @@ in
   inherit (callPackage ../applications/networking/cluster/kops {})
     mkKops
     kops_1_12
+    kops_1_13
     ;
-  kops = kops_1_12;
+  kops = kops_1_13;
 
   lguf-brightness = callPackage ../misc/lguf-brightness { };
 

From a29d43b3728300b7ce1d98ed5b724c05e9daceb8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 08:16:11 -0700
Subject: [PATCH 309/562] python37Packages.pypcap: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix
index dc916213fcd..620b1d81160 100644
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/pkgs/development/python-modules/pypcap/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pypcap";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3";
+    sha256 = "1w5i79gh7cswvznr8rhilcmzhnh2y5c4jwh2qrfnpx05zqigm1xd";
   };
 
   patches = [

From 24c913778097d8d9b693b3940ef24b0b352f7fba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 08:19:12 -0700
Subject: [PATCH 310/562] python37Packages.pyglet: 1.3.2 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index b3093390e3b..aae37e0282f 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -11,12 +11,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.3.2";
+  version = "1.4.1";
   pname = "pyglet";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743";
+    sha256 = "132p484g53b9p8g3q2bcnhzyg9x37hsm4rhpscl4llngjw5fbk22";
   };
 
   # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307).

From 35f70b826bbd4d49d2930560fa95ce4591387acb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 08:29:42 -0700
Subject: [PATCH 311/562] python37Packages.luftdaten: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix
index 037644f60b2..0138d866ff0 100644
--- a/pkgs/development/python-modules/luftdaten/default.nix
+++ b/pkgs/development/python-modules/luftdaten/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "luftdaten";
-  version = "0.6.1";
+  version = "0.6.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jxp9yfabdgn2d6w69ijrw1bk1d9g897425cyybiyc13zhhs0kwg";
+    sha256 = "0919hcycv2rkn99lv4dn78i827mgvm3vagm9xcc6qgawsli8vrlp";
   };
 
   propagatedBuildInputs = [ aiohttp async-timeout ];

From 621880e5e761960d910b443ff9788c88baddc4f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 08:30:54 -0700
Subject: [PATCH 312/562] pythia: 8.240 -> 8.243 (#66036)

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

diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index e84aaf37325..2e17e49dcdb 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pythia-${version}";
-  version = "8.240";
+  version = "8.243";
 
   src = fetchurl {
     url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
-    sha256 = "13cd86030j1f00n4xw30g26cgir3a5lsn9n0z13dh1vprbc9ax6j";
+    sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q";
   };
 
   buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];

From 9d973b3dc128c202d9f24f6918a7d7079208e29c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 11:27:31 -0400
Subject: [PATCH 313/562] pythonPackages.k5test: init at 0.9.2

This was split out gssapi a while ago.
Needs an extensive fix-paths.patch since
it's reliant upon many shell tools.
---
 .../python-modules/k5test/default.nix         | 43 +++++++++
 .../python-modules/k5test/fix-paths.patch     | 90 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +
 3 files changed, 137 insertions(+)
 create mode 100644 pkgs/development/python-modules/k5test/default.nix
 create mode 100644 pkgs/development/python-modules/k5test/fix-paths.patch

diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix
new file mode 100644
index 00000000000..d3937300a5e
--- /dev/null
+++ b/pkgs/development/python-modules/k5test/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, substituteAll
+, six
+, krb5Full
+, findutils
+, which
+}:
+
+buildPythonPackage rec {
+  pname = "k5test";
+  version = "0.9.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit findutils krb5Full;
+      # krb5-config is in dev output
+      krb5FullDev = krb5Full.dev;
+      which = "${which}/bin/which";
+    })
+  ];
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Library for setting up self-contained Kerberos 5 environment";
+    homepage = https://github.com/pythongssapi/k5test;
+    license = licenses.mit;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch
new file mode 100644
index 00000000000..f99835b5f2a
--- /dev/null
+++ b/pkgs/development/python-modules/k5test/fix-paths.patch
@@ -0,0 +1,90 @@
+diff --git a/k5test/_utils.py b/k5test/_utils.py
+index e289fac..e2f486a 100644
+--- a/k5test/_utils.py
++++ b/k5test/_utils.py
+@@ -65,12 +65,12 @@ def find_plugin_dir():
+ 
+     # if there was no LD_LIBRARY_PATH, or the above failed
+     if _PLUGIN_DIR is None:
+-        lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib64')
++        lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib64')
+         _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))
+ 
+     # /usr/lib64 seems only to be distinct on Fedora/RHEL/Centos family
+     if _PLUGIN_DIR is None:
+-        lib_dir = os.path.join(get_output('krb5-config --prefix'), 'lib')
++        lib_dir = os.path.join(get_output('@krb5FullDev@/bin/krb5-config --prefix'), 'lib')
+         _PLUGIN_DIR = _decide_plugin_dir(_find_plugin_dirs_installed(lib_dir))
+ 
+     if _PLUGIN_DIR is not None:
+@@ -89,7 +89,7 @@ def _decide_plugin_dir(dirs):
+ 
+     for path in shortest_first:
+         # check to see if it actually contains .so files
+-        if get_output('find %s -name "*.so"' % path):
++        if get_output('@findutils@/bin/find %s -name "*.so"' % path):
+             return path
+ 
+     return None
+@@ -97,7 +97,7 @@ def _decide_plugin_dir(dirs):
+ 
+ def _find_plugin_dirs_installed(search_path):
+     try:
+-        options_raw = get_output('find %s/ -type d \( ! -executable -o ! -readable \) '
++        options_raw = get_output('@findutils@/bin/find %s/ -type d \( ! -executable -o ! -readable \) '
+                                  '-prune -o '
+                                  '-type d -path "*/krb5/plugins" -print' % search_path,
+                                  stderr=subprocess.STDOUT)
+@@ -111,7 +111,7 @@ def _find_plugin_dirs_installed(search_path):
+ 
+ 
+ def _find_plugin_dirs_src(search_path):
+-    options_raw = get_output('find %s/../ -type d -name plugins' % search_path)
++    options_raw = get_output('@findutils@/bin/find %s/../ -type d -name plugins' % search_path)
+ 
+     if options_raw:
+         return options_raw.split('\n')
+diff --git a/k5test/realm.py b/k5test/realm.py
+index f57946b..ad78579 100644
+--- a/k5test/realm.py
++++ b/k5test/realm.py
+@@ -181,19 +181,13 @@ class K5Realm(object):
+             return path
+ 
+     def _init_paths(self, **paths):
+-        self.kdb5_util = self._discover_path('kdb5_util',
+-                                             '/usr/sbin/kdb5_util', paths)
+-        self.krb5kdc = self._discover_path('krb5kdc',
+-                                           '/usr/sbin/krb5kdc', paths)
+-        self.kadmin_local = self._discover_path('kadmin_local',
+-                                                '/usr/sbin/kadmin.local',
+-                                                paths)
+-        self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths)
+-        self.kadmind = self._discover_path('kadmind',
+-                                           '/usr/sbin/kadmind', paths)
+-
+-        self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths)
+-        self._klist = self._discover_path('klist', '/usr/bin/klist', paths)
++        self.kdb5_util = '@krb5Full@/bin/kdb5_util'
++        self.krb5kdc = '@krb5Full@/bin/krb5kdc'
++        self.kadmin_local = '@krb5Full@/bin/kadmin.local'
++        self.kprop = '@krb5Full@/bin/kprop'
++        self.kadmind = '@krb5Full@/bin/kadmind'
++        self._kinit = '@krb5Full@/bin/kinit'
++        self._klist = '@krb5Full@/bin/klist'
+ 
+     def _create_conf(self, profile, filename):
+         with open(filename, 'w') as conf_file:
+diff --git a/k5test/unit.py b/k5test/unit.py
+index 4ee7f98..543d662 100644
+--- a/k5test/unit.py
++++ b/k5test/unit.py
+@@ -38,7 +38,7 @@ _KRB_VERSION = None
+ def krb_minversion_test(target_version, problem):
+     global _KRB_VERSION
+     if _KRB_VERSION is None:
+-        _KRB_VERSION = _utils.get_output("krb5-config --version")
++        _KRB_VERSION = _utils.get_output("@krb5FullDev@/bin/krb5-config --version")
+         _KRB_VERSION = _KRB_VERSION.split(' ')[-1].split('.')
+ 
+     def make_ext_test(func):
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d581522a548..37cf7ea00f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3434,6 +3434,10 @@ in {
 
   kubernetes = callPackage ../development/python-modules/kubernetes { };
 
+  k5test = callPackage ../development/python-modules/k5test {
+    inherit (pkgs) krb5Full findutils which;
+  };
+
   pylast = callPackage ../development/python-modules/pylast { };
 
   pylru = callPackage ../development/python-modules/pylru { };

From 8095440806106b5b6db1a7deaa16172934b38a62 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 06:40:15 -0400
Subject: [PATCH 314/562] pythonPackages.gssapi: 1.5.1 -> 1.6.0

* fetchFromGitHub
  it's probably best to use source to avoid cython issues.

* correct Inputs declaration

* enable tests

* don't set LD_LIBRARY_PATH
  that was needed for k5test. we hardcode in that package
---
 .../python-modules/gssapi/default.nix         | 59 +++++++++++++++----
 pkgs/top-level/python-packages.nix            |  4 +-
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 14d27e7442e..f470bed2fdb 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -1,13 +1,30 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
-nose, gss, krb5Full, darwin }:
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchFromGitHub
+, six
+, enum34
+, decorator
+, nose
+, krb5Full
+, darwin
+, isPy27
+, parameterized
+, shouldbe
+, cython
+, python
+, k5test
+}:
 
 buildPythonPackage rec {
   pname = "gssapi";
-  version = "1.5.1";
+  version = "1.6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "76c9fda88a7178f41bf6454a06d64054c56b46f0dcbc73307f2e57bb8c25d8cc";
+  src = fetchFromGitHub {
+    owner = "pythongssapi";
+    repo = "python-${pname}";
+    rev = "v${version}";
+    sha256 = "1chmxhjbs39paaxlfsdrr13v4zvv94ijvhxasdphxlxkqlycbm4a";
   };
 
   # It's used to locate headers
@@ -16,18 +33,34 @@ buildPythonPackage rec {
       --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'"
   '';
 
-  LD_LIBRARY_PATH = "${krb5Full}/lib";
+  nativeBuildInputs = [
+    cython
+    krb5Full
+  ];
 
-  nativeBuildInputs = [ krb5Full ]
-  ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );
+  propagatedBuildInputs =  [
+    decorator
+    six
+  ] ++ lib.optional isPy27 enum34;
 
-  propagatedBuildInputs =  [ decorator enum34 six ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.GSS
+  ];
 
-  checkInputs = [ nose ];
+  checkInputs = [
+    k5test
+    nose
+    parameterized
+    shouldbe
+    six
+  ];
 
-  doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
+  checkPhase = ''
+    export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
+    ${python.interpreter} setup.py nosetests
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://pypi.python.org/pypi/gssapi;
     description = "Python GSSAPI Wrapper";
     license = licenses.mit;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37cf7ea00f9..868afce03cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -606,7 +606,9 @@ in {
 
   gsd = callPackage ../development/python-modules/gsd { };
 
-  gssapi = callPackage ../development/python-modules/gssapi { };
+  gssapi = callPackage ../development/python-modules/gssapi {
+    inherit (pkgs) darwin krb5Full;
+  };
 
   guestfs = callPackage ../development/python-modules/guestfs { };
 

From 29cde60208ce6cf343c68394cff5bd84b6e6944d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 07:29:19 -0700
Subject: [PATCH 315/562] jenkins-job-builder: 2.10.0 -> 2.10.1

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

diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index a41fefd7b13..714a5ce1014 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "2.10.0";
+  version = "2.10.1";
   disabled = !isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jp8v0a3yhjv7024y7r4jd4kq008ljra6lxx4143jw3rp72q3afc";
+    sha256 = "0iynzxrjmdkrriw4pcf8as8afckvmq4jk457lxg52wh29l39wb30";
   };
 
   postPatch = ''

From 406fbdd67e4cd29a3304e88fbda5c34f91754c59 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 3 Aug 2019 19:05:54 +0200
Subject: [PATCH 316/562] surf-display: init at 2019-04-15

---
 pkgs/desktops/surf-display/default.nix        | 53 +++++++++++++++++++
 pkgs/desktops/surf-display/pdf-makefile.patch | 24 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 79 insertions(+)
 create mode 100644 pkgs/desktops/surf-display/default.nix
 create mode 100644 pkgs/desktops/surf-display/pdf-makefile.patch

diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix
new file mode 100644
index 00000000000..f3554fe0b40
--- /dev/null
+++ b/pkgs/desktops/surf-display/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchgit, makeWrapper
+, surf, wmctrl, matchbox, xdotool, unclutter
+, xorg, pulseaudio, xprintidle-ng }:
+
+stdenv.mkDerivation rec {
+  pname = "surf-display";
+  version = "unstable-2019-04-15";
+
+  src = fetchgit {
+    url = "https://code.it-zukunft-schule.de/cgit/surf-display";
+    rev = "972d6c4b7c4503dbb63fa6c92cdc24d1e32064a4";
+    sha256 = "03c68gg4kfmkri1gn5b7m1g8vh9ciawhajb29c17kkc7mn388hjm";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [
+    surf
+    wmctrl
+    matchbox
+    pulseaudio
+    xprintidle-ng
+    xdotool
+    xorg.xmodmap
+    xorg.xkbutils
+    unclutter
+  ];
+
+  patches = [ ./pdf-makefile.patch ];
+
+  buildFlags = [ "man" ];
+
+  postFixup = ''
+    substituteInPlace $out/share/xsessions/surf-display.desktop \
+      --replace surf-display $out/bin/surf-display
+
+    substituteInPlace $out/bin/surf-display --replace /usr/share $out/share
+
+    patchShebangs $out/bin/surf-display
+    wrapProgram $out/bin/surf-display \
+       --prefix PATH ':' ${stdenv.lib.makeBinPath buildInputs}
+  '';
+
+  makeFlags = [ "PREFIX=${placeholder ''out''}" ];
+
+  meta = with stdenv.lib; {
+    description = "Kiosk browser session manager based on the surf browser";
+    homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/";
+    maintainers = with maintainers; [ etu ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/surf-display/pdf-makefile.patch b/pkgs/desktops/surf-display/pdf-makefile.patch
new file mode 100644
index 00000000000..9c2541052c0
--- /dev/null
+++ b/pkgs/desktops/surf-display/pdf-makefile.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 1081d64..499160c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,19 +13,10 @@ man::
+ 	gzip -9 -c -n data/surf-display.1 > data/surf-display.1.gz
+ 
+ install:
+-	if [ ! -e data/surf-display.pdf.gz ]; then \
+-	    echo "Run 'make build' first, before running 'sudo make install'."; \
+-	    exit -1; \
+-	fi
+-
+         # script
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin/
+ 	install -m 0755 bin/surf-display $(DESTDIR)$(PREFIX)/bin/
+ 
+-	# LaTeX Beamer PDF: Impressive HowTo
+-	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/surf-display/
+-	install -m 0644 data/*.pdf.gz $(DESTDIR)$(PREFIX)/share/doc/surf-display/
+-
+ 	# man page
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 data/*.1.gz $(DESTDIR)$(PREFIX)/share/man/man1/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d022733584..f2b89a411d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20557,6 +20557,8 @@ in
 
   surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
 
+  surf-display = callPackages ../desktops/surf-display { };
+
   sunvox = callPackage ../applications/audio/sunvox { };
 
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };

From 792da0c4d4c0712943b9e7ebf55cdfb38a4181cd Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 3 Aug 2019 19:14:45 +0200
Subject: [PATCH 317/562] nixos/surf-display: Add kiosk display manager session

---
 .../services/x11/desktop-managers/default.nix |   2 +-
 .../x11/desktop-managers/surf-display.nix     | 127 ++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/surf-display.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 2b1e9169e5f..671a959cdde 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -20,7 +20,7 @@ in
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
-    ./mate.nix ./pantheon.nix
+    ./mate.nix ./pantheon.nix ./surf-display.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
new file mode 100644
index 00000000000..232bbf5c55d
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -0,0 +1,127 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.desktopManager.surf-display;
+
+  surfDisplayConf = ''
+    # Surf Kiosk Display: Wrap around surf browser and turn your
+    # system into a browser screen in KIOSK-mode.
+
+    # default download URI for all display screens if not configured individually
+    DEFAULT_WWW_URI="${cfg.defaultWwwUri}"
+
+    # Enforce fixed resolution for all displays (default: not set):
+    #DEFAULT_RESOLUTION="1920x1080"
+
+    # HTTP proxy URL, if needed (default: not set).
+    #HTTP_PROXY_URL="http://webcache:3128"
+
+    # Setting for internal inactivity timer to restart surf-display
+    # if the user goes inactive/idle.
+    INACTIVITY_INTERVAL="${builtins.toString cfg.inactivityInterval}"
+
+    # log to syslog instead of .xsession-errors
+    LOG_TO_SYSLOG="yes"
+
+    # Launch pulseaudio daemon if not already running.
+    WITH_PULSEAUDIO="yes"
+
+    # screensaver settings, see "man 1 xset" for possible options
+    SCREENSAVER_SETTINGS="${cfg.screensaverSettings}"
+
+    # disable right and middle pointer device click in browser sessions while keeping
+    # scrolling wheels' functionality intact... (consider "pointer" subcommand on
+    # xmodmap man page for details).
+    POINTER_BUTTON_MAP="${cfg.pointerButtonMap}"
+
+    # Hide idle mouse pointer.
+    HIDE_IDLE_POINTER="${cfg.hideIdlePointer}"
+
+    ${cfg.extraConfig}
+  '';
+
+in {
+  options = {
+    services.xserver.desktopManager.surf-display = {
+      enable = mkEnableOption "surf-display as a kiosk browser session";
+
+      defaultWwwUri = mkOption {
+        type = types.string;
+        default = "${pkgs.surf-display}/share/surf-display/empty-page.html";
+        example = "https://www.example.com/";
+        description = "Default URI to display.";
+      };
+
+      inactivityInterval = mkOption {
+        type = types.int;
+        default = 300;
+        example = "0";
+        description = ''
+          Setting for internal inactivity timer to restart surf-display if the
+          user goes inactive/idle to get a fresh session for the next user of
+          the kiosk.
+
+          If this value is set to zero, the whole feature of restarting due to
+          inactivity is disabled.
+        '';
+      };
+
+      screensaverSettings = mkOption {
+        type = types.string;
+        default = "";
+        description = ''
+          Screensaver settings, see <literal>man 1 xset</literal> for possible options.
+        '';
+      };
+
+      pointerButtonMap = mkOption {
+        type = types.string;
+        default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0";
+        description = ''
+          Disable right and middle pointer device click in browser sessions
+          while keeping scrolling wheels' functionality intact. See pointer
+          subcommand on <literal>man xmodmap</literal> for details.
+        '';
+      };
+
+      hideIdlePointer = mkOption {
+        type = types.string;
+        default = "yes";
+        example = "no";
+        description = "Hide idle mouse pointer.";
+      };
+
+      extraConfig = mkOption {
+        type = types.string;
+        default = "";
+        example = ''
+          # Enforce fixed resolution for all displays (default: not set):
+          DEFAULT_RESOLUTION="1920x1080"
+
+          # HTTP proxy URL, if needed (default: not set).
+          HTTP_PROXY_URL="http://webcache:3128"
+
+          # Configure individual display screens with host specific parameters:
+          DISPLAYS['display-host-0']="www_uri=https://www.displayserver.comany.net/display-1/index.html"
+          DISPLAYS['display-host-1']="www_uri=https://www.displayserver.comany.net/display-2/index.html"
+          DISPLAYS['display-host-2']="www_uri=https://www.displayserver.comany.net/display-3/index.html|res=1920x1280"
+          DISPLAYS['display-host-3']="www_uri=https://www.displayserver.comany.net/display-4/index.html"|res=1280x1024"
+          DISPLAYS['display-host-local-file']="www_uri=file:///usr/share/doc/surf-display/empty-page.html"
+        '';
+        description = ''
+          Extra configuration options to append to <literal>/etc/default/surf-display</literal>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.displayManager.extraSessionFilePackages = [
+      pkgs.surf-display
+    ];
+
+    environment.etc."default/surf-display".text = surfDisplayConf;
+  };
+}

From 772cd4069b7f9eb3207b4d99b363958fb503410d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 08:55:00 -0700
Subject: [PATCH 318/562] python37Packages.logilab_common: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 9f932b81e7a..2dd997765cf 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "logilab-common";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cdda9ed0deca7c68f87f7a404ad742e47aaa1ca5956d12988236a5ec3bda13a0";
+    sha256 = "1zw8bijlcmqrigsqvzj7gwh3qbd33dmpi9ij6h56b41x0dpm957d";
   };
 
   propagatedBuildInputs = [ unittest2 six ];

From 518d09cac05b6478ee2dc6b44c966436bece605d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 11:56:50 -0400
Subject: [PATCH 319/562] pythonPackages.gssapi: disable tests on darwin

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

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index f470bed2fdb..c64013624a4 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -55,6 +55,8 @@ buildPythonPackage rec {
     six
   ];
 
+  doCheck = !stdenv.isDarwin; # many failures on darwin
+
   checkPhase = ''
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
     ${python.interpreter} setup.py nosetests

From 838b6e9f5556688e0117b4e84a53d55edab93fb5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 09:16:10 -0700
Subject: [PATCH 320/562] python37Packages.lmdb: 0.95 -> 0.96

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

diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index 3b384182ae0..8926a7383a7 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "lmdb";
-  version = "0.95";
+  version = "0.96";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nx9f193gzl33r1lbqhb96h1igya7pz8wmahr8m9x5zgc05hal91";
+    sha256 = "0wpahad7wac34r1hxa1jhk0bsll39n7667cljyr5251kj12ksfgr";
   };
 
   checkInputs = [ pytest cffi ];

From a17eb40facce208691b4a08a6c8e3a43566c2f5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 10:02:50 -0700
Subject: [PATCH 321/562] python37Packages.parse-type: 0.4.2 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index 34573626bac..04ad3ba9c18 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "parse_type";
-  version = "0.4.2";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g3b6gsdwnm8dpkh2vn34q6dzxm9gl908ggyzcv31n9xbp3vv5pm";
+    sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz";
   };
 
   checkInputs = [ pytest pytestrunner ];

From 3d121eb3278da3773f26aadfc544d805193ceb9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 10:22:56 -0700
Subject: [PATCH 322/562] python37Packages.nltk: 3.4.3 -> 3.4.4

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

diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 7e3134a44d2..6e9b5ce61cd 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,13 +1,13 @@
 { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }:
 
 buildPythonPackage rec {
-  version = "3.4.3";
+  version = "3.4.4";
   pname = "nltk";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1cjkv4jmmlr0w4qi399ncgb6lp41mb9i352934288wh9xad15mqj";
+    sha256 = "1dbwwhsbsp31bvvksq7kyrfs6s27lp8wgwqs4qf6hajkz2jj0k3n";
   };
 
   propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch;

From f541f2bb2e7675bb57308cad259c1d09cba01af6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 10:34:35 -0700
Subject: [PATCH 323/562] python37Packages.lark-parser: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix
index 6de2af1e505..527c99a1589 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark-parser/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "lark-parser";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
     rev = version;
-    sha256 = "17h7s0yc8jyjmlcwsaw93ijl982ws3p8nxif2dc3rv01dqhf0xx1";
+    sha256 = "05na4izlq34bmij8awmfn58liinmsh8qzh6948knk5ms5nsh50cp";
   };
 
   # tests of Nearley support require js2py

From 45c470a56cf5b589f332b196b169717eb2eb8ffd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 10:43:14 -0700
Subject: [PATCH 324/562] python37Packages.pika: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index 073c292c84d..28ca8a3e498 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "pika";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ba83d3daffccb92788d24facdab62a3db6aa03b8a6d709b03dc792d35c0dfe8";
+    sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz";
   };
 
   # Tests require twisted which is only availalble for python-2.x

From 00a3f6a0fb25c3b512c1aabab1537b8d3a3e94ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 10:45:47 -0700
Subject: [PATCH 325/562] python37Packages.mwclient: 0.9.3 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index b100f3fa350..ce987311a74 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -4,14 +4,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.3";
+  version = "0.10.0";
   pname = "mwclient";
 
   src = fetchFromGitHub {
     owner = "mwclient";
     repo = "mwclient";
     rev = "v${version}";
-    sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw";
+    sha256 = "1c3q6lwmb05yqywc4ya98ca7hsl15niili8rccl4n1yqp77c103v";
   };
 
   checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ];

From 95f29fa6736da3c39d4488e920621f0feb166bd0 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 5 Aug 2019 19:57:07 +0200
Subject: [PATCH 326/562] pulumi: fixing darwin hash

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

diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 49e32da7a6d..ebdf6b17ed6 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -14,7 +14,7 @@ let
     };
     "x86_64-darwin" = {
       url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
-      sha256 = "0pipykwpqqnhqg28s27lnkbrm55rshf25ikil7ycwq05p9ynf5gq";
+      sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
     };
   };
 

From fd4545f35bcbbeb9a95c5c289aa22f68a9d3ff1f Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 5 Aug 2019 14:55:39 +0200
Subject: [PATCH 327/562] pythonPackages.pytrends: init at 4.6.0

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

diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix
new file mode 100644
index 00000000000..b3ada6247e3
--- /dev/null
+++ b/pkgs/development/python-modules/pytrends/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, requests
+, lxml
+, pandas
+}:
+
+buildPythonPackage rec {
+  pname = "pytrends";
+  version = "4.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03gnn2mgjvpc7pbcijy7xilrhgjg7x2pp6ci96pdyqnhkqv02d3n";
+  };
+
+  doCheck = false;
+
+  propagatedBuildInputs = [ requests lxml pandas ];
+
+  meta = with stdenv.lib; {
+    description = "Pseudo API for Google Trends";
+    homepage = "https://github.com/GeneralMills/pytrends";
+    license = [ licenses.asl20 ];
+    maintainers = [ maintainers.mmahut ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0896322e510..cdfb9db05b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1063,6 +1063,8 @@ in {
 
   pytricia =  callPackage ../development/python-modules/pytricia { };
 
+  pytrends = callPackage ../development/python-modules/pytrends { };
+
   py-vapid = callPackage ../development/python-modules/py-vapid { };
 
   PyWebDAV = callPackage ../development/python-modules/pywebdav { };

From 5601e130ce87809e58af4f9ed6cda74d6d81ae3d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 5 Aug 2019 13:12:50 -0400
Subject: [PATCH 328/562] bluejeans-gui: use patchShebangs, add me to
 maintainers

---
 .../networking/instant-messengers/bluejeans/default.nix  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index fb38255ea38..d76cebd11b0 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -36,14 +36,15 @@ stdenv.mkDerivation rec {
       --replace-needed libudev.so.0 libudev.so.1 \
       opt/bluejeans/bluejeans-bin
     ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans
-    substituteInPlace $out/bin/bluejeans \
-      --replace '#!/bin/bash' '#!${bash}/bin/bash'
     chmod +x $out/bin/bluejeans
+    patchShebangs $out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day.";
-    license = stdenv.lib.licenses.unfree;
+    homepage = "https://www.bluejeans.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ veprbl ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 53a97885b7bb53baa5dcc3c1df9feb95652aac40 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 11:16:17 -0700
Subject: [PATCH 329/562] python37Packages.Nuitka: 0.6.4 -> 0.6.5

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

diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index b8d9f7d58a9..6be1f39328f 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -12,13 +12,13 @@ let
   # Therefore we create a separate env for it.
   scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
 in buildPythonPackage rec {
-  version = "0.6.4";
+  version = "0.6.5";
   pname = "Nuitka";
 
   # Latest version is not yet on PyPi
   src = fetchurl {
     url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
-    sha256 = "18np970h6s97m7j6ymqizq1ylnhb6l5msmxqgnayrllirhg7a8pf";
+    sha256 = "18vcmbyqdwsfa9gyj1sf518hsqczx7qlzrdc22hdb1zawzknb1pb";
   };
 
   checkInputs = [ vmprof pyqt4 ];

From 8a64cb4556825870a9d9319d2839f9466f4a8961 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 11:22:09 -0700
Subject: [PATCH 330/562] python37Packages.portalocker: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix
index c9f44dbcceb..7d536c83782 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/pkgs/development/python-modules/portalocker/default.nix
@@ -10,12 +10,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.5.0";
   pname = "portalocker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gwjnalfwl1mb9a04m9h3hrds75xmc9na666aiz2cgz0m545dcrz";
+    sha256 = "08y5k39mn5a7n69wv0hsyjqb51lazs4i4dpxp42nla2lhllnpbyr";
   };
 
   checkInputs = [

From 265692f9ffdc6335411572c6f153498414aa284e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 5 Aug 2019 16:01:42 +0200
Subject: [PATCH 331/562] lua*Packages.cqueues: 20171014.52-0 -> 20190731.52-0

My main aim is to fix it on aarch64 NixOS.
The patch was included in the release.
---
 pkgs/development/lua-modules/generated-packages.nix | 6 +++---
 pkgs/development/lua-modules/overrides.nix          | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 6309d84fe2e..1e2e8f7259d 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -196,11 +196,11 @@ coxpcall = buildLuarocksPackage {
 };
 cqueues = buildLuarocksPackage {
   pname = "cqueues";
-  version = "20171014.52-0";
+  version = "20190731.52-0";
 
   src = fetchurl {
-    url    = https://luarocks.org/cqueues-20171014.52-0.src.rock;
-    sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx";
+    url    = https://luarocks.org/cqueues-20190731.52-0.src.rock;
+    sha256 = "07rs34amsxf2bc5ccqdad0c63c70737r54316cbd9qh1a2wbvz8s";
   };
   disabled = (lua.luaversion != "5.2");
   propagatedBuildInputs = [ lua ];
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 1ce2dc809e5..5bbc6dc5709 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -40,15 +40,6 @@ with super;
       { name = "CRYPTO"; dep = pkgs.openssl; }
       { name = "OPENSSL"; dep = pkgs.openssl; }
     ];
-    patches = [
-      # https://github.com/wahern/cqueues/issues/216 &
-      # https://github.com/wahern/cqueues/issues/217
-      (pkgs.fetchpatch {
-        name = "find-version-fix.patch";
-        url = "https://github.com/wahern/cqueues/pull/217.patch";
-        sha256 = "0068ql0jlxmjkvhzydyy52sjd0k4vad6b8w4y5szpbv4vb2lzcsc";
-      })
-    ];
     disabled = luaOlder "5.1" || luaAtLeast "5.4";
     # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
     # version, which doesn't work well for us, so modify it

From 81b91fe2587aa218c0372c7c09c7f543fc40a886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 5 Aug 2019 16:02:49 +0200
Subject: [PATCH 332/562] lua*Packages.luaossl: 20190612-0 -> 20190731-0

My main aim is to fix it on aarch64 NixOS.
---
 pkgs/development/lua-modules/generated-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 1e2e8f7259d..dce179cd640 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -926,11 +926,11 @@ luafilesystem = buildLuarocksPackage {
 };
 luaossl = buildLuarocksPackage {
   pname = "luaossl";
-  version = "20190612-0";
+  version = "20190731-0";
 
   src = fetchurl {
-    url    = https://luarocks.org/luaossl-20190612-0.src.rock;
-    sha256 = "0q47rsfjnx3rbbr9jl2j5nlj56c6mwmnnma9m4rrbsza2p98wb4s";
+    url    = https://luarocks.org/luaossl-20190731-0.src.rock;
+    sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m";
   };
   propagatedBuildInputs = [ lua ];
 

From 577508ef146d581ee5546a670953ec8c04540512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 5 Aug 2019 17:01:12 +0200
Subject: [PATCH 333/562] knot-resolver: 4.1.0 -> 4.2.0

No really significant changes, I'd say:
https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v4.2.0
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 34791cfdd71..7a6c9de885a 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,11 +23,11 @@ exportLuaPathsFor = luaPkgs: ''
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68";
+    sha256 = "b37ff9ceefbaa4e4527d183fb1bbb63e641d34d9889ce92715128bc1423c7ef4";
   };
 
   outputs = [ "out" "dev" ];

From 040c201d1ba747b0b8c4e4dfa2a4791d579d9e15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 11:56:40 -0700
Subject: [PATCH 334/562] python37Packages.globus-sdk: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index e42cf5756f1..45ae5fe00de 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d96f7ed1887c8f55f2bc8d493cd8ec73ff9f3361f0a134203e34e2e57bedd964";
+    sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz";
   };
 
   checkPhase = ''

From 7dfa1f842e6c27b6744f496f703bb8c29c5131ee Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Mon, 29 Jul 2019 22:50:03 +0200
Subject: [PATCH 335/562] pythonPackages.oath: init at 1.4.3

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

diff --git a/pkgs/development/python-modules/oath/default.nix b/pkgs/development/python-modules/oath/default.nix
new file mode 100644
index 00000000000..a64eeb8e103
--- /dev/null
+++ b/pkgs/development/python-modules/oath/default.nix
@@ -0,0 +1,21 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "oath";
+  version = "1.4.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xqgcqgx6aa0j21hwsdb3aqpqhviwj756bcqjjjcm1h1aij11p6m";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python implementation of the three main OATH specifications: HOTP, TOTP and OCRA";
+    homepage = "https://github.com/bdauvergne/python-oath";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ aw ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb92e696789..b8d5f2a993b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -745,6 +745,8 @@ in {
 
   numericalunits = callPackage ../development/python-modules/numericalunits { };
 
+  oath = callPackage ../development/python-modules/oath { };
+
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };

From 11fb28f305a36982f9a908dd5620746ff4aa0b41 Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Mon, 29 Jul 2019 22:50:28 +0200
Subject: [PATCH 336/562] pythonPackages.python-vipaccess: init at 0.10.3

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

diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix
new file mode 100644
index 00000000000..30c6dff048a
--- /dev/null
+++ b/pkgs/development/python-modules/python-vipaccess/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, lxml
+, oath
+, pycryptodome
+, requests
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "python-vipaccess";
+  version = "0.10.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1m6b7qipiaj6pz86kjhyq5m5jxxijpk58gpsdkj5bn0wjl6x1pg2";
+  };
+
+  propagatedBuildInputs = [
+    lxml
+    oath
+    pycryptodome
+    requests
+  ];
+
+  checkInputs = [ pytest ];
+  # test_check_token_detects_valid_hotp_token,
+  # test_check_token_detects_valid_totp_token and
+  # test_check_token_detects_invlaid_token require network
+  checkPhase = ''
+    mv vipaccess vipaccess.hidden
+    pytest tests/ -k 'not test_check_token'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free software implementation of Symantec's VIP Access application and protocol";
+    homepage = "https://github.com/dlenski/python-vipaccess";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ aw ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8d5f2a993b..522ec8d12cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1063,6 +1063,8 @@ in {
 
   python-utils = callPackage ../development/python-modules/python-utils { };
 
+  python-vipaccess = callPackage ../development/python-modules/python-vipaccess { };
+
   pytimeparse =  callPackage ../development/python-modules/pytimeparse { };
 
   pytricia =  callPackage ../development/python-modules/pytricia { };

From 95ad25e667563d9d2a9389cb853563b81dc86380 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 12:10:56 -0700
Subject: [PATCH 337/562] python37Packages.palettable: 3.1.1 -> 3.2.0

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

diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix
index 6b2113352b4..a27ad2172e0 100644
--- a/pkgs/development/python-modules/palettable/default.nix
+++ b/pkgs/development/python-modules/palettable/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "palettable";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0685b223a236bb7e2a900ef7a855ccf9a4027361c8acf400f3b350ea51870f80";
+    sha256 = "1qp83l4mnwa9rb06m1d45i4691nkbqi82895ck4j6pirb825mz4c";
   };
 
   checkInputs = [ pytest ];

From bd6a45881940e21d9f3f41d10a99b76c767e2579 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 12:13:25 -0700
Subject: [PATCH 338/562] python37Packages.h2: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 910080e679f..c267b6d4726 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "h2";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb";
+    sha256 = "1d1svhixk3hr78ph3nx8wi7sagx1xrvm712mmk028i2rhb92p8xq";
   };
 
   propagatedBuildInputs = [ enum34 hpack hyperframe ];

From ad6bf3d5c02310d9b416cdcf9aa0044d59e524d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 12:23:54 -0700
Subject: [PATCH 339/562] python37Packages.html5-parser: 0.4.7 -> 0.4.8

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

diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index a09ed7b9420..f3b24b3d371 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "html5-parser";
-  version = "0.4.7";
+  version = "0.4.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gzs9fa38m80y509fg58ylwhxgy7w28ww968pi6wmfrih9ib6l93";
+    sha256 = "00d1zfk72xzyibh7l4ib57y0isn5gic7avgbh7afbkk99iwd5smi";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6acaa3395f0ae4a305e3e26fd6239805c432581e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 12:31:32 -0700
Subject: [PATCH 340/562] python37Packages.kubernetes: 9.0.0 -> 10.0.0

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

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index e154c5c9c0e..8ba7b109264 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "9.0.0";
+  version = "10.0.0";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gz3sk4s0gx68xpxjwzp9n2shlxfa9d5j4h7cvmglim9bgasxc58";
+    sha256 = "0v3hiy427ca010k8brys3aafgb5013i32yva1nmiibk3xcf7f90f";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];

From 361d69f2167f41ef8744c8ae7709c660b43b67ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 12:45:09 -0700
Subject: [PATCH 341/562] python37Packages.pyotp: 2.2.7 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix
index 05ba24eac39..6c1dcadaccf 100644
--- a/pkgs/development/python-modules/pyotp/default.nix
+++ b/pkgs/development/python-modules/pyotp/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pyotp";
-  version = "2.2.7";
+  version = "2.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00p69nw431f0s2ilg0hnd77p1l22m06p9rq4f8zfapmavnmzw3xy";
+    sha256 = "18d13ikra1iq0xyfqfm72zhgwxi2qi9ps6z1a6zmqp4qrn57wlzw";
   };
 
   meta = with lib; {

From 6e905db21eaeed694f012be4c1f9555f5945ad75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 13:02:30 -0700
Subject: [PATCH 342/562] python37Packages.rpyc: 4.1.0 -> 4.1.1

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

diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix
index b69bf1851a8..5fbfba39ddc 100644
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "rpyc";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pz90h21f74n8i3cx5ndxm4r3rismkx5qbw1c0cmfci9a3009rq5";
+    sha256 = "0rhmwq1jra2cs0j09z2ks4vnv0svi8lj21nq9qq50i52x4ml4yb7";
   };
 
   propagatedBuildInputs = [ nose plumbum ];

From f3730d12e530c41707d8ff2e23a046c9ee731054 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 13:24:02 -0700
Subject: [PATCH 343/562] python37Packages.relatorio: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index e9f4b8e2bd6..13a41d14f02 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -2,10 +2,10 @@
 
 buildPythonPackage rec {
   pname = "relatorio";
-  version = "0.8.1";
+  version = "0.9.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "149a1c4c2a35d9b9e634fe80cac405bc9b4c03a42f818302362183515e7e835d";
+    sha256 = "0q93sl7ppfvjxylgq9m5n4xdgv4af7d69yxd84zszq10vjmpsg6k";
   };
   propagatedBuildInputs = [
     genshi

From a5c30382751b07633b0296b7db346bd76ff8a6a5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 13:36:53 -0700
Subject: [PATCH 344/562] python37Packages.pyutilib: 5.7.0 -> 5.7.1

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

diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix
index 0e19b971a16..8d9157fd7fb 100644
--- a/pkgs/development/python-modules/pyutilib/default.nix
+++ b/pkgs/development/python-modules/pyutilib/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "pyutilib";
-  version = "5.7.0";
+  version = "5.7.1";
 
   src = fetchPypi {
     pname = "PyUtilib";
     inherit version;
-    sha256 = "086fzgjb2mjgkfhg1hvc2gcyam2ab28mijygwica5fg4zz6rn32l";
+    sha256 = "1m5ijc5qmv8hg4yj496ix77hbcf7ylk4sa98ym53sfsyz0mg3kxr";
   };
 
   propagatedBuildInputs = [

From 9a9dc03cf49ab1672611ec07aead6130fd65b2be Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 5 Aug 2019 15:13:59 +0300
Subject: [PATCH 345/562] cantata: use qt5's mkDerivation

see #65399
---
 pkgs/applications/audio/cantata/default.nix | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index dc805a8caf9..292f28554d0 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, vlc
 , qtbase, qtmultimedia, qtsvg, qttools
 
 # Cantata doesn't build with cdparanoia enabled so we disable that
@@ -35,7 +35,7 @@ let
 
   withUdisks = (withTaglib && withDevices);
 
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
@@ -46,20 +46,20 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
-    ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
-    ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
-    ++ stdenv.lib.optional  withCdda cdparanoia
-    ++ stdenv.lib.optional  withCddb libcddb
-    ++ stdenv.lib.optional  withLame lame
-    ++ stdenv.lib.optional  withMtp libmtp
-    ++ stdenv.lib.optional  withMusicbrainz libmusicbrainz5
-    ++ stdenv.lib.optional  withUdisks udisks2;
+    ++ lib.optionals withTaglib [ taglib taglib_extras ]
+    ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
+    ++ lib.optional  withCdda cdparanoia
+    ++ lib.optional  withCddb libcddb
+    ++ lib.optional  withLame lame
+    ++ lib.optional  withMtp libmtp
+    ++ lib.optional  withMusicbrainz libmusicbrainz5
+    ++ lib.optional  withUdisks udisks2;
 
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   enableParallelBuilding = true;
 
-  cmakeFlags = stdenv.lib.flatten [
+  cmakeFlags = lib.flatten [
     (fstats withTaglib        [ "TAGLIB" "TAGLIB_EXTRAS" ])
     (fstats withReplaygain    [ "FFMPEG" "MPG123" "SPEEXDSP" ])
     (fstat withCdda           "CDPARANOIA")
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
     "-DENABLE_HTTPS_SUPPORT=ON"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
     license     = licenses.gpl3;

From 5d556c8b94248f1ea0433161999cd6a036ee380b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 13:48:21 -0700
Subject: [PATCH 346/562] python37Packages.yattag: 1.11.2 -> 1.12.2

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

diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix
index 89a9e1abdc4..30518a19399 100644
--- a/pkgs/development/python-modules/yattag/default.nix
+++ b/pkgs/development/python-modules/yattag/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "yattag";
-  version = "1.11.2";
+  version = "1.12.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0grf7hskbxfxj60qmd44xiwmr9mzmi09inilvhykw28m0c84s8fp";
+    sha256 = "1g0zhf09vs8cq0l5lx10dnqpimvg5mzh9k0z12n6nnfsw11cila7";
   };
 
   meta = with lib; {

From 47ad7d313135f97815efa2eaacfd7fdb52cc689c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 5 Aug 2019 22:10:32 +0200
Subject: [PATCH 347/562] lua*Packages.cqueues: fixup darwin build

---
 pkgs/development/lua-modules/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 5bbc6dc5709..e765118464d 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -40,6 +40,10 @@ with super;
       { name = "CRYPTO"; dep = pkgs.openssl; }
       { name = "OPENSSL"; dep = pkgs.openssl; }
     ];
+
+    # https://github.com/wahern/cqueues/issues/227
+    NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null;
+
     disabled = luaOlder "5.1" || luaAtLeast "5.4";
     # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
     # version, which doesn't work well for us, so modify it

From 24a9e88d8b0df35913d5449a0a922338710fe051 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 5 Aug 2019 16:20:00 -0500
Subject: [PATCH 348/562] dsvpn: 0.1.0 -> 0.1.2

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

diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/applications/networking/dsvpn/default.nix
index 68198ae14e2..dd564fc754c 100644
--- a/pkgs/applications/networking/dsvpn/default.nix
+++ b/pkgs/applications/networking/dsvpn/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dsvpn";
-  version = "0.1.0";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = pname;
     rev = version;
-    sha256 = "1g747197zpg83ba9l9vxg8m3jv13wcprhnyr8asdxq745kzmynsr";
+    sha256 = "0vvvm664lkhnqyc03ylz8acz24dgpzyhwdlci5bc68s6wzsba549";
   };
 
   installPhase = ''

From df02af5dbed3d84e005e3b227946474b2ae9ffd0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 14:21:18 -0700
Subject: [PATCH 349/562] python37Packages.pytest-pylint: 0.14.0 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix
index 8943f220fe6..52eeccc7cd0 100644
--- a/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-pylint";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7bfbb66fc6dc160193a9e813a7c55e5ae32028f18660deeb90e1cb7e980cbbac";
+    sha256 = "1v6jqxbvzaw6v3xxwd689agy01k0j06q5c3q8gn2f3jlkrvylf4c";
   };
 
   buildInputs = [ pytestrunner ];

From 6b0e80742db7abb11732328fde7c2f5257d523ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 14:31:15 -0700
Subject: [PATCH 350/562] python37Packages.qtpy: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index 19cfcff4ab1..5d2210e00c4 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtPy";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14hws3zc2d548bfkxk1j2xy4ll368rak3z16bz3pdlj9j259jrpb";
+    sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd";
   };
 
   # no concrete propagatedBuildInputs as multiple backends are supposed

From f8d83938a757b26802535af14ab1281d369f0fe4 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 1 Aug 2019 09:23:53 +0000
Subject: [PATCH 351/562] swig4: init at 4.0.0

SWIG 4 is not a complete replacement for SWIG 3 because it has removed support
for CFFI, Allegrocl, Chicken, CLISP, S-EXP, UFFI, Pike, Modula3.
---
 pkgs/development/tools/misc/swig/4.nix | 37 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/misc/swig/4.nix

diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix
new file mode 100644
index 00000000000..68febba3813
--- /dev/null
+++ b/pkgs/development/tools/misc/swig/4.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+
+stdenv.mkDerivation rec {
+  pname = "swig";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "swig";
+    repo = "swig";
+    rev = "rel-${version}";
+    sha256 = "0yx33972jd3214xr3mrap0j5clma9bvs42qz8x38dfz62xlsi78v";
+  };
+
+  PCRE_CONFIG = "${pcre.dev}/bin/pcre-config";
+  nativeBuildInputs = [ autoconf automake libtool bison ];
+  buildInputs = [ pcre ];
+
+  configureFlags = [ "--without-tcl" ];
+
+  # Disable ccache documentation as it needs yodl
+  postPatch = ''
+    sed -i '/man1/d' CCache/Makefile.in
+  '';
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
+    homepage = http://swig.org/;
+    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05df1e619da..bf8e64f3800 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9870,6 +9870,7 @@ in
   swig1 = callPackage ../development/tools/misc/swig { };
   swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
   swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
+  swig4 = callPackage ../development/tools/misc/swig/4.nix { };
   swig = swig3;
   swigWithJava = swig;
 

From e0bfbcb1f4d7088dbaa23a43496f9e10af2be9a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 15:01:23 -0700
Subject: [PATCH 352/562] qmapshack: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index f7a8bc0e3a1..99a0acbcc8c 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   name = "qmapshack-${version}";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchurl {
     url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
-    sha256 = "1cv1f718r8vqyk2l6w3alz2aqjvb4msz8705pm9yr5ndi28qyrba";
+    sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9";
   };
 
   nativeBuildInputs = [ cmake ];

From 5c654f2ce53ca8d36ef9539cbc0e0ae56412d1b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 15:06:23 -0700
Subject: [PATCH 353/562] python37Packages.Yapsy: 1.12.0 -> 1.12.2

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

diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix
index 9aa1985270d..dfdd3dd3c05 100644
--- a/pkgs/development/python-modules/yapsy/default.nix
+++ b/pkgs/development/python-modules/yapsy/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Yapsy";
-  version = "1.12.0";
+  version = "1.12.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g1yd8nvhfdasckb929rijmj040x25ycns2b3l5wq53gm4lv537h";
+    sha256 = "12rznbnswfw0w7qfbvmmffr9r317gl1rqg36nijwzsklkjgks4fq";
   };
 
   meta = with stdenv.lib; {

From 48db5c1fe8f4a83ad8df96c4256f5794acb08556 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 15:11:52 -0700
Subject: [PATCH 354/562] python37Packages.qtconsole: 4.5.1 -> 4.5.2

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

diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index 6e3c25ef0dd..055a54612a0 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4af84facdd6f00a6b9b2927255f717bb23ae4b7a20ba1d9ef0a5a5a8dbe01ae2";
+    sha256 = "0z6d2rmzrx2dzbx94xxmsrl6vn6jjpzvb6014y2bqhwr7znbjzkn";
   };
 
   checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];

From eb69c899e8fbe1299981f232594ece51f5a07d3e Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Mon, 5 Aug 2019 18:14:33 -0400
Subject: [PATCH 355/562] python*Packages.msgpack-numpy: Update wrong
 description

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

diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix
index 45b64355e45..c23f0b6572e 100644
--- a/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Practical Machine Learning for NLP in Python";
+    description = "Numpy data type serialization using msgpack";
     homepage = https://github.com/lebedov/msgpack-numpy;
     license = licenses.bsd3;
     maintainers = with maintainers; [ aborsu ];

From e853b05efb97a0765214b57a71cb66cd1eb142cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 15:26:28 -0700
Subject: [PATCH 356/562] qtractor: 0.9.8 -> 0.9.9

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

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index b83804e16be..1c9829bcd9f 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1llajl450yh7bka32ngm4xdva6a2nnxzjc497ydh07rwkap16smx";
+    sha256 = "0qlbccdxyfy0f09y6qg1xkg12fm67bf2f2c27c22cg8lzk9ang5j";
   };
 
   nativeBuildInputs = [

From 282c02f642a57d22a960f32fb6b6ac69875b118c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 15:29:14 -0700
Subject: [PATCH 357/562] python37Packages.python-rapidjson: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index 07cbffad1f8..c25f97434b0 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -8,13 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.7.1";
+  version = "0.7.2";
   pname = "python-rapidjson";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ea01520ebe28d270c79120a836d251fbb2187227695461a310fe0293f348b2d";
+    sha256 = "0z8wzl5mjzs97y7sbhlm59kak3z377xln3z8lkjwrsh2sh5c9x3v";
   };
 
   LC_ALL="en_US.utf-8";

From 47fb3ed75e0ee3605c633100675ca4ebb6beae25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 15:37:06 -0700
Subject: [PATCH 358/562] python37Packages.shodan: 1.13.0 -> 1.14.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-shodan/versions
---
 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 cefe7dac221..8723a7b940c 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "shodan";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06z9h5vxrvqns3yr4jfrxifw0iqdn6ijlnznpmyi8nc18h8yma2a";
+    sha256 = "0c5x53757p6ihh1f8xqsal2gi9ikcl3464b38qinva51s0kkb58k";
   };
 
   propagatedBuildInputs = [

From 52fa0c2cc50ab8c2ff75565250f1507957af8f95 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 18:41:32 -0400
Subject: [PATCH 359/562] pantheon: use repoName

Now these expressions don't look so weird.
---
 .../pantheon/apps/elementary-calculator/default.nix  | 10 +++++-----
 .../pantheon/apps/elementary-calendar/default.nix    | 10 +++++-----
 .../pantheon/apps/elementary-camera/default.nix      | 10 +++++-----
 .../pantheon/apps/elementary-code/default.nix        | 10 +++++-----
 .../pantheon/apps/elementary-files/default.nix       | 10 +++++-----
 .../pantheon/apps/elementary-music/default.nix       | 10 +++++-----
 .../pantheon/apps/elementary-photos/default.nix      | 10 +++++-----
 .../apps/elementary-screenshot-tool/default.nix      | 10 +++++-----
 .../pantheon/apps/elementary-terminal/default.nix    | 10 +++++-----
 .../pantheon/apps/elementary-videos/default.nix      | 10 +++++-----
 .../artwork/elementary-gtk-theme/default.nix         | 10 +++++-----
 .../artwork/elementary-icon-theme/default.nix        | 10 +++++-----
 .../artwork/elementary-sound-theme/default.nix       | 10 +++++-----
 .../artwork/elementary-wallpapers/default.nix        | 10 +++++-----
 .../desktop/elementary-default-settings/default.nix  | 10 +++++-----
 .../pantheon/desktop/elementary-greeter/default.nix  | 10 +++++-----
 .../desktop/elementary-print-shim/default.nix        | 10 +++++-----
 .../desktop/elementary-session-settings/default.nix  | 12 ++++++------
 .../desktop/elementary-shortcut-overlay/default.nix  | 10 +++++-----
 .../desktop/extra-elementary-contracts/default.nix   |  2 --
 .../applications-menu/default.nix                    | 10 +++++-----
 .../services/elementary-capnet-assist/default.nix    | 10 +++++-----
 .../services/elementary-dpms-helper/default.nix      | 10 +++++-----
 .../services/elementary-settings-daemon/default.nix  |  8 ++++----
 24 files changed, 115 insertions(+), 117 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 4a4850a0824..2c46466b3a6 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -4,22 +4,22 @@
 , appstream, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "calculator";
+  pname = "elementary-calculator";
   version = "1.5.2";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "calculator";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 9f684c22767..f079f7120e8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -5,22 +5,22 @@
 , elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "calendar";
+  pname = "elementary-calendar";
   version = "5.0";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "calendar";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 90f326fb826..67c7241c3cc 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -3,22 +3,22 @@
 , libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "camera";
+  pname = "elementary-camera";
   version = "1.0.4";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "camera";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index a869ff24e92..50e4cb95f77 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -4,22 +4,22 @@
 , vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "code";
+  pname = "elementary-code";
   version = "3.1.1";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "code";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ad4cfa86c27..825f663b51e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -4,22 +4,22 @@
 , elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "files";
+  pname = "elementary-files";
   version = "4.1.9";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "files";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index cba593e4c96..b0ca0e95846 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -6,22 +6,22 @@
 , elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "music";
+  pname = "elementary-music";
   version = "5.0.4";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "music";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "02qjsf9xnfh043xbls9mll2r1wcdvclw60x8wysv12rhbm90gwvp";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 1704db78c5e..b4807c6cf3a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -4,22 +4,22 @@
 , scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }:
 
 stdenv.mkDerivation rec {
-  pname = "photos";
+  pname = "elementary-photos";
   version = "2.6.4";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "photos";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 74af15e2787..5cdff0b0ecb 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -3,22 +3,22 @@
 , libcanberra, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
+  pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
   version = "1.6.2";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "screenshot";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = "screenshot";
+    repo = repoName;
     rev = version;
     sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = "screenshot";
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 2479d999e8f..fa80c41a8ce 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -3,22 +3,22 @@
 , elementary-icon-theme, appstream, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "terminal";
+  pname = "elementary-terminal";
   version = "5.3.6";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "terminal";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index 2d978d966b9..5f72b9534ff 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -3,22 +3,22 @@
 , elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "videos";
+  pname = "elementary-videos";
   version = "2.6.3";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "videos";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index e30252bb71c..3c5e3390605 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja }:
 
 stdenv.mkDerivation rec {
-  pname = "stylesheet";
+  pname = "elementary-gtk-theme";
   version = "5.2.5";
 
-  name = "elementary-gtk-theme-${version}";
+  repoName = "stylesheet";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-gtk-theme";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index d8fa143686e..fee5485bb29 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }:
 
 stdenv.mkDerivation rec {
-  pname = "icons";
+  pname = "elementary-icon-theme";
   version = "5.0.4";
 
-  name = "elementary-icon-theme-${version}";
+  repoName = "icons";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-icon-theme";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index 430acfd9ac1..c01652f97e9 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  pname = "sound-theme";
+  pname = "elementary-sound-theme";
   version = "1.0";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "sound-theme";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 898d5f7b454..4d6d38cf379 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon }:
 
 stdenv.mkDerivation rec {
-  pname = "wallpapers";
+  pname = "elementary-wallpapers";
   version = "5.3";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "wallpapers";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index e7aea3be91e..01af6c507c0 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon }:
 
 stdenv.mkDerivation rec {
-  pname = "default-settings";
+  pname = "elementary-default-settings";
   version = "5.1.0";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "default-settings";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index a71736887bb..8ef85b90a3b 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -5,22 +5,22 @@
 , clutter-gtk, libGL, dbus, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "greeter";
+  pname = "elementary-greeter";
   version = "3.3.1";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "greeter";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index d8634b48570..61afde4d82f 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }:
 
 stdenv.mkDerivation rec {
-  pname = "print";
+  pname = "elementary-print-shim";
   version = "0.1.3";
 
-  name = "elementary-print-shim-${version}";
+  repoName = "print";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}-shim";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 5fe22f0db81..0485dda94a9 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -7,7 +7,7 @@ let
   #
 
   #
-  # Upstream relies on /etc/skel to initiate a new users home directory with planks dockitems.
+  # Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems.
   #
   # That is not possible within nixos, but we can achieve this easily with a simple script that copies
   # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session
@@ -44,22 +44,22 @@ let
 in
 
 stdenv.mkDerivation rec {
-  pname = "session-settings";
+  pname = "elementary-session-settings";
   version = "5.0.3";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "session-settings";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index ca0ab888f14..eafe3b4aa20 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -2,22 +2,22 @@
 , gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "shortcut-overlay";
+  pname = "elementary-shortcut-overlay";
   version = "1.0.1";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "shortcut-overlay";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
index 4e19a65b58d..ad67007e529 100644
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
   pname = "extra-elementary-contracts";
   version = "2018-08-21";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "worldofpeace";
     repo = pname;
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 0d00ee2072d..3a497a23b9b 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -4,22 +4,22 @@
 , bc }:
 
 stdenv.mkDerivation rec {
-  pname = "applications-menu";
+  pname = "wingpanel-applications-menu";
   version = "2.4.3";
 
-  name = "wingpanel-${pname}-${version}";
+  repoName = "applications-menu";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "wingpanel-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 055706b1521..4f8d3e9db42 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -2,22 +2,22 @@
 , desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "capnet-assist";
+  pname = "elementary-capnet-assist";
   version = "2.2.3";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "capnet-assist";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
index 54f556e3a92..f0ba319d32e 100644
--- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pantheon, makeWrapper, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  pname = "dpms-helper";
+  pname = "elementary-dpms-helper";
   version = "1.0";
 
-  name = "elementary-${pname}-${version}";
+  repoName = "dpms-helper";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = pname;
+    repo = repoName;
     rev = version;
     sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh";
   };
 
   passthru = {
     updateScript = pantheon.updateScript {
-      repoName = pname;
-      attrPath = "elementary-${pname}";
+      inherit repoName;
+      attrPath = pname;
     };
   };
 
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index d8514c51f4f..8381796c456 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -44,16 +44,16 @@ stdenv.mkDerivation rec {
   pname = "elementary-settings-daemon";
   version = "3.30.2";
 
-  projectName = "gnome-settings-daemon";
+  repoName = "gnome-settings-daemon";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${repoName}/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz";
     sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
   };
 
   # Source for ubuntu's patchset
   src2 = fetchgit {
-    url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
+    url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}";
     rev = "refs/tags/ubuntu/${version}-1ubuntu1";
     sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
   };
@@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome3.updateScript {
-      packageName = projectName;
+      packageName = repoName;
       attrPath = "pantheon.${pname}";
     };
   };

From 519e4d25088e57a85bcd326f980c2b8ce099abc2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 13:24:24 -0400
Subject: [PATCH 360/562] pantheon.elementary-icon-theme: move gtk3 to
 nativeBuildInputs

---
 .../pantheon/artwork/elementary-icon-theme/default.nix     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index fee5485bb29..2cc88015f93 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -21,14 +21,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    gtk3
     meson
     ninja
     python3
   ];
 
-  buildInputs = [ gtk3 ];
-
-  propagatedBuildInputs = [ hicolor-icon-theme ];
+  propagatedBuildInputs = [
+    hicolor-icon-theme
+  ];
 
   mesonFlags = [
     "-Dvolume_icons=false" # Tries to install some icons to /

From bd429bb06ce103c466113563f5640fc1eaea759f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 13:26:19 -0400
Subject: [PATCH 361/562] pantheon: use dontConfigure where applicable

---
 pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix | 1 +
 .../pantheon/desktop/elementary-default-settings/default.nix     | 1 +
 .../pantheon/desktop/elementary-session-settings/default.nix     | 1 +
 .../pantheon/desktop/extra-elementary-contracts/default.nix      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 4d6d38cf379..28408dabb9c 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   dontBuild = true;
+  dontConfigure = true;
 
   installPhase = ''
     mkdir -p $out/share/backgrounds/elementary
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 01af6c507c0..2fcba8fc347 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   dontBuild = true;
+  dontConfigure = true;
 
   installPhase = ''
     mkdir -p $out/etc/gtk-3.0
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 0485dda94a9..637c3691f68 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
   };
 
   dontBuild = true;
+  dontConfigure = true;
 
   installPhase = ''
     mkdir -p $out/share/applications
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
index ad67007e529..34b8769e56c 100644
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   dontBuild = true;
+  dontConfigure = true;
 
   installPhase = ''
     mkdir -p $out/share/contractor

From c9091c1d9d7a174ab5517403ece89ab654e46e53 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 5 Aug 2019 23:32:16 +0000
Subject: [PATCH 362/562] llvmPackages_8: 8.0.0 -> 8.0.1

Starting with 8.0.1 and 7.1.0 LLVM has moved release hosting to GitHub.
---
 pkgs/development/compilers/llvm/8/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/8/compiler-rt.nix    | 2 +-
 pkgs/development/compilers/llvm/8/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/8/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/8/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/8/libunwind.nix      | 2 +-
 pkgs/development/compilers/llvm/8/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/8/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/8/llvm.nix           | 4 ++--
 pkgs/development/compilers/llvm/8/openmp.nix         | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 0b38660c4c4..266a877f762 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -8,7 +8,7 @@ let
   self = stdenv.mkDerivation ({
     name = "clang-${version}";
 
-    src = fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08";
+    src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh";
 
     unpackPhase = ''
       unpackFile $src
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index a8bbb1f719b..25db273d7e3 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   name = "compiler-rt-${version}";
   inherit version;
-  src = fetch "compiler-rt" "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl";
+  src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi";
 
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index 48cf9e5e589..f864e24acfe 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -5,15 +5,15 @@
 }:
 
 let
-  release_version = "8.0.0";
+  release_version = "8.0.1";
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "0jwx6nnshp92pd5852y7ip7qhaqdf8az5g0440pli9q8whmi402g";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix
index 3d67c37dcdd..f8a07de0722 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libc++/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462";
+  src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix
index bb5b368267f..1ee6d069f4b 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/8/libc++abi.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2";
+  src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/pkgs/development/compilers/llvm/8/libunwind.nix b/pkgs/development/compilers/llvm/8/libunwind.nix
index a4ceb9102ef..64832002853 100644
--- a/pkgs/development/compilers/llvm/8/libunwind.nix
+++ b/pkgs/development/compilers/llvm/8/libunwind.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libunwind-${version}";
 
-  src = fetch "libunwind" "0q7ndlldid9wchnny0a936llwxj7zgb9gxp46wjjxvwwkik3l97z";
+  src = fetch "libunwind" "0vhgcgzsb33l83qaikrkj87ypqb48mi607rccczccwiiv8ficw0q";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix
index 7fff6843c5f..aec1b14b994 100644
--- a/pkgs/development/compilers/llvm/8/lld.nix
+++ b/pkgs/development/compilers/llvm/8/lld.nix
@@ -9,7 +9,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "0dvf38pbm7jy88g66mz7ikkdfhm2qpj0iyzh62hzycifjbnciblw";
+  src = fetch "lld" "121xhxrlvwy3k5nf6p1wv31whxlb635ssfkci8z93mwv4ja1xflz";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix
index 861ef1f3510..f31da000bb8 100644
--- a/pkgs/development/compilers/llvm/8/lldb.nix
+++ b/pkgs/development/compilers/llvm/8/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "0wq3mi76fk86g2g2bcsr0yhagh1dlf2myk641ai58rc116gqp4a9";
+  src = fetch "lldb" "1mriw4adrwm6kzabrjr7yqmdiylxd6glf6samd80dp8idnm9p9z8";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 1827273d57e..6799a3f935f 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -30,8 +30,8 @@ let
 in stdenv.mkDerivation (rec {
   name = "llvm-${version}";
 
-  src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8";
-  polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3";
+  src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
+  polly_src = fetch "polly" "1lfjdz3ilj5xmjxvicd8f5ykybks67ry2pdb777352r3mzlgg8g8";
 
   unpackPhase = ''
     unpackFile $src
diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix
index bf85cae5abe..8cf55173561 100644
--- a/pkgs/development/compilers/llvm/8/openmp.nix
+++ b/pkgs/development/compilers/llvm/8/openmp.nix
@@ -9,7 +9,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp";
+  src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From e545bb588ecf3f58e0d1c36c1039b7f43180edc5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 16:56:44 -0700
Subject: [PATCH 363/562] python37Packages.wurlitzer: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix
index 322c85b5810..d1797acb7d2 100644
--- a/pkgs/development/python-modules/wurlitzer/default.nix
+++ b/pkgs/development/python-modules/wurlitzer/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "wurlitzer";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add";
+    sha256 = "0nab45pfgqdxhhyshf717xfzniss2h3bx19zdaq9gqr6v8lw6wpr";
   };
 
   checkInputs = [ mock pytest ];

From 4f7975f362a42a4d00cbd3272e7cab90fb5378ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 17:12:47 -0700
Subject: [PATCH 364/562] python37Packages.traits: 5.1.1 -> 5.1.2

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

diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index bfc3ae475eb..bcf205aa1d2 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "traits";
-  version = "5.1.1";
+  version = "5.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lwmqgkjihqkf269xmdqsa302p378zjcpz01k9a98br7ngzrsj64";
+    sha256 = "0a17qmpw0z9h7ybh5yxrghvkcf2q90vgxzbnv1n4i0fxhi7mjy3s";
   };
 
   # Use pytest because its easier to discover tests

From feac3f8c424a2b387b1e951c0f48576c37e891e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 17:29:58 -0700
Subject: [PATCH 365/562] qdirstat: 1.5.90 -> 1.6

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

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index a45f12293fd..61df8f612fc 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper, perlPackages }:
 
 let
-  version = "1.5.90";
+  version = "1.6";
 in stdenv.mkDerivation rec {
   name = "qdirstat-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "shundhammer";
     repo = "qdirstat";
     rev = "${version}";
-    sha256 = "161jzii5p0dflbpixibn3yhp13smjf6aw802rz1q4879s12gqdq6";
+    sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan";
   };
 
   nativeBuildInputs = [ qmake makeWrapper ];

From c2cf4a8ca15d1474e095d74dcfededb82086badc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 18:25:06 -0700
Subject: [PATCH 366/562] shairport-sync: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index cb5d79bdfcc..639fa322525 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -2,11 +2,11 @@
 , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.1";
+  version = "3.3.2";
   name = "shairport-sync-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1i28d6ml07f5f9ik831jagicjk84xdla62hs88bkwajbykzjmqrk";
+    sha256 = "14f09sj2rxmixd5yjmwp82j49rxn1fvcxkvh7qjif893xgk98a3w";
     rev = version;
     repo = "shairport-sync";
     owner = "mikebrady";

From fd10cb40357fc451fa8738f710f8fd2f2d531846 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 18:43:08 -0700
Subject: [PATCH 367/562] shaarli: 0.10.4 -> 0.11.0

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

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index ebca3eae450..64ae1dbbe1d 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-${version}";
-  version = "0.10.4";
+  version = "0.11.0";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "00m41x3nlxcc8dspin61zx7lrv1hjzacjadm34afqrb21yxdp84f";
+    sha256 = "1x3a2chagng749cv48zkvjvfwbggqskv6ckkbbmp4fx9qzy2c32k";
   };
 
   outputs = [ "out" "doc" ];

From a428849ce7b43f2c72c40e0bc58ed548bcd2a4a5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 5 Aug 2019 21:55:29 -0400
Subject: [PATCH 368/562] xmloscopy: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index 9703bd1ecea..778dc845bc5 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -6,7 +6,7 @@ docbook5
 }:
 stdenv.mkDerivation rec {
   name = "xmloscopy-${version}";
-  version = "0.1.2";
+  version = "0.1.3";
 
   buildInputs = [
     makeWrapper
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "grahamc";
     repo = "xmloscopy";
     rev = "v${version}";
-    sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456";
+    sha256 = "06y5bckrmnq7b5ny2hfvlmdws910jw3xbw5nzy3bcpqsccqnjxrc";
   };
 
   installPhase = ''
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/grahamc/xmloscopy;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.grahamc ];
   };
 }

From 16584b52f39f5bac2170e7df068d0069dfb29401 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 5 Aug 2019 22:02:13 -0400
Subject: [PATCH 369/562] xmloscopy: with

---
 pkgs/tools/text/xml/xmloscopy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index 778dc845bc5..e9141bb07db 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
       --set PATH "${spath}"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "wtf is my docbook broken?";
     homepage = https://github.com/grahamc/xmloscopy;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.grahamc ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ grahamc ];
   };
 }

From b8c0210fccbaf840fd5152aa3c8639dafdd5e7c6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 5 Aug 2019 22:02:47 -0400
Subject: [PATCH 370/562] xmloscopy: name -> pname

---
 pkgs/tools/text/xml/xmloscopy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index e9141bb07db..6088df90bd9 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -5,7 +5,7 @@ fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused,
 docbook5
 }:
 stdenv.mkDerivation rec {
-  name = "xmloscopy-${version}";
+  pname = "xmloscopy";
   version = "0.1.3";
 
   buildInputs = [

From 6c23286f6a557cf7a7703b4babb42b3cfd29063f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 07:34:22 -0700
Subject: [PATCH 371/562] python37Packages.jug: 1.6.7 -> 1.6.8

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

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index 6a350d59be6..cb6aa142db0 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , nose, numpy
 , bottle, pyyaml, redis, six
 , zlib }:
 
 buildPythonPackage rec {
   pname = "Jug";
-  version = "1.6.7";
+  version = "1.6.8";
   buildInputs = [ nose numpy ];
   propagatedBuildInputs = [
     bottle
@@ -16,9 +16,18 @@ buildPythonPackage rec {
     zlib
   ];
 
+  patches = [
+    # Fix numpy usage. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/luispedro/jug/commit/814405ce1553d3d2e2e96cfbeae05d63dc4f2491.patch";
+      sha256 = "1l8sssp856dmhxbnv3pzxgwgpv6rb884l0in5x7q19czwn5a4vmv";
+      excludes = [ "ChangeLog" ];
+    })
+  ];
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7faba838f3437163ae8459bff96e2c6ca1298312bdb9104c702685178d17269";
+    sha256 = "0s1l1ln9s6mi2aa132gqr789nnhdpiw057j3sp54v1sbq2cwd42p";
   };
 
   meta = with stdenv.lib; {

From 50dacfbaf27f17ccc173fcbe34a67289312b4ffc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 19:51:49 -0700
Subject: [PATCH 372/562] sauce-connect: 4.5.3 -> 4.5.4

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

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 715aa552ae5..c6b3d0b4cd0 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -4,12 +4,12 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "sauce-connect-${version}";
-  version = "4.5.3";
+  version = "4.5.4";
 
   src = fetchurl (
     if stdenv.hostPlatform.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha256 = "05fv9rggibx6dbdw8ywwwq45i9gdc53b7i7jhvl01m1sn2ygrrqd";
+      sha256 = "1w8fw47q4bzpk5jfagmc0cbp69jdd6jcv2xl1gx91cbp7xd8mcbf";
     } else if stdenv.hostPlatform.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
       sha256 = "1h9n1mzmrmlrbd0921b0sgg7m8z0w71pdb5sif6h1b9f97cp353x";

From 4ec201e7b73d2ccc30a65e0c1f9183e76c229510 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 5 Aug 2019 22:59:57 -0400
Subject: [PATCH 373/562] xmloscopy: buildInputs -> nativeBuildInputs

---
 pkgs/tools/text/xml/xmloscopy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index 6088df90bd9..5d085e41196 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   pname = "xmloscopy";
   version = "0.1.3";
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper
     dev_only_shellcheck
   ];

From 52a5a4496d7e001528587ed775ca74a5027a79fd Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Tue, 6 Aug 2019 11:07:45 +0800
Subject: [PATCH 374/562] eksctl: 0.2.1 -> 0.3.0

---
 pkgs/tools/admin/eksctl/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 8de71ce1256..c68a8fc1ae2 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,24 +2,20 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "0f8rj7jw8ym97bjqaxzn1rnhp5nfx3jf5f51jwczljvr67ik9q75";
+    sha256 = "0xbvx3rpd97hc49njvc4mx5zm2x08hrg8kpkapa8qigyajjxz9fg";
   };
 
-  modSha256 = "1lmkwx0r19c2wg9nm85k92nlxjzr8q917jf3f333yf3csfyiix2f";
+  modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4";
 
   subPackages = [ "cmd/eksctl" ];
 
-  buildFlags =
-  ''
-    -tags netgo
-    -tags release
-  '';
+  buildFlags = [ "-tags netgo" "-tags release" ];
 
   postInstall =
   ''

From 2444738daeebdf890cadd80b5136ffe2f7eb193a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 5 Aug 2019 22:48:29 -0500
Subject: [PATCH 375/562] xcbuild: fix build on darwin

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

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 29325fad724..73fc0f99ce9 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -40,6 +40,9 @@ in stdenv.mkDerivation rec {
   postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed 1i'#include <sys/sysmacros.h>' \
       -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Libraries/libcar/Sources/Rendition.cpp \
+      --replace "#if HAVE_LIBCOMPRESSION" "#if 0"
   '';
 
   enableParallelBuilding = true;

From ad849345e8a3b9c5b9fd9c0fb5065cdbbcfee5f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 21:45:19 -0700
Subject: [PATCH 376/562] tixati: 2.61 -> 2.62

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

diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index ea8b5c3a11f..87b331adf2d 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tixati-${version}";
-  version = "2.61";
+  version = "2.62";
 
   src = fetchurl {
     url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
-    sha256 = "05f8lcsac2mr90bhk999qkj8wwd6igdl07389bqrd1ydjasacl2k";
+    sha256 = "18lmzllkymdigfl1xf696zqmr2b83p4rzlc8ddrcr0zpzy2z2w4a";
   };
 
   installPhase = ''

From 6ef367a5e8cdad4e9195d027b51c534b0a8d7c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Tue, 6 Aug 2019 06:46:03 +0200
Subject: [PATCH 377/562] Suggested changes

---
 pkgs/build-support/ocaml/oasis.nix                |  2 +-
 pkgs/development/ocaml-modules/tcslib/default.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index 2ada920338e..7ad761bde28 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -1,6 +1,6 @@
 { buildOcaml, ocaml_oasis }:
 
-{ name, version, buildInputs ? [], ...
+{ buildInputs ? [], ...
 }@args:
 
 buildOcaml (args // {
diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix
index 40481c89937..7eafb2e6993 100644
--- a/pkgs/development/ocaml-modules/tcslib/default.nix
+++ b/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, buildOasisPackage }:
+{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }:
 
 buildOasisPackage rec {
   name = "tcslib";
-  version = "v0.3";
+  version = "0.3";
 
   minimumSupportedOCamlVersion = "4.03.0";
 
   src = fetchFromGitHub {
     owner  = "tcsprojects";
     repo   = "tcslib";
-    rev    = version;
+    rev    = "v${version}";
     sha256 = "05g6m82blsccq8wx8knxv6a5fzww7hi624jx91f9h87nk2fsplhi";
   };
 
-  buildInputs = with ocamlPackages; [ ounit ];
-  propagatedBuildInputs = with ocamlPackages; [ ocaml_extlib num ];
+  buildInputs = [ ounit ];
+  propagatedBuildInputs = [ ocaml_extlib num ];
 
   meta = {
     homepage = https://github.com/tcsprojects/tcslib;
     description = "A multi-purpose library for OCaml";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ mgttlinger ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mgttlinger ];
   };
 }

From a4c940d569551079ab932c9e22aef9cd1054c2fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:00:55 -0700
Subject: [PATCH 378/562] enlightenment.terminology: 1.4.1 -> 1.5.0

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

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 92d36c0e772..52f0ff15e23 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "terminology";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0mm9v5a94369is3kaarnr3a28wy42wslzi1mcisaidlcldgv7f6p";
+    sha256 = "0v4amfg8ji0mb6j7kcxh3wz1xw5zyxg4rw6ylx17rfw2nc1yamfy";
   };
 
   nativeBuildInputs = [

From 105cc4e4c732df5f153c4d1320d3ab07df2fa661 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:14:46 -0700
Subject: [PATCH 379/562] toot: 0.21.0 -> 0.22.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/toot/versions
---
 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 6079c8807dc..df9ed897370 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.21.0";
+  version = "0.22.0";
   name    = "toot-${version}";
 
   src = fetchFromGitHub {
     owner  = "ihabunek";
     repo   = "toot";
     rev    = "${version}";
-    sha256 = "03s81i9rz7dn33r13p7j2c7yw874hkm64x7myddiqw9lc21fyzql";
+    sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5";
   };
 
   checkInputs = with python3Packages; [ pytest ];

From f6984677b580fb754d1e2feea60646f51151fea4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:17:30 -0700
Subject: [PATCH 380/562] tautulli: 2.1.32 -> 2.1.33

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tautulli/versions
---
 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 b19b4d13893..d074ddf4d72 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.32";
+  version = "2.1.33";
   pname = "Tautulli";
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "05z6l3qs2m72c1hcl3qd1lm17hsmyqk48f8dcsvrxa5hibmf84j4";
+    sha256 = "1yj4akp10fxqndsbb59rjdw9by6rhmz24syyq6d4x5bg72an9n80";
   };
 
   buildPhase = ":";

From 9a6d014b7f670d37d7c305502259f2af07ba4bc9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:28:37 -0700
Subject: [PATCH 381/562] souffle: 1.5.1 -> 1.6.1

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

diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 87eac541862..219d5307790 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "souffle-${version}";
-  version = "1.5.1";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner  = "souffle-lang";
     repo   = "souffle";
     rev    = version;
-    sha256 = "06sa250z3v8hs91p6cqdzlwwaq96j6zmfrrld1fzd1b620aa5iys";
+    sha256 = "004c5iicjnlzn1yz1k7a28s4xdqx00016rr870drdq2z30mxfgz8";
   };
 
   nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];

From 624b316c203f78aedbd79c7aa6f1f74f71337233 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:42:11 -0700
Subject: [PATCH 382/562] tortoisehg: 4.9.1 -> 5.0.2

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

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 2cca53d6fe7..7bd1e9586c9 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "4.9.1";
+    version = "5.0.2";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "0c5gp5wyaiyh8w2zzy1q0f2qv8aa3219shb6swpsdzqr2j9gkk4b";
+      sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

From 01681dfff7df907b87e83d973f7e1de7eab6a2fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 22:45:06 -0700
Subject: [PATCH 383/562] thonny: 3.1.2 -> 3.2.0b7

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

diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index 5f87aad8a87..a6179452f4d 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "thonny";
-  version = "3.1.2";
+  version = "3.2.0b7";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1simqqxm72k5zhavhllkinsyw8ggy6fjs5ppj82g3l5g3919pfna";
+    sha256 = "0p0hi5rj873cszx9rpbjjq51vs6xys3rlq9v1rya710i3fnw0hqh";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 42315c922488459a6a9c79f4ab407c04d360121f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 23:20:43 -0700
Subject: [PATCH 384/562] spectmorph: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 9557770418e..64deede535b 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "spectmorph-${version}";
-  version = "0.4.1";
+  version = "0.5.0";
   src = fetchurl {
     url = "http://spectmorph.org/files/releases/${name}.tar.bz2";
-    sha256 = "0z00yvv3jl8qsx6bz9msmg09mdnj5r5d4ws5bmnylwxk182whbrv";
+    sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
   };
 
   buildInputs = [  libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];

From 4f267d2ca49a5b3a252df4379434c4d35619bed0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 23:24:12 -0700
Subject: [PATCH 385/562] tmate: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index f5e1d69a039..c87fe8bf446 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "tmate-${version}";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner  = "tmate-io";
     repo   = "tmate";
     rev    = version;
-    sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r";
+    sha256 = "0fwqhmkp1jfp8qk7497ws3nzvly7p06mv04z8z0qicn6a961v1sa";
   };
 
   dontUseCmakeConfigure = true;

From 68014be35ec63ef1c5ef5a0ca262a6427e0ecaa3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 23:36:00 -0700
Subject: [PATCH 386/562] symengine: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix
index 40e1a280aa2..424dc116c7e 100644
--- a/pkgs/development/libraries/symengine/default.nix
+++ b/pkgs/development/libraries/symengine/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   name = "symengine-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "symengine";
     repo = "symengine";
     rev = "v${version}";
-    sha256 = "1kz893p3pmsw3gfwickk2nliw8p63yp89xriad7kpw4kmhvgr8gb";
+    sha256 = "0qqxr7l5lr81k6fs2h5isr43x0dw07rwg3ivl6vd8zmmcgsp9ygd";
   };
 
   nativeBuildInputs = [ cmake ];

From 00bb62d4ab0db36a9e7a062ad62dad3fc8290b9d Mon Sep 17 00:00:00 2001
From: Valentin Shirokov <regellosigkeitsaxiom@yandex.ru>
Date: Mon, 5 Aug 2019 23:58:22 +0800
Subject: [PATCH 387/562] stlink: 1.3.0 -> 1.5.1

Version bump
No other changes
---
 pkgs/development/tools/misc/stlink/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 90f901e5112..fdacdaef20f 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, cmake, libusb1 }:
+{ stdenv, fetchFromGitHub, cmake, libusb1 }:
 
 # IMPORTANT: You need permissions to access the stlink usb devices. 
 # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
 let
-  version = "1.3.0";
+  version = "1.5.1";
 in
 stdenv.mkDerivation {
   name = "stlink-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/texane/stlink/archive/${version}.tar.gz";
-    sha256 = "3e8cba21744d2c38a0557f6835a05189e1b98202931bb0183d22efc462c893dd";
+  src = fetchFromGitHub {
+    owner = "texane";
+    repo = "stlink";
+    rev = "v1.5.1";
+    sha256 = "1d5gxiqpsm8fc105cxlp27af9fk339fap5h6nay21x5a7n61jgyc";
   };
 
   buildInputs = [ cmake libusb1 ];

From 0ecba5287256ea22c25bc3b9877f56ff6f38b0cb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 17:24:41 -0700
Subject: [PATCH 388/562] python37Packages.qtawesome: 0.5.7 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 7b1b8b0444c..a6c431764be 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtAwesome";
-  version = "0.5.7";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c70k7b91f64df0v12ykv3xqj9pzgk919k215fb3y0d64zip42ai";
+    sha256 = "05qypwlzjkw31x7qgn01d4kcf40mbymg5c9h3i7cx2r8sw29akjy";
   };
 
   propagatedBuildInputs = [ qtpy six ];

From ca1895ace3d51a537eb9ffad4b6867c3e210e20b Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 6 Aug 2019 09:03:45 +0200
Subject: [PATCH 389/562] qalculate-gtk: 3.2.0 -> 3.3.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 4da3a3f3d7b..b4d82b9583c 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.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "1yhhfqcxi1b7dfrl8qh16l9iwgzvw1p0hhl7nnjpxhdwxz880sv0";
+    sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b";
   };
 
   patchPhase = ''

From f4bc95f26b9abe119116e38a350a7440a098d135 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 00:09:59 -0700
Subject: [PATCH 390/562] tudu: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix
index dea3ea9731b..89a3d128796 100644
--- a/pkgs/applications/office/tudu/default.nix
+++ b/pkgs/applications/office/tudu/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
 
   name = "tudu-${version}";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchurl {
     url = "https://code.meskio.net/tudu/${name}.tar.gz";
-    sha256 = "1xsncvd1c6v8y0dzc5mspy9rrwc89pabhz6r2lihsirk83h2rqym";
+    sha256 = "0140pw457cd05ysws998yhd3b087j98q8m0g3s4br942l65b8n2y";
   };
 
   buildInputs = [ ncurses ];

From 8a02fa477f7ae58061f5d53060dc9f36f1e53d2a Mon Sep 17 00:00:00 2001
From: Marco Perone <pasafama@gmail.com>
Date: Wed, 31 Jul 2019 16:46:47 +0200
Subject: [PATCH 391/562] build-idris-package: add options for idris commands

---
 .../idris-modules/build-idris-package.nix            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index c67d53f8d9c..2ae1d55258b 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -7,6 +7,10 @@
   , version
   , ipkgName ? name
   , extraBuildInputs ? []
+  , idrisBuildOptions ? []
+  , idrisTestOptions ? []
+  , idrisInstallOptions ? []
+  , idrisDocOptions ? []
   , ...
   }@attrs:
 let
@@ -39,14 +43,14 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    idris --build ${ipkgName}.ipkg
+    idris --build ${ipkgName}.ipkg ${lib.escapeShellArgs idrisBuildOptions}
     runHook postBuild
   '';
 
   checkPhase = ''
     runHook preCheck
     if grep -q tests ${ipkgName}.ipkg; then
-      idris --testpkg ${ipkgName}.ipkg
+      idris --testpkg ${ipkgName}.ipkg ${lib.escapeShellArgs idrisTestOptions}
     fi
     runHook postCheck
   '';
@@ -54,9 +58,9 @@ stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
 
-    idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs
+    idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs ${lib.escapeShellArgs idrisInstallOptions}
 
-    IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true
+    IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg ${lib.escapeShellArgs idrisDocOptions} || true
 
     # If the ipkg file defines an executable, install that
     executable=$(grep -Po '^executable = \K.*' ${ipkgName}.ipkg || true)

From 349a843ef413f9746ce97625328670451d5574c0 Mon Sep 17 00:00:00 2001
From: Marco Perone <pasafama@gmail.com>
Date: Wed, 31 Jul 2019 17:15:06 +0200
Subject: [PATCH 392/562] build-idris-package: add documentation on idris
 commands options

---
 doc/languages-frameworks/idris.section.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
index 3025172b5c9..e88015f08e3 100644
--- a/doc/languages-frameworks/idris.section.md
+++ b/doc/languages-frameworks/idris.section.md
@@ -124,3 +124,21 @@ in another file (say `default.nix`) to be able to build it with
 ```
 $ nix-build -A yaml
 ```
+
+## Passing options to `idris` commands
+
+The `build-idris-package` function provides also optional input values to set additional options for the used `idris` commands.
+
+Specifically, you can set `idrisBuildOptions`, `idrisTestOptions`, `idrisInstallOptions` and `idrisDocOptions` to provide additional options to the `idris` command respectively when building, testing, installing and generating docs for your package.
+
+For example you could set
+
+```
+build-idris-package {
+  idrisBuildOptions = [ "--log" "1" "--verbose" ]
+
+  ...
+}
+```
+
+to require verbose output during `idris` build phase.

From 18d7dbe38210155b7c7fbbeb40c1262c1bbe7842 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 6 Aug 2019 14:10:56 +0900
Subject: [PATCH 393/562] qpdfview: 0.4.16 -> 0.4.18

---
 pkgs/applications/misc/qpdfview/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 263bc37660c..81aa18c9f24 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -1,22 +1,23 @@
-{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups
+{stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups
 , file, ghostscript
 }:
 let
   s = # Generated upstream information
   rec {
     baseName="qpdfview";
-    version = "0.4.16";
+    version = "0.4.18";
     name="${baseName}-${version}";
     url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
-    sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
+    sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c";
   };
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [
     qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
   ];
 in
-stdenv.mkDerivation {
-  inherit (s) name version;
+mkDerivation {
+  pname = s.baseName;
+  inherit (s) version;
   inherit nativeBuildInputs buildInputs;
   src = fetchurl {
     inherit (s) url sha256;

From 25d226598daec3720d7e62eb7e4a1b765965551d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 00:45:17 -0700
Subject: [PATCH 394/562] tzupdate: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
index c887876634f..ae418544132 100644
--- a/pkgs/applications/misc/tzupdate/default.nix
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -5,11 +5,11 @@ let
 in
 buildPythonApplication rec {
   pname = "tzupdate";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sc3z2bx2nhnxg82x0jy19pr8lw56chbr90c2lr11w495csqwhz7";
+    sha256 = "13np40h64bgkcj10qw6f4nb51p47bb20fd6pzxq8xbr645a4d34m";
   };
 
   propagatedBuildInputs = [ requests ];

From 5ca7376705fd1804750bb34258baa95331f9032c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 01:22:55 -0700
Subject: [PATCH 395/562] xterm: 347 -> 348

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

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 61aab18bc76..60231350edb 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-347";
+  name = "xterm-348";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "025r22vi5s0328ybhcj0g9js64vabr98hlw8ngy6vyby4zhp63s0";
+    sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb";
   };
 
   buildInputs =

From 1c7d2df130d7fe5724e88d8ed0ee3d4b3487581a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 02:02:09 -0700
Subject: [PATCH 396/562] whois: 5.4.3 -> 5.5.0

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 5ec3199fb89..ddac709e577 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.4.3";
+  version = "5.5.0";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "0rf6ggk9y6gvhyj6zcjvjsbksal8pczlw905h70mgylq20qy3jr4";
+    sha256 = "0h6lvsz868533irx68vd3hjhwcz93zh88axfq0qzji5ndc0ks4qb";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];

From d701c639b738ba5ac1cd3372b1961c1bfe37d6a4 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 6 Aug 2019 12:06:35 +0300
Subject: [PATCH 397/562] i3lock: 2.10 -> 2.12

---
 pkgs/applications/window-managers/i3/lock.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 27d568ae9ed..9d02dbafa5d 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage,
-  pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
+  xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
   name = "i3lock-${version}";
-  version = "2.10";
+  version = "2.12";
 
   src = fetchurl {
     url = "https://i3wm.org/i3lock/${name}.tar.bz2";
-    sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9";
+    sha256 = "02dwaqxpclcwiwvpvq7zwz4sxcv9c15dbf17ifalj1p8djls3cnh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo libxkbcommon libxkbfile ];
+  buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm
+    pam libX11 libev cairo libxkbcommon libxkbfile ];
 
   makeFlags = "all";
   installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc";

From 7eeec3e501b7c53d49cd5677dcd8c67fcc48c0bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 02:13:36 -0700
Subject: [PATCH 398/562] watchexec: 1.10.2 -> 1.10.3

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

diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index d15bfb3887a..848a5858b91 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "watchexec";
-  version = "1.10.2";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "10h9g6r5zkm71zpr33imh49187xx1wcv9sw7bf5dllgnxabd0lql";
+    sha256 = "0iaxicghvfy85hrxn151hz8frgfknk3s1z0ngjn7cv5x5zvfxspf";
   };
 
   cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc";

From 5181487b8ee852504666dc965d85038309f1e15b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 6 Aug 2019 12:18:20 +0300
Subject: [PATCH 399/562] i3: 4.16.1 -> 4.17

---
 pkgs/applications/window-managers/i3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index bef38e7a72a..3e9618f6e5d 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.16.1";
+  version = "4.17";
 
   src = fetchurl {
     url = "https://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb";
+    sha256 = "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf";
   };
 
   nativeBuildInputs = [ which pkgconfig makeWrapper ];

From 954f52d690858c0daf5992f21e6475da3fcdb843 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 02:18:31 -0700
Subject: [PATCH 400/562] cassandra_2_2: 2.2.13 -> 2.2.14

---
 pkgs/servers/nosql/cassandra/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix
index 88c361e6a91..f9966b1ccd5 100644
--- a/pkgs/servers/nosql/cassandra/2.2.nix
+++ b/pkgs/servers/nosql/cassandra/2.2.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2.2.13";
-  sha256 = "19jryhjkh5jsgp6jlz2v28vwm5dks8i7mshsv3s2fpnl6147paaq";
+  version = "2.2.14";
+  sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q";
 })

From c2a241ac5f6d4ed0d7de3315b1ff9f9cbbbeb2cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 02:18:50 -0700
Subject: [PATCH 401/562] vifm: 0.10 -> 0.10.1

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

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 9696ebac98b..9bc83d5508e 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "vifm-${version}";
-  version = "0.10";
+  version = "0.10.1";
 
   src = fetchurl {
     url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
-    sha256 = "1f380xcyjnm4xmcdazs6dj064bwddhywvn3mgm36k7r7b2gnjnp0";
+    sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 72e926a96ca736166df91262a389ca7db4530147 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 01:23:38 -0700
Subject: [PATCH 402/562] cmatrix: 1.2a -> 2.0

---
 pkgs/applications/misc/cmatrix/default.nix | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix
index 28f14cc1435..9a008a886fa 100644
--- a/pkgs/applications/misc/cmatrix/default.nix
+++ b/pkgs/applications/misc/cmatrix/default.nix
@@ -1,25 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, ncurses }:
+{ stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
 
-let
-  version = "1.2a";
-in with stdenv.lib;
 stdenv.mkDerivation rec {
+  pname = "cmatrix";
+  version = "2.0";
 
-  name = "cmatrix-${version}";
-
-  src = fetchurl{
-    url = "http://www.asty.org/cmatrix/dist/${name}.tar.gz";
-    sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz";
+  src = fetchFromGitHub {
+    owner = "abishekvashok";
+    repo = "cmatrix";
+    rev = "v${version}";
+    sha256 = "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simulates the falling characters theme from The Matrix movie";
     longDescription = ''
       CMatrix simulates the display from "The Matrix" and is based
-      on the screensaver from the movie's website.  
+      on the screensaver from the movie's website.
     '';
     homepage = http://www.asty.org/cmatrix/;
     platforms = ncurses.meta.platforms;

From 6b93ebb645f74e2fb1ba3d35fa4fa69185c07d7d Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <coudron@iij.ad.jp>
Date: Tue, 6 Aug 2019 18:31:06 +0900
Subject: [PATCH 403/562] use pname

please squash
---
 pkgs/applications/misc/vifm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 9bc83d5508e..81563254abd 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vifm-${version}";
+  pname = "vifm";
   version = "0.10.1";
 
   src = fetchurl {

From 02cc8d4eec11a42b401941e8949561dc99040d74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 02:51:01 -0700
Subject: [PATCH 404/562] xapian: 1.4.11 -> 1.4.12

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

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index c10dfdaa961..271c7adf3d9 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -38,5 +38,5 @@ let
 in {
   # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4 = generic "1.4.11" "01xwqljnp5afjf9097lyfbqc6x5bcqszfdkn9l1j86imwbrv45lz";
+  xapian_1_4 = generic "1.4.12" "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg";
 }

From 8ed743f63f1b58165ffe6c844dd94d0d3cdce32d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 6 Aug 2019 11:18:58 +0200
Subject: [PATCH 405/562] dav1d: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 157a6a21f3d..774faddb40c 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchFromGitLab, meson, ninja, nasm }:
+{ stdenv, fetchFromGitLab
+, meson, ninja, nasm
+}:
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = version;
-    sha256 = "1m5vdg64iqxpi37l84mcfiq313g9z55zf66s85j2rqik6asmxbqg";
+    sha256 = "1fbalfzw8j00vwbrh9h8kjdx6h99dr10vmvbpg3rhsspmxq9h66h";
   };
 
   nativeBuildInputs = [ meson ninja nasm ];

From 944cf8d68ef2e0bfff4a3735fae1297b21e9b350 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 6 Aug 2019 13:10:54 +0300
Subject: [PATCH 406/562] pdfcpu: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index 56c823993f7..789ee1a6d89 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "hhrutter";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cg17nph3qv1ca86j3wcd33vqs6clkzi6y2nrajmk7dq5vbzr6nn";
+    sha256 = "1knvi0v9nfzw40dayrw5cjidg9h900143v1pi6240yd7r7isx348";
   };
 
   modSha256 = "0cz4gs88s9z2yv1gc9ap92vv2j93ab6kr25zjgl2r7z6clbl5fzp";

From 84de95d725f7841da901d67532e3d9fe64c6a3f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 03:15:45 -0700
Subject: [PATCH 407/562] verbiste: 0.1.45 -> 0.1.46

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

diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index f23862c63cd..05862444556 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "verbiste-${version}";
 
-  version = "0.1.45";
+  version = "0.1.46";
 
   src = fetchurl {
     url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz";
-    sha256 = "180zyhdjspp7lk2291wsqs6bm7y27r7bd00447iimmjpx372s22c";
+    sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f63dbf3c94fcf53231996c99babaf509a365df00 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 6 Aug 2019 11:23:53 +0100
Subject: [PATCH 408/562] emacs-packages: Fix kubernetes.el build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 527a82aa469..7f8ac548653 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -131,6 +131,12 @@ self:
       # upstream issue: missing file header
       jsfmt = markBroken super.jsfmt;
 
+      kubernetes = super.kubernetes.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
       # upstream issue: missing file header
       maxframe = markBroken super.maxframe;
 

From 11a1978c6e6d8f0f88f04c1f240433a4aa06db20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 03:26:18 -0700
Subject: [PATCH 409/562] you-get: 0.4.1314 -> 0.4.1328

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

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index c00b832b961..a900e26019c 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1314";
+  version = "0.4.1328";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pbyhk3078va7435bsvysy34bvx0zvwd2gk28cvqyn62vwkcjyig";
+    sha256 = "1rbsf7dphvlzahrzgdj1bq62mqhp2fmr61lckcyzq6jdq3vsf0w8";
   };
 
   meta = with stdenv.lib; {

From 9bf6b0980c0b254cd3e0319161f266e2305ab689 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 6 Aug 2019 12:51:12 +0200
Subject: [PATCH 410/562] dav1d: Add withTools but disable all tools by default

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

diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 774faddb40c..5f7ca179d4a 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitLab
-, meson, ninja, nasm
+, meson, ninja, nasm, pkgconfig
+, withTools ? false, SDL2
 }:
 
 stdenv.mkDerivation rec {
@@ -14,8 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "1fbalfzw8j00vwbrh9h8kjdx6h99dr10vmvbpg3rhsspmxq9h66h";
   };
 
-  nativeBuildInputs = [ meson ninja nasm ];
+  nativeBuildInputs = [ meson ninja nasm pkgconfig ];
   # TODO: doxygen (currently only HTML and not build by default).
+  buildInputs = stdenv.lib.optional withTools SDL2;
+
+  mesonFlags= [
+    "-Denable_tools=${stdenv.lib.boolToString withTools}"
+  ];
 
   meta = with stdenv.lib; {
     description = "A cross-platform AV1 decoder focused on speed and correctness";

From 37753246359c42fa81e6ec452fe06ef55fd564d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 04:06:43 -0700
Subject: [PATCH 411/562] xmr-stak: 2.10.5 -> 2.10.7

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

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index fcd4ebfbeed..f47cafeb59b 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
 
 stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.10.5";
+  version = "2.10.7";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "16b6bj0rsr3cq9x3gxm54j197827d8lnfk7ghfjmaf7qa3q08adx";
+    sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 7cf29d011918b2dcce0c47eb22ea178ec911bdfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 04:24:54 -0700
Subject: [PATCH 412/562] zabbix-cli: 2.0.1 -> 2.1.1

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

diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index 2218bb5a57a..a8b621e32ac 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -4,7 +4,7 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "zabbix-cli-${version}";
-  version = "2.0.1";
+  version = "2.1.1";
 
   propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
 
@@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "usit-gd";
     repo = "zabbix-cli";
     rev = version;
-    sha256 = "0kwrfgq6h26dajll11f21c8b799bsfl1axmk2fdghl1gclxra7ry";
+    sha256 = "10a1cvjqwlqqfz52ajv9i53h6v95w8y7xmgqr79q2c4v1nz5bfks";
   };
 
   meta = with lib; {

From 199c3d40e0e035cf5ca73eb5f81bc90986ed4e2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2019 04:28:09 -0700
Subject: [PATCH 413/562] zimg: 2.9.1 -> 2.9.2

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

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index d22292669fa..75f10f94fb3 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zimg";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
     rev    = "release-${version}";
-    sha256 = "0q9migrxyp5wc6lcl6gnfs1zwn1ncqna6cm7vz3c993vvmgdf1p9";
+    sha256 = "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 048a0acb892e406a10eee516f3f020ba027a0195 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 1 Mar 2019 08:21:02 +0000
Subject: [PATCH 414/562] arangodb: 3.3.19 -> 3.2.18, 3.3.22, 3.4.3, 3.5.0-rc.7

---
 pkgs/servers/nosql/arangodb/default.nix | 91 ++++++++++++++++---------
 pkgs/top-level/all-packages.nix         |  3 +-
 2 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 12684eab551..5db737dbeba 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,39 +1,62 @@
-{ stdenv, fetchFromGitHub
-, openssl, zlib, readline, cmake, python }:
+{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }:
 
 let
-in stdenv.mkDerivation rec {
-  version = "3.3.19";
-  name    = "arangodb-${version}";
+  common = { version, sha256, platforms }: stdenv.mkDerivation {
+    pname = "arangodb";
+    inherit version;
 
-  src = fetchFromGitHub {
-    repo = "arangodb";
-    owner = "arangodb";
-    rev = "v${version}";
-    sha256 = "1qg4lqnn5x0xsmkq41mjj301mfh76r8ys1rkzhinxlq30jld3155";
-  };
-
-  buildInputs = [
-    openssl zlib readline python
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  postPatch = ''
-    sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi
-  '';
-
-  configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/arangodb/arangodb;
-    description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.flosse ];
+    src = fetchFromGitHub {
+      repo = "arangodb";
+      owner = "arangodb";
+      rev = "v${version}";
+      inherit sha256;
+    };
+
+    nativeBuildInputs = [ cmake python2 perl which ];
+    buildInputs = [ openssl zlib snappy lzo ];
+
+    # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory"
+    dontFixCmake       =                     lib.versionAtLeast version "3.5";
+    NIX_CFLAGS_COMPILE = lib.optionals      (lib.versionAtLeast version "3.5") [ "-Wno-error" ];
+    preConfigure       = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils";
+
+    postPatch = ''
+      sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi
+
+      # with nixpkgs, it has no sense to check for a version update
+      substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
+      substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" ""
+    '';
+
+    cmakeFlags = [
+      # do not set GCC's -march=xxx based on builder's /proc/cpuifo
+      # `stdenv.hostPlatform.platform.gcc.arch` goes to -march= the usual way
+      "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF"
+      # also avoid using builder's /proc/cpuinfo
+      "-DHAVE_SSE42=${ { "westmere"       = "ON";
+                         "sandybridge"    = "ON";
+                         "ivybridge"      = "ON";
+                         "haswell"        = "ON";
+                         "broadwell"      = "ON";
+                         "skylake"        = "ON";
+                         "skylake-avx512" = "ON";
+                       }.${stdenv.hostPlatform.platform.gcc.arch or ""} or "OFF"
+                     }"
+    ];
+
+    enableParallelBuilding = true;
+
+    meta = with lib; {
+      homepage = https://www.arangodb.com;
+      description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
+      license = licenses.asl20;
+      inherit platforms;
+      maintainers = [ maintainers.flosse ];
+    };
   };
+in {
+  arangodb_3_2 = common { version = "3.2.18";     sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; platforms = lib.platforms.linux; };
+  arangodb_3_3 = common { version = "3.3.23.1";   sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; platforms = lib.platforms.linux; };
+  arangodb_3_4 = common { version = "3.4.7";      sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; platforms = lib.platforms.linux; };
+  arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; platforms = [ "x86_64-linux" ];  }; # "aarch64-linux" fails with "fatal error: x86intrin.h: No such file or directory"
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c731baa090..6cb61b2d5dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -573,7 +573,8 @@ in
 
   arandr = callPackage ../tools/X11/arandr { };
 
-  arangodb = callPackage ../servers/nosql/arangodb { };
+  inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5;
+  arangodb = arangodb_3_4;
 
   arcanist = callPackage ../development/tools/misc/arcanist {};
 

From 983c30f5ab3f95792a24baff9adb61eb226eecf8 Mon Sep 17 00:00:00 2001
From: Karol Chmist <karol@chmist.com>
Date: Fri, 19 Jul 2019 21:50:45 +0200
Subject: [PATCH 415/562] devilutionx: init at unstable-2019-07-28

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

diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
new file mode 100644
index 00000000000..52d3bdd5b79
--- /dev/null
+++ b/pkgs/games/devilutionx/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
+stdenv.mkDerivation rec {
+  version = "unstable-2019-07-28";
+  pname = "devilutionx";
+
+  src = fetchFromGitHub {
+    owner = "diasurgical";
+    repo = "devilutionX";
+    rev = "b2f358874705598ec139f290b21e340c73d250f6";
+    sha256 = "0s812km118qq5pzlzvzfndvag0mp6yzvm69ykc97frdiq608zw4f";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2";
+
+  # compilation will fail due to -Werror=format-security
+  hardeningDisable = [ "format" ];
+
+  nativeBuildInputs = [ pkg-config cmake ];
+  buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp devilutionx $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/diasurgical/devilutionX";
+    description = "Diablo build for modern operating systems";
+    license = licenses.unlicense;
+    maintainers = [ maintainers.karolchmist ];
+    platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c731baa090..cd2738b0bde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21690,6 +21690,8 @@ in
 
   cuyo = callPackage ../games/cuyo { };
 
+  devilutionx = callPackage ../games/devilutionx {};
+
   dhewm3 = callPackage ../games/dhewm3 {};
 
   digikam = libsForQt5.callPackage ../applications/graphics/digikam {

From 4788c7eb2837d81dc5bce6aa21436f442b66f87c Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Tue, 6 Aug 2019 13:41:47 +0100
Subject: [PATCH 416/562] Ensure sundialr builds on macos.

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f0074843774..e813e550f6e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -447,6 +447,7 @@ let
     mnormt = [ pkgs.libiconv ];
     phangorn = [ pkgs.libiconv ];
     quadprog = [ pkgs.libiconv ];
+    sundialr = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From f6b4c024cdb201ce0209af29a4c90b55384b2f72 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Sat, 3 Aug 2019 11:40:54 +0700
Subject: [PATCH 417/562] openshot: use wrapQtAppsHook

See #65399
---
 pkgs/applications/video/openshot-qt/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 19a8ff6c822..0b1d9e95115 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, mkDerivationWith, fetchFromGitHub
 , doxygen, python3Packages, libopenshot
 , wrapGAppsHook, gtk3 }:
 
-python3Packages.buildPythonApplication rec {
+mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "openshot-qt";
   version = "2.4.4";
 
@@ -19,12 +19,20 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [ libopenshot pyqt5_with_qtwebkit requests sip httplib2 pyzmq ];
 
+  dontWrapGApps = true;
+  dontWrapQtApps = true;
 
   preConfigure = ''
     # tries to create caching directories during install
     export HOME=$(mktemp -d)
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/openshot-qt \
+      "''${gappsWrapperArgs[@]}" \
+      "''${qtWrapperArgs[@]}"
+  '';
+
   doCheck = false;
 
   meta = with stdenv.lib; {

From eab786451f6a5f6af445dc2751f3fbeb820d3624 Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Tue, 6 Aug 2019 08:49:39 -0500
Subject: [PATCH 418/562] R: Update CRAN and bioconductor packages

---
 pkgs/development/r-modules/bioc-packages.nix |    2 +-
 pkgs/development/r-modules/cran-packages.nix | 1890 ++++++++++--------
 2 files changed, 1054 insertions(+), 838 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 82727234124..03a30aad499 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -943,7 +943,7 @@ in with self; {
   chipenrich = derive2 { name="chipenrich"; version="2.6.1"; sha256="0nm55lfac405spccl9f19p5ij8mdaj6lm7qmaf4xqagsaf5x0pa9"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; };
   chipseq = derive2 { name="chipseq"; version="1.32.0"; sha256="1pp1rm5fs3hlar5x4dl3a3b4gara7qwf81dbvka6r1n78hrf9x1b"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
   chopsticks = derive2 { name="chopsticks"; version="1.48.0"; sha256="0r52z0hjaxinw11jzg8cyhdpg2g1027vd5aiijwi6bmipdzw4sfk"; depends=[survival]; };
-  chroGPS = derive2 { name="chroGPS"; version="2.0.1"; sha256="1bn5s1r927ifhwqifws0wgs7v15fk8922kbm8qdkg5zaqibj5qx7"; depends=[Biobase changepoint cluster DPpackage ellipse GenomicRanges ICSNP IRanges MASS vegan]; };
+  chroGPS = derive2 { name="chroGPS"; version="2.0.1"; sha256="1bn5s1r927ifhwqifws0wgs7v15fk8922kbm8qdkg5zaqibj5qx7"; depends=[Biobase changepoint cluster ellipse GenomicRanges ICSNP IRanges MASS vegan]; };
   chromDraw = derive2 { name="chromDraw"; version="2.12.0"; sha256="0qqam9vklg2cwsvcp9fm3l3c4lmjzf2lnxrv5dci16f8q55z88cl"; depends=[GenomicRanges Rcpp]; };
   chromPlot = derive2 { name="chromPlot"; version="1.10.0"; sha256="15f7wmak0rp0bfzqsjmz6i8zk5g4axsgk7034qg4jw9hlp0nkd6v"; depends=[biomaRt GenomicRanges]; };
   chromVAR = derive2 { name="chromVAR"; version="1.4.1"; sha256="16q9pmjlaqc7nvaxg9arfsrrnpcyzvz0gb5zq7l3g2jgjp4pfi30"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index eca1fda4f6f..ed205130cae 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-07-01"; };
+let derive2 = derive { snapshot = "2019-08-05"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -33,14 +33,15 @@ in with self; {
   ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; };
   ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
   AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; };
-  AER = derive2 { name="AER"; version="1.2-6"; sha256="0x4l8ridghxlqjvq5wyv34yvy8mj5bzjrw9cik7f069q4lnklg35"; depends=[car Formula lmtest sandwich survival zoo]; };
+  AER = derive2 { name="AER"; version="1.2-7"; sha256="14wahf8qwv66rv7wbv53y8rslid140n9n7kcr8nhqw8kcdh5rvis"; depends=[car Formula lmtest sandwich survival zoo]; };
   AF = derive2 { name="AF"; version="0.1.5"; sha256="1r87ra55g0qm2s8cgsmdwck93ia2vr8zfab3in45mxm5xc501xgk"; depends=[data_table drgee ivtools stdReg survival]; };
   AFM = derive2 { name="AFM"; version="1.2.6"; sha256="0yngk3j1wkamqzrwibn2csbn61jbdb872n0gi4d3hyhgilqzwbwf"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
   AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; };
   AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; };
-  AGHmatrix = derive2 { name="AGHmatrix"; version="0.0.5"; sha256="015wyvrrry4vfdg6qhjj3phjnrdx9707sp2mpf7fr67n2irc65d5"; depends=[Matrix]; };
+  AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; };
   AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; };
   AGread = derive2 { name="AGread"; version="0.2.2"; sha256="08d705fh11ksxijqjlc3ny7rclq7hw12f161h277fjdx71wgn8hp"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr rlang seewave stringr]; };
+  AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; };
   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]; };
@@ -62,12 +63,13 @@ in with self; {
   AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; };
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
+  AMPLE = derive2 { name="AMPLE"; version="0.0.1"; sha256="1qgr5672s7w7w34r9392rygnw2mx7fcnkwgk42baf10wl9iflgs2"; depends=[dplyr ggplot2 RColorBrewer shiny shinyjs tidyr]; };
   AMR = derive2 { name="AMR"; version="0.7.1"; sha256="1dgdiaa0xfdgdyaps2mx7xb4zis8rf5npa9cr2lz72nlhh3b0h5h"; depends=[backports crayon data_table dplyr ggplot2 hms knitr microbenchmark rlang scales tidyr]; };
   ANN2 = derive2 { name="ANN2"; version="2.3.2"; sha256="0ib6cs2az0hhfg7vj4dk6fxbwjlc305psqjs188fdya2jrxgq1gs"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
   ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; };
   ANOVAShiny = derive2 { name="ANOVAShiny"; version="0.1.0"; sha256="1z8wi8c8j3rlchfk1vx101qz1r9j2jl5lfh72y5lqsisqxl2fyyz"; depends=[DescTools dplyr HH rhandsontable rmarkdown shiny]; };
-  ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; };
+  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=[]; };
   APML0 = derive2 { name="APML0"; version="0.9"; sha256="1scvcrcsjgdrq9gfv8qxbd703k76cyk01ml93bcr8j8kiwv05z0f"; depends=[Matrix Rcpp RcppEigen]; };
@@ -104,7 +106,7 @@ in with self; {
   AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
   AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; };
   AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; };
-  AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.6-1"; sha256="0kp5g9fcjdx5904l6b5l03h80hiqq12xx3jlj67y7w9brr2aj5qr"; depends=[rJava RJDBC]; };
+  AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; };
   AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; };
   AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; };
   AbSim = derive2 { name="AbSim"; version="0.2.6"; sha256="16ddjk8b6xw80ch4jis1y751i9561wdxh0gifbf15qiz3vjckq8m"; depends=[ape poweRlaw]; };
@@ -132,7 +134,7 @@ in with self; {
   AdhereR = derive2 { name="AdhereR"; version="0.5"; sha256="0wma06v02k50j0j8j5k1py3y6mwl8q7bsb288gyn67ms9wgv4fb5"; depends=[clipr colourpicker data_table DBI haven highlight knitr lubridate manipulate readODS readxl RMariaDB RSQLite scales shiny shinyjs shinyWidgets V8 viridisLite]; };
   AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; };
   AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; };
-  AdvDif4 = derive2 { name="AdvDif4"; version="0.4.18"; sha256="1zcia5n8vb01j6m2hjh5jviyqpzk5f1zk69fryy8jlf5ammmr34f"; depends=[]; };
+  AdvDif4 = derive2 { name="AdvDif4"; version="0.7.18"; sha256="1xdbk7w55cb2fh0mqlyrkdpnglrs55kyvvp32anvf2nw3ssrfmy7"; depends=[]; };
   AeRobiology = derive2 { name="AeRobiology"; version="2.0.1"; sha256="14d5gjx53v2wfij8m4br0k7lfi6x2frc8ny1li4g8c05qv2dvnbb"; depends=[circular data_table dplyr ggplot2 ggvis lubridate plotly scales tidyr writexl zoo]; };
   AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; };
   AgreementInterval = derive2 { name="AgreementInterval"; version="0.1.1"; sha256="1bvinzylvsaipa8mq15f45b6h37znavlrdl0rbrx1pqw52r7z8kv"; depends=[psych]; };
@@ -155,7 +157,7 @@ in with self; {
   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-19"; sha256="0bhx82arwbazbnvpdmqcnnb502hxzv9zbl16z070p4vfkf0mincl"; depends=[fastICA R_matlab tkrplot]; };
+  AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-20"; sha256="1r2w6wf44p75r5m2hflnk1q71kv4vgds4hxyl5viyl6mg417brg5"; depends=[fastICA R_matlab tkrplot]; };
   AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; };
@@ -164,7 +166,7 @@ in with self; {
   AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
-  AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.3"; sha256="03xgnpzy6acb8zrhspjlv75vq46cbiprsm0vy2slcn7665axa60x"; depends=[scatterplot3d shiny smacof]; };
+  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]; };
   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]; };
@@ -186,6 +188,7 @@ 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="0.1.0"; sha256="0m3byaa39m9d8l3pcbjxczvwc395wq5rj55qd7afmnj9a5zhgnaq"; depends=[]; };
   AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; 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=[]; };
@@ -198,13 +201,12 @@ in with self; {
   Autoplotprotein = derive2 { name="Autoplotprotein"; version="1.1"; sha256="13mxqmhhdiq7mz4m6nx39dsq7x3bm8fsgskswx48vsq6x2k6byxa"; depends=[ade4 plotrix plyr seqinr XML]; };
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
   AzureAuth = derive2 { name="AzureAuth"; version="1.1.1"; sha256="0lamvfgdf1yc8p1v6q83i9j08s4h0657vzma0b0k7999xn60ffry"; depends=[httr jose jsonlite openssl R6 rappdirs]; };
-  AzureContainers = derive2 { name="AzureContainers"; version="1.0.2"; sha256="0ixyqcs0l90sqlfgkykl6bzp4fs6ba4d8w6d39irbn0kq4rbp3h1"; depends=[AzureAuth AzureGraph AzureRMR httr openssl R6]; };
-  AzureGraph = derive2 { name="AzureGraph"; version="1.0.2"; sha256="0c4p3zk7q7nx85zzpsfxrlnzq2ic45j6i6dqqq9yfvk17lf4vysb"; depends=[AzureAuth httr jsonlite openssl R6]; };
-  AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.0"; sha256="078m23a7fcvljm7a7za6krnqifbmsapirr3sdg05h92fknj4ajgk"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
-  AzureKusto = derive2 { name="AzureKusto"; version="1.0.1"; sha256="0xmsdvsqq2ccvxfjgz95xgn1z3f8m9avki5ljyx35772fcjdbkqs"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; };
-  AzureML = derive2 { name="AzureML"; version="0.2.14"; sha256="1jhlbgfm3mr772hdkfi8jbv5lw8a08yb49sqaa14m1nz4ar9rckv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; };
-  AzureRMR = derive2 { name="AzureRMR"; version="2.1.2"; sha256="01rp6kjyzlbmhl0g2lwzn3lafm0dl06sh87vg37zn6vr01jcc4sw"; depends=[AzureAuth httr jsonlite R6 uuid]; };
-  AzureStor = derive2 { name="AzureStor"; version="2.0.2"; sha256="16wf5m5pzhph0hcbyvb16lxikllj67wk6sbrmkl9gpif6g7nvbyc"; depends=[AzureRMR httr mime openssl R6 xml2]; };
+  AzureContainers = derive2 { name="AzureContainers"; version="1.1.0"; sha256="0c6xq47k4mggnc7id4xkzc4cznsg8b0aam6iymk587727a6rw1jw"; depends=[AzureAuth AzureGraph AzureRMR httr openssl R6]; };
+  AzureGraph = derive2 { name="AzureGraph"; version="1.0.3"; sha256="0klfdx89rqx69qkvkyf8xbvy4x2ximlb5yav6l2jmcfaw739vdyh"; depends=[AzureAuth httr jsonlite openssl R6]; };
+  AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.1"; sha256="0vchsn7pcsbw6xq1v4qslaysaq1pwirsjmkv2w8skvhbjdxc84km"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; };
+  AzureKusto = derive2 { name="AzureKusto"; version="1.0.2"; sha256="08vac33zh3nz3iwgp8npvzjzxz6g8n1r8pami35zj5a71g4mrw36"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; };
+  AzureRMR = derive2 { name="AzureRMR"; version="2.1.3"; sha256="0r801kn46s64i9a3gdpaciaai6wsz9sk9r4ira1x8wgm4w7m25q1"; depends=[AzureAuth httr jsonlite R6 uuid]; };
+  AzureStor = derive2 { name="AzureStor"; version="2.1.0"; sha256="098pldcvwh5yqfl9xxmdh9wbpisxbmazi9fppncvisj9i6pw2n8w"; depends=[AzureRMR httr mime openssl R6 xml2]; };
   AzureVM = derive2 { name="AzureVM"; version="2.0.0"; sha256="195mwr4bf79ryisvi7rv3i70ajvdcdy0l2n5zij6bhxwzbkb63db"; depends=[AzureRMR jsonlite R6]; };
   B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
   BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
@@ -218,7 +220,7 @@ in with self; {
   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]; };
   BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.2"; sha256="0yxsgk4p7i8arjkchsiml6lx97inpmaihb61787vcl8kxyx7v6wr"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; };
-  BANOVA = derive2 { name="BANOVA"; version="1.1.2"; sha256="04f11394z3zni1fxk60zd61kgy1603nfb81wkkqg8jh4997nhbmi"; depends=[coda rjags rstan runjags]; };
+  BANOVA = derive2 { name="BANOVA"; version="1.1.3"; sha256="11f5s1paskq5z3hwy6gs8irgignjfmjr9qz3kxnir1ahxvrxs7ma"; depends=[coda rjags rstan runjags]; };
   BART = derive2 { name="BART"; version="2.5"; sha256="0ljlzk114r0r57mc4jy2ivx3fk953v1c70gmcq63z5j2z9dd7cak"; depends=[nlme nnet Rcpp survival]; };
   BAS = derive2 { name="BAS"; version="1.5.3"; sha256="0xf8wd42mlk6dkkiwzf9lyb5fvqmpjsqyzay146d6p2y1zk65lc0"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
@@ -267,7 +269,7 @@ in with self; {
   BH = derive2 { name="BH"; version="1.69.0-1"; sha256="18mckfwxxv8m8rzaz03mg2h6vhaj7y131h6yasfg0s73nxj47zd0"; depends=[]; };
   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="1.0.3"; sha256="1k9bqxsxx4rxi0kr7zskdlryvcq45fxifrnk7sd9lsx63s6qlrjm"; depends=[Rcpp RcppArmadillo]; };
+  BHSBVAR = derive2 { name="BHSBVAR"; version="1.0.4"; sha256="19sqcfg6w6cnk35bxdc0wzizh0slhl684yhjh7zyg1k92dvprfr6"; 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]; };
@@ -293,18 +295,17 @@ in with self; {
   BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
-  BMSC = derive2 { name="BMSC"; version="0.2.0"; sha256="049g14829rfgwx52isdl4028d7gh1wb7dbmnj9zz0skwb7qrpz9g"; depends=[BH dplyr ggplot2 loo R_utils Rcpp RcppEigen rstan rstantools StanHeaders]; };
   BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; };
   BMTME = derive2 { name="BMTME"; version="1.0.6"; sha256="1x15h3l459g4k7i97yry2wlb4arw35mkv7jiad6d23jifz5l6485"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; };
-  BMhyb = derive2 { name="BMhyb"; version="1.5.2"; sha256="0sf12xibr22i3pqdb7zay1mmgfnvqxdlimsbd8y5pi4ybiqz8bl8"; depends=[ape corpcor DEoptim geiger lhs Matrix mvtnorm numDeriv phylobase phytools TreeSim viridis]; };
+  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="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
-  BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; };
-  BNPmix = derive2 { name="BNPmix"; version="0.1.2"; sha256="10zm1ds07gb9iih8rh72djzimw3ja3qja7fsjxga25qrw0pdf7ic"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  BNPdensity = derive2 { name="BNPdensity"; version="2019.7.9"; sha256="1r6cisb4ygk8jxdlc2kma7f61rviad5782di8r3ksp5nal6gb31f"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; };
+  BNPmix = derive2 { name="BNPmix"; version="0.2.2"; sha256="0q4kn4ryn9m9vcxjsnbp2rcd9cn3na09nci79g30lscgwfci7w0a"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; };
   BNSP = derive2 { name="BNSP"; version="2.1.0"; sha256="01nfzyzd1s55rhc1mghlcqgq6cnp8g44acyfb89vd0w9mdwgj8r0"; depends=[coda corrplot cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
@@ -317,7 +318,7 @@ in with self; {
   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]; };
   BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; };
-  BSL = derive2 { name="BSL"; version="2.0.0"; sha256="14wd7g2b2l3777c07f392mb4dy9azy645zwlfc6lrh8lbcrgqdlc"; depends=[coda copula cvTools foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; };
+  BSL = derive2 { name="BSL"; version="3.0.0"; sha256="1cmydj59slj88awc2i7jg84hfaa9j3qp4d1042dgamc7xqvfh397"; depends=[coda copula foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; };
   BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; };
   BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; };
   BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
@@ -329,7 +330,7 @@ in with self; {
   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]; };
   BUCSS = derive2 { name="BUCSS"; version="1.1.0"; sha256="1agx6yd29zq6gvwgnd0qahjnk5z7gdbijbg7rk85d5x6pihwmh9q"; depends=[]; };
-  BVAR = derive2 { name="BVAR"; version="0.1.3"; sha256="0dhg5l1r6ayh14c4h26v1p91vy8qi1zkwjj6grz0wc3w2whcs8gi"; depends=[MASS]; };
+  BVAR = derive2 { name="BVAR"; version="0.1.5"; sha256="0vq1a4a5l444asbbr5f9ha6s3py9n24dria1a7yk3wfh302fj15s"; depends=[MASS]; };
   BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
   BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
   BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; };
@@ -343,6 +344,7 @@ in with self; {
   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]; };
+  BallMapper = derive2 { name="BallMapper"; version="0.1.0"; sha256="1v0n4nyxhz3i7jkyrg3zgznz4z0rim68pv60dvn8197q81z0bk7g"; depends=[fields igraph networkD3 scales 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]; };
   Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
@@ -358,7 +360,7 @@ in with self; {
   BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; };
   BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; };
   BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; };
-  BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.5.0"; sha256="0q37q2mwvg9616chr2xzgd4mrpv9rqsqq9p0lc02gi35ay7hafcp"; depends=[eha ggplot2 reshape2 survival]; };
+  BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.6.0"; sha256="1ym2v5ynmb28miwivyjx604vfsfi5ksmaha0far0ddq2cl06if2q"; depends=[eha ggplot2 reshape2 survival]; };
   BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; };
   BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
   BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
@@ -381,7 +383,6 @@ in with self; {
   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]; };
   BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.1"; sha256="0bvlhhivdaw386ir5zb47bxg5dbqlfjfxbs28gjdr0csskwvh107"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; };
-  BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
   BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; };
   BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; };
@@ -392,7 +393,7 @@ in with self; {
   BayesX = derive2 { name="BayesX"; version="0.3-0"; sha256="0vgi0yng53x0w18h4n0ygqmcky7jwmk99j4gcv2vwhcmz45s73j0"; 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.1.3"; sha256="1vwbspzwqx68y5yml9rm8ldagx391qg8m0wqf5k2qvy7n92vcl6l"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr Rcpp readxl rstan xlsx]; };
+  BayesianFROC = derive2 { name="BayesianFROC"; version="0.1.5"; sha256="11dpha68vh68ifxk721p3jiklaaavzq06cs12ph95lakrlbv9mr8"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard 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=[]; };
@@ -408,6 +409,7 @@ in with self; {
   Bergm = derive2 { name="Bergm"; version="5.0.0"; sha256="0l04hg5rwgi5vgb7h987f0j3shb0vz9w26zmk4hm7vfbwb9xxix6"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; };
   Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; };
   BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; };
+  BetaPASS = derive2 { name="BetaPASS"; version="1.0-1"; sha256="0c9a3bv9q9nzz3iw3jwqrkfqk4zd6ybaq4jlijja6rl2gqrprsi2"; depends=[betareg ggplot2 lmtest Rcpp reshape]; };
   BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; };
   BeyondBenford = derive2 { name="BeyondBenford"; version="1.1"; sha256="1mqrzd6hpfsqxwm2sgc2lmgx7czvaj7qvhs05pj6p63n0fiimq9c"; depends=[]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
@@ -430,13 +432,13 @@ 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]; };
   Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; depends=[diptest]; };
   BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; };
-  BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.2"; sha256="0la8mi2wadcxwrq882n4zxvihyqkp8m383c28gl9gm4fs8cqwlxi"; depends=[expm Formula lmtest numDeriv]; };
+  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]; };
   BioCircos = derive2 { name="BioCircos"; version="0.3.4"; sha256="1gl57r47p5z1wzs94xzc26j2r8z5hpqr4163b01x6jwzvbrlfwhz"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; };
   BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; };
   BioInstaller = derive2 { name="BioInstaller"; version="0.3.7"; sha256="0xbxv2ln39z70javxbx5rf77yf9zyjif3ppnr3id7cmy24hhqcab"; depends=[configr devtools futile_logger git2r jsonlite liteq R_utils RCurl rvest shiny stringi stringr]; };
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
-  BioMedR = derive2 { name="BioMedR"; version="1.1.2"; sha256="0b72fqp2kkvszv4rrz42xidivy6lk4w92rcq1zjqd9vlkvmgx7h8"; depends=[Biostrings ChemmineR fmcsR GOSemSim org_Hs_eg_db pls randomForest rcdk RCurl rjson]; };
+  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]; };
   BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; };
   BiocManager = derive2 { name="BiocManager"; version="1.30.4"; sha256="0kxs76pixk1d2lpvkyrq6nnvv1rqf55ph5f7igkadyyqirf3y2ah"; depends=[]; };
@@ -480,7 +482,6 @@ in with self; {
   BootstrapQTL = derive2 { name="BootstrapQTL"; version="1.0.2"; sha256="1qf93wmrh6znm81jr3gyn1sl8x4i6pdx811r70fg8k026fbfjn3a"; depends=[data_table foreach MatrixEQTL]; };
   Boruta = derive2 { name="Boruta"; version="6.0.0"; sha256="1pp8zal1vhxlzdhl20phn39m3ffhw5glyqbcgwa0w14zw2mpm6hw"; depends=[ranger]; };
   BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; };
-  BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="5.9.2"; sha256="0cyhqglz0mhfi8yk3a1qdry5ljd8rjzayqj1hyw44w9b8xsm6659"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-0"; sha256="13lhs6rynyj9cw13panqbn2jzkhq5fixhfd0ldr128gvw5d43hxg"; depends=[brglm gtools lme4 qvcalc]; };
   BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; };
   BrailleR = derive2 { name="BrailleR"; version="0.29.1"; sha256="0n6njampfav84yd68vi4nw8h3dm285m3wfqi048ghiw740sa4rjk"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown roloc rolocISCCNBS whisker XML xtable]; };
@@ -499,10 +500,10 @@ in with self; {
   BuyseTest = derive2 { name="BuyseTest"; version="1.7"; sha256="0sjbwacpkw54wwzxd6866dzd03scl5g8ixcxs5ry26b2w0dncy60"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; };
   C443 = derive2 { name="C443"; version="1.0.0"; sha256="0d04769m9kkjqpj1cgfhqrri893nwi6qn7fz63z5pkym5cig5yyi"; depends=[cluster ggplot2 gridExtra igraph MASS partykit qgraph RColorBrewer reshape2 rpart]; };
   C50 = derive2 { name="C50"; version="0.1.2"; sha256="1fpspmsm62h077dkdhii23bs3sxlblabfqj4waz794ihw1b9hicg"; depends=[Cubist partykit]; };
-  CA3variants = derive2 { name="CA3variants"; version="1.0"; sha256="006r3a8jhkbgdfpycbdv3q1pfx9pkf102cgi285awgdhs6fhh88s"; depends=[ggplot2 ggrepel gridExtra]; };
+  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]; };
-  CAISEr = derive2 { name="CAISEr"; version="0.3.3"; sha256="1jbmc2ajmvqs7i1qxx1drx6nqqwl29hxk02qmyf8iamg7ip4adqi"; depends=[assertthat pbmcapply]; };
+  CAISEr = derive2 { name="CAISEr"; version="1.0.14"; sha256="0jfpn4ih5dc55jjiivbdscpm6jw250js8p8gvcnsdf3pgrzp8cxr"; depends=[assertthat ggplot2 gridExtra lattice pbmcapply]; };
   CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; };
   CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-1"; sha256="1xsnqyj0qdi081rdnpas9ciy9zbhdcjx3lphl6drk0bbmik3znkv"; depends=[mice mvtnorm randomForest]; };
   CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
@@ -521,6 +522,7 @@ in with self; {
   CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; };
   CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; };
   CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; };
+  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="4.0"; sha256="16k25rhwzih1spbp0m80lv2vfrbm8l5ajkgp2i27gvnhhln227qm"; depends=[ggplot2 ggrepel gridExtra rgl]; };
   CB2 = derive2 { name="CB2"; version="1.2.1"; sha256="089cf0pcy5xyzr6pl9ljqc52cy2bh2xfxhfh7iika2wv932wwq98"; depends=[dplyr ggplot2 glue magrittr metap pheatmap Rcpp RcppArmadillo stringr tibble tidyr]; };
@@ -554,7 +556,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.2"; sha256="01ixqd9fwxr74ifk5c7s9q5f92pdgwqy4wyi2ipk16kzj4q5w8xr"; depends=[]; };
+  CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.3"; sha256="02rlznp4vkdwkf23jy84dciv2mv1421ghqxllw4i2z2jxgxvb921"; 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]; };
@@ -581,7 +583,7 @@ in with self; {
   CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; };
   CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-  CNVScope = derive2 { name="CNVScope"; version="1.9.7"; sha256="1xj82nwkv27wfwrks9rckdgmhlqfl4n0zmcqqa3f9ryx79jm7zbl"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize ComplexHeatmap data_table doParallel dplyr DT foreach GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl readr reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil tidyr visNetwork]; };
+  CNVScope = derive2 { name="CNVScope"; version="2.7.0"; sha256="1m5g6qfqlqnysqcmia54hasb1bdp70a1jzlqb8dz8830lzw797fi"; depends=[BiocManager biomaRt blockseg BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach 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=[]; };
@@ -662,8 +664,9 @@ in with self; {
   CausalImpact = derive2 { name="CausalImpact"; version="1.2.3"; sha256="16qwf1kcs7x6qw18zpabs4zsv3m7xwxixf89krnipydiwlpxjjn6"; 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="1.0"; sha256="016z4wsv6mz622rrvnaxbd6ri21pinahasmdswf62vp9l8jahq25"; depends=[gtools igraph]; };
+  CeRNASeek = derive2 { name="CeRNASeek"; version="2.1"; sha256="007wzq18p8dp7v4dplxsnq3i1qvd740s59nv9ygcr28d6gvsx1fy"; depends=[gtools igraph survival]; };
   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]; };
@@ -676,13 +679,13 @@ in with self; {
   ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; };
   ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.16"; sha256="02kxybv9299j36xl4wk6d50crdnz0f6qbyxjiy6xf0s7hnlcr44c"; depends=[Rcpp RcppArmadillo]; };
   ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; };
-  Chaos01 = derive2 { name="Chaos01"; version="1.1.1"; sha256="0ibxibmlyc6wkhqj2achwkwdkniin60y8xh8b80nq6ggmm7w9crw"; depends=[]; };
+  Chaos01 = derive2 { name="Chaos01"; version="1.2.0"; sha256="10780nxdakk4xnbzdnrcm3z66ipx5pf676n9s1arb4g624splc61"; depends=[]; };
   ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-  ChemoSpec = derive2 { name="ChemoSpec"; version="5.1.9"; sha256="0xhwb62s5cs1rfnk9wq6zkgfgs598l7m2cfsf84r690v64qiqycb"; depends=[ChemoSpecUtils plyr]; };
+  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.20"; sha256="1xrs7rjrb5q33njlz7988sawz0dy4ara9y44lf8v528j0m0hqpwc"; depends=[plyr]; };
+  ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.3.39"; sha256="1vd7miin5f236n5w9q7iy64fncycnh8zs0n04mir8ks76lzbga7w"; 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=[]; };
   ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; };
@@ -708,20 +711,23 @@ in with self; {
   CliftLRD = derive2 { name="CliftLRD"; version="0.1-1"; sha256="0qsdv568klxg6chgw329jbfjmf6w61hly2vxp90yzdfkca03z2s4"; depends=[CNLTreg liftLRD]; };
   ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; };
   ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
-  ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.3"; sha256="15s2fzrjsav5qa5hbjxixz6398swmdr3isyr5a6f0hjc2bb12d5z"; depends=[climdex_pcic multiApply PCICt plyr]; };
+  ClimInd = derive2 { name="ClimInd"; version="0.1-2"; sha256="0brimmkr8ccdbpmcmgbd8ydx4cy0yblfrzcgx151x83wskzq04sj"; depends=[chron SPEI weathermetrics]; };
+  ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.0.4"; sha256="1819kv0h7qh285nykncdqr808b9v5fviccr0fbv2im7zni497scq"; depends=[climdex_pcic multiApply PCICt plyr]; };
   ClinReport = derive2 { name="ClinReport"; version="0.9.1.12"; sha256="0c0ixr28p8gj3mx2pkrmjvs13g9h8fv1y6ririvrwkbmrdikq7g3"; depends=[dplyr emmeans flextable ggplot2 officer reshape2 xtable]; };
   ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; };
   CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.7"; sha256="07rh577m7xp6v0adchp0mbfs0mkglpv7p27794rm958nvfsmffds"; depends=[combinat gtools quantmod]; };
   ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; };
   ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; };
-  ClustBlock = derive2 { name="ClustBlock"; version="1.0.0"; sha256="1qfk2dyx2wnc81x6wc3c6lrbxbwiwyxxvgy89sslwy4c0i61gpp0"; depends=[FactoMineR]; };
+  ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; };
+  ClustBlock = derive2 { name="ClustBlock"; version="2.0.0"; sha256="0g6z4l4ilpamdi8wfmlwz21kjiwlwnl702i38rzlyvysr1afsxv1"; depends=[FactoMineR]; };
   ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; };
+  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]; };
   ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; };
-  ClusterR = derive2 { name="ClusterR"; version="1.1.9"; sha256="0l5q2ydqrvdq3f1a6j1g6vfzqvaiq4p2j0h6ir4bh2l8m8d3xlsz"; depends=[FD ggplot2 gmp gtools Rcpp RcppArmadillo]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.2.0"; sha256="1l5b6n29gslv0xq79xhqd3rniv51bawbrz3qdnjc3677fpgirlx7"; depends=[FD ggplot2 gmp gtools Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
   ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
@@ -775,7 +781,6 @@ in with self; {
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; };
   ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; };
-  ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.3"; sha256="16pkpgvg46xscp6z2xlhlnfzc9048jlgqxxbqa4c90z7dclcmrqk"; depends=[caret mclust mixture mnormt mvtnorm]; };
   ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.1"; sha256="00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s"; depends=[]; };
   ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.4.3"; sha256="0glfnwmfs6xv4d1h5y0859srvj3y68192589mdjcx0jgkgk2c9np"; depends=[lmtest sandwich]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
@@ -789,7 +794,6 @@ in with self; {
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.3"; sha256="152g8nfa3ksj0dlzlch9a6g18b1vi6dlw748a6m55haghchbyr9l"; depends=[matlab mc2d statmod tensor]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; };
   CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; };
-  CorReg = derive2 { name="CorReg"; version="1.2.8"; sha256="18l9aiv2ipvs14ycnzq99yvnkws38wnj42zbk5jqgv33kn37qbx2"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
   Corbi = derive2 { name="Corbi"; version="0.4-4"; sha256="0s56hl2hr73kf8y7syq441wy1b9gjjcnvpgdigcc9g7gi0bkjx35"; depends=[CRF Matrix mpmi]; };
   CoreGx = derive2 { name="CoreGx"; version="0.1.0"; sha256="1hw7hnd259cspy043js8rv5mb600j3kdhrcq9iva0nmy1qayxdbl"; depends=[Biobase lsa piano rlang]; };
   CornerstoneR = derive2 { name="CornerstoneR"; version="1.1.1"; sha256="017j7s3m97sxahgnvk9sm7rfx81cjp1xzsmw7b1aqi7301zjrqa7"; depends=[checkmate data_table ranger vcd]; };
@@ -797,6 +801,7 @@ in with self; {
   CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; };
   CorrMixed = derive2 { name="CorrMixed"; version="0.1-13"; sha256="02zg5kmv5qxnasnz872r3z7x7dmdcniq1x5xyfnnb3niwkdjgxzx"; depends=[nlme psych]; };
   CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.1"; sha256="1hqbb3raw86g3ww8dmapyy8lac2avs6jbjklfvi9gx06lyw4kv9r"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; };
+  CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.17"; sha256="1g7irjbhwnbhk74y3qxcjlrsn2yz8q6wn7ih16wq669nswryxhxk"; depends=[bitops digest XML]; };
   CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.0"; sha256="15047cfjniljzhznkbzq3hyq221y9k7fa04f69zm0k0sxr627gxg"; depends=[]; };
   Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; };
@@ -817,7 +822,7 @@ in with self; {
   CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; };
   CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; };
   CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; };
-  CrossVA = derive2 { name="CrossVA"; version="0.9.8"; sha256="0jqsw937j6vn7c1xqv22211nhjldq8mdmds7hklksn9sji7pdkq7"; depends=[stringi]; };
+  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]; };
@@ -840,7 +845,7 @@ in with self; {
   DAIME = derive2 { name="DAIME"; version="1.1"; sha256="0kgss7gdwn1fd25arcwai915gm18qm5ffpq4f7qj2pg0lk4hvp0r"; 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"; sha256="1mr8lqq8s4aacmh7xdhmkmv8vsjqjczlqlaw27xnsljgj2kgq87a"; depends=[ggplot2]; };
+  DALEX = derive2 { name="DALEX"; version="0.4.4"; sha256="04i17ni8g595jj8dxdfwr9vsxmdn2kkam90ab68vlwws3ywqjl6r"; depends=[ggplot2]; };
   DALEX2 = derive2 { name="DALEX2"; version="0.9"; sha256="1k39gswksicrb60nx7zzna3mqdm36ckg590iw511ga7frnb8fjl9"; depends=[]; };
   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]; };
@@ -856,7 +861,7 @@ in with self; {
   DBfit = derive2 { name="DBfit"; version="1.0"; sha256="19jdf693ygwfchlqvh0kywid14v0b53p33rr2dvmaqmsc6pfxbbf"; depends=[Rfit]; };
   DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; };
   DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; };
-  DCEM = derive2 { name="DCEM"; version="0.0.2"; sha256="126qfk1zbmmlcqm7rbrq61z9l5wm4dspqfzglhqjb92m14i2pnm3"; depends=[MASS matrixcalc mvtnorm]; };
+  DCEM = derive2 { name="DCEM"; version="1.0.0"; sha256="192y07bik0xhs5ja9fmp2ds0qncwpkybarixnak4i35afcky7w7d"; depends=[MASS matrixcalc mvtnorm]; };
   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]; };
@@ -876,6 +881,8 @@ in with self; {
   DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; };
   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="0.1.0"; sha256="05kj07lxav7b16ndmzakd29bpy0h3y2cmx6if7x7hyy7vnkj3c38"; depends=[]; };
   DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
   DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; };
   DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; };
@@ -887,6 +894,7 @@ in with self; {
   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]; };
+  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.4"; sha256="0fkzf05p5k22kvicbiizx8aricjkgvkvg2874kmibkycld3qrblq"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; };
@@ -919,8 +927,7 @@ in with self; {
   DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
   DPP = derive2 { name="DPP"; version="0.1.2"; sha256="1qalcm4gwh03qpy07d0p323ccq8xmk04v6z30g7wg6ic613bqg7m"; depends=[coda Rcpp]; };
-  DPWeibull = derive2 { name="DPWeibull"; version="1.3"; sha256="143mvynkb6k7fbaxlyisw7a4acssqjyh7jld5myz55ns3r3fablw"; depends=[DPpackage matrixStats Rcpp truncdist]; };
-  DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; };
+  DPWeibull = derive2 { name="DPWeibull"; version="1.3"; sha256="143mvynkb6k7fbaxlyisw7a4acssqjyh7jld5myz55ns3r3fablw"; depends=[matrixStats Rcpp truncdist]; };
   DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; };
   DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
   DRHotNet = derive2 { name="DRHotNet"; version="1.0"; sha256="0lfhypcc222lrsgiya4xh2b524p2xg92ww2f3filjw4qhvi6q5k9"; depends=[maptools raster sp spatstat spdep]; };
@@ -928,10 +935,10 @@ 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="1.0-2"; sha256="0kvhby807h4ilmrlbcxlmw3rncvg9i428n8rl40v2w865a0p6861"; depends=[ggplot2 limma]; };
-  DSAIDE = derive2 { name="DSAIDE"; version="0.8.0"; sha256="07nngh3gs7n2myr1fwfqaq9ys56h16mjrha19gxjgsmcf5dp3bi4"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs plotly shiny XML]; };
-  DSAIRM = derive2 { name="DSAIRM"; version="0.8.0"; sha256="1mc3xqbciim53d7gglnpgla4c4i0ps3vw83d64rp39wzhrpnxv5c"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; };
+  DSAIDE = derive2 { name="DSAIDE"; version="0.8.2"; sha256="00qpnqqdzj8bfg2i04w47hq7by7p17n6prp7w5vzis72y7s3d07l"; 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"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
+  DSL = derive2 { name="DSL"; version="0.1-6.1"; sha256="1zgw3dpgzbb63n1rasz8s519d9x5g3ri05xsjyxm1i6zczcnymmc"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
   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]; };
@@ -941,6 +948,7 @@ in with self; {
   DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
   DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
+  DTDA_cif = derive2 { name="DTDA.cif"; version="1.0"; sha256="1gfhcbb5y7yw93f1flpj0p3n62drvck3wi0vswdrzzbbgb0qr2l2"; depends=[doParallel foreach Rcpp]; };
   DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; };
   DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
   DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
@@ -950,7 +958,7 @@ in with self; {
   DTSg = derive2 { name="DTSg"; version="0.1.2"; sha256="0j83ysgw5sq4m4sg4a2k2fpmc8g0xbc9hgnlkmyr1cwl3r4xw4ks"; depends=[assertive_base assertive_numbers assertive_sets assertive_types 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.8"; sha256="1d4ykhy0x2ypfb52n8b2lcyd7nsrcixk7dsnkajc8avkbn4ylgrw"; depends=[ggplot2 KernSmooth shiny]; };
+  DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.9"; sha256="1m13lhxgw7yj44s5spmlb4xxkranfbmjfh8lhrksikd796vxms3s"; depends=[ggplot2 KernSmooth reshape2 shiny]; };
   DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; };
   DWLasso = derive2 { name="DWLasso"; version="1.1"; sha256="1i8j8wjfvg69ldr8ahz1zv3m2wgxd701iph94ad22zs9qwqfg16z"; depends=[glmnet hglasso Matrix]; };
   DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; };
@@ -972,8 +980,8 @@ in with self; {
   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.6.3"; sha256="13hbh2wm9vfwzrr5vsq1nyd6670msd47wbq3smdpwk5vwl8w7m35"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; };
   DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.6"; sha256="0xw40nq6r64c5z2q3kwnr7nn97ar1mwnzifpd0j3l65nyar9dswf"; depends=[AdaptGauss ggplot2 Rcpp RcppArmadillo sp]; };
-  DataViz = derive2 { name="DataViz"; version="0.2.6"; sha256="09pszs46vzcjjrmgf9sya89qp53qjm1x68vkq3m27cz5an39qzfy"; depends=[Rcpp tibble]; };
-  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.3.0"; sha256="1mzdc57jlrmi7v7whgjwjy1pmkq9hn4fr6nwgn0biwdfbk6jc2q5"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; };
+  DataViz = derive2 { name="DataViz"; version="0.2.7"; sha256="0skyj254ljg00vfv91mbwv9r9idaw8f6fj0ccvgmmlq183xg16qk"; depends=[Rcpp tibble]; };
+  DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.1"; sha256="0f0kybbi47x585rxlgdhcmrn1wr9399pd26692czg4h9qwvnka52"; 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]; };
   Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
@@ -1002,7 +1010,7 @@ in with self; {
   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.8.5"; sha256="0815ws2zmla3ici1n8amkc8fz8lwpbg5z68m8j3nhc79m2ikvm20"; depends=[]; };
   DescTools = derive2 { name="DescTools"; version="0.99.28"; sha256="001xjyf19c7sy8x7gfs7krjcj39zsbx2cgc5ds3c4p16fhxnw8vg"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
-  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.2"; sha256="0dkinmiwv47wdpdj75idxjcalm2r4mljspfis5k7hyxmy20hi1nv"; depends=[DescTools rstudioapi]; };
+  DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.3"; sha256="114zhx26rcbnnpjcm9igbnv4yx4q378z4mi1xjnsy2wn1dwh397a"; 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]; };
@@ -1018,7 +1026,7 @@ in with self; {
   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]; };
   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"; sha256="0154nsnr7g4nq4i3w1q3dlxj42a17hmir4gizr03jv7rn61vvkp4"; depends=[]; };
+  DiceDesign = derive2 { name="DiceDesign"; version="1.8-1"; sha256="11s1m543kxd6gv4amh8z6pph1n67sj9sfwm6hjy83wfs65syf5vp"; depends=[]; };
   DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; };
   DiceKriging = derive2 { name="DiceKriging"; version="1.5.6"; sha256="14jfwvj8vhrngcpkqdzr6klhnqwgr1g5wm5rqz8q6w7ip4nnsii5"; depends=[]; };
   DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; };
@@ -1038,7 +1046,7 @@ in with self; {
   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.4"; sha256="1fv446wr5b8ixcs473vqv5ak9q46vhgzflc1zg8x7k5q5fdwqhmm"; depends=[dplyr magrittr rlang]; };
-  DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.2"; sha256="1dfwk3c94rx66dm30w5i4287f509msw24x0lyfaxychyqmdzv8np"; depends=[]; };
+  DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-1"; sha256="0ij6r8l8xxjmnp0x29p0wlnq7bk1rmg7hxzfrs9qhb410rjxc3r4"; depends=[Rcpp]; };
   DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
   DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; };
   DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; };
@@ -1051,7 +1059,7 @@ in with self; {
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
   DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
   DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
-  DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.12"; sha256="1dxz7iv0m6fs92y9m9wija73gnm4xhq5j0z04fnvp8m5v1wynjiy"; depends=[combinat DoE_base]; };
+  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_wrapper = derive2 { name="DoE.wrapper"; version="0.10"; sha256="1kknqfpvrs46iksydg0mlld3wnjqcdhm82cx2sc20k3rpmz463b1"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
@@ -1066,6 +1074,7 @@ in with self; {
   DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; 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]; };
   DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.1.3"; sha256="12zisrh2wra33hm4m4rzr5r3cxc3gdapv93c18wna64skbggvbv6"; 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]; };
@@ -1079,8 +1088,8 @@ in with self; {
   DynTxRegime = derive2 { name="DynTxRegime"; version="4.1"; sha256="1gjklpyjf9gl1h94v8lhra0vg90bnci7f70nzmvg2gkfyin7jygv"; 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-2"; sha256="0myw6k2jnb1g1cfyacbib5bv43jiv2n451220hv5v87514y3z5kf"; depends=[lhs]; };
-  E4tools = derive2 { name="E4tools"; version="0.1.0"; sha256="10kjy86lqn1k7lv3hykcskjyqmgxmwn1iwx4gsdgsvjg7xp4q303"; depends=[accelerometry anytime BBmisc chron data_table DataCombine ggplot2 hms scales signal]; };
+  DynamicGP = derive2 { name="DynamicGP"; version="1.1-4"; sha256="0zlhlxbi53zd79dgp09625ghb5lfl5s4sdmf2849ajcc83wqfiih"; depends=[lhs]; };
+  E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; };
   EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; };
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
@@ -1105,7 +1114,7 @@ in with self; {
   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.5"; sha256="136hymfsamsvsc7liclzx06widcd2vxc5f4p8iqnwx39gwxa9yzk"; depends=[corpcor doParallel dplyr foreach ggpubr glasso igraph iterators lavaan Matrix mvtnorm NetworkToolbox plotly plyr qgraph semPlot]; };
+  EGAnet = derive2 { name="EGAnet"; version="0.7"; sha256="1j385mds2mdl0cbshwfda2js0av8rg9npn7ibp1xy3k0d6mwi90z"; depends=[corpcor doParallel dplyr foreach ggplot2 ggpubr glasso igraph iterators lavaan Matrix matrixcalc mvtnorm NetworkToolbox plotly plyr qgraph semPlot]; };
   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]; };
@@ -1135,7 +1144,7 @@ in with self; {
   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]; };
-  EMP = derive2 { name="EMP"; version="2.0.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; };
+  EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; };
   EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; depends=[pracma]; };
   EMSHS = derive2 { name="EMSHS"; version="1.0.0"; sha256="1lpv3243z5765b1dihqz9hc3dpw76nwy14mmd4253sw8xpy25w41"; depends=[Rdpack]; };
   EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; };
@@ -1175,8 +1184,8 @@ in with self; {
   Ecfun = derive2 { name="Ecfun"; version="0.2-0"; sha256="1clxwmwd4lmhh7zqspqgn13vrzg40lbqzb0a7b90qla4hk9r4zm4"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML xml2]; };
   EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-5"; sha256="1953q374msvdw91m2nagxkwh5r9gnq5qss6l6mf34hayq3kwm8s9"; depends=[d3heatmap doParallel edgebundleR foreach ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; };
-  EcoIndR = derive2 { name="EcoIndR"; version="1.5"; sha256="1qzh2lybfqgnh34w0izvdzz322big4p3r9bwdd9qdazqrcxp5zyf"; depends=[rgeos]; };
-  EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.2"; sha256="1gz3h97i8bcd3nkkrfl5wwxwjkw0z7qvj1bjksdjplchkag0nk3x"; depends=[ggplot2 igraph]; };
+  EcoIndR = derive2 { name="EcoIndR"; version="1.6"; sha256="1pichrwny5hyb19919ldbgkdxp1s6vs03yw0x43ww13ldi314zbn"; depends=[rgeos]; };
+  EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.3"; sha256="05j8m9vzkwlsw1h69s5myhbg85vyhqdxcl9r5mdwsrk9f58wajmz"; depends=[ggplot2 igraph]; };
   EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
   EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; };
@@ -1193,13 +1202,14 @@ in with self; {
   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.1"; sha256="09hz283vwg0sdxavqw5rp6izqjf8slvv7sraa355cklz5n27xgag"; 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]; };
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
   Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; };
   EmiStatR = derive2 { name="EmiStatR"; version="1.2.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="1.4.0"; sha256="07q8il0hn8jz1h94nic3kxh09yz7biphakbx45xy0spyv23q01m6"; depends=[ggplot2 gridExtra]; };
+  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.0"; sha256="0kbzkahka7030hsbvjjf3cafsnqdpfg5yh0r8agsm789dm24q3k9"; 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]; };
@@ -1220,7 +1230,7 @@ in with self; {
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; };
   EpiCurve = derive2 { name="EpiCurve"; version="2.1-1"; sha256="0y6llpxa8xyfn9cxhq35mzfp1gc7la1708q85q4hz0l115abvk92"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
-  EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
+  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.3"; sha256="10snghwkapg6n6lhkf5v3w2g0ngkq556px65ccc4dgyndhwdsqmm"; depends=[coda igraph]; };
   EpiModel = derive2 { name="EpiModel"; version="1.7.2"; sha256="0zkj17kvssn4y2rglasx2s0ks1ha6bf1lzbj809pmf2m4gvyc4gb"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
@@ -1283,7 +1293,7 @@ in with self; {
   FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; };
   FDboost = derive2 { name="FDboost"; version="0.3-2"; sha256="1ahdq49ijj4j2yykmzbpgrjn0sm09nzmd33k317y157hnf6zyxvs"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; };
   FENmlm = derive2 { name="FENmlm"; version="2.4.2"; sha256="1nqnrjij5kgn0xpm3xvz2hdlddpcnvyni58pyrlmnlyvbhcw2z0k"; depends=[Formula MASS numDeriv Rcpp]; };
-  FEprovideR = derive2 { name="FEprovideR"; version="0.1.0"; sha256="07z84dqnbiiwjghsn5vml6300gw1swnap0la3pksw3dwxi131zk6"; depends=[ggplot2 Matrix poibin]; };
+  FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; };
   FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
   FFTrees = derive2 { name="FFTrees"; version="1.4.0"; sha256="0s2h81vdh8d41kwz5ja831q11wrb7ywdd7aq46x3y9sgg3aabd44"; depends=[caret circlize e1071 igraph pROC progress randomForest rpart stringr yarrr]; };
   FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
@@ -1300,7 +1310,7 @@ in with self; {
   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]; };
-  FLSSS = derive2 { name="FLSSS"; version="8.5.2"; sha256="0ligxax4nqhpmn3jp628f6572800lgxjqii78llvj0j927y3fapa"; depends=[Rcpp RcppParallel]; };
+  FLSSS = derive2 { name="FLSSS"; version="8.5.5"; sha256="00hcfbzc6v4xyhmlqc1ypl7df2x134dbsl21l7rh3zcmp2vc9ayr"; depends=[Rcpp RcppParallel]; };
   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]; };
@@ -1321,7 +1331,7 @@ in with self; {
   FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
   FRK = derive2 { name="FRK"; version="0.2.2"; sha256="0m0ngxanyq19myzza4fb75k9vb67mv17iny847bv9qrgg2vbm5r8"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; };
   FRegSigCom = derive2 { name="FRegSigCom"; version="0.3.0"; sha256="0w0yhch75wdx6phf5h4radipgpndv5bfxva2pzzd99fkmws4sswn"; depends=[fda Matrix Rcpp RcppEigen]; };
-  FSA = derive2 { name="FSA"; version="0.8.24"; sha256="0b8dz3vcfhgm35zfrw9pn4w7ja7k46wx5qqsavyns650lah0m36p"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; };
+  FSA = derive2 { name="FSA"; version="0.8.25"; sha256="035hbw36bmyvk947lkf6f96930wla7wlyn77zrnswl2ikxriif1p"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
   FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; };
@@ -1334,8 +1344,8 @@ in with self; {
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
   FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
-  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.3"; sha256="1924f5sfadgs47ja1ljwqm3slnmqqz1pwxhh9cn1rg1hi8g7db6f"; depends=[FactoMineR rmarkdown rrcov]; };
-  FactoMineR = derive2 { name="FactoMineR"; version="1.41"; sha256="1h20hydav6l2b7bngqw1av4l5rrh0wk58nhailga1f4qw9lrv259"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
+  FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.4"; sha256="1svz4w025jhy907rmg5w4c3wrwadwncb420w2dc1b3nhhysh0llv"; depends=[FactoMineR rmarkdown rrcov]; };
+  FactoMineR = derive2 { name="FactoMineR"; version="1.42"; sha256="1yl16inb2m89l1czgaf0pgy9655dpr751hyx92yw6rqpd2ryznac"; depends=[car cluster ellipse flashClust 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]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
@@ -1392,6 +1402,7 @@ in with self; {
   FlowCAr = derive2 { name="FlowCAr"; version="1.0.0"; sha256="19pn29p99j85p8mzjnlkqjr9nbxr3vffahs53i85s1gajb9ynpk4"; depends=[enaR LIM limSolve]; };
   FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; };
   FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; };
+  FluMoDL = derive2 { name="FluMoDL"; version="0.0.2"; sha256="193xyzc20nb1hsj172alky7h661j8m1r42x3xh1h22yzb1hb6dn4"; depends=[dlnm mvmeta tsModel]; };
   Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
@@ -1399,6 +1410,7 @@ in with self; {
   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.1"; sha256="0g9d7248zadbhr5gs0rnl2ckjj4xa08nkwlb8kfsvdnnfzihcz4p"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; };
+  ForestFit = derive2 { name="ForestFit"; version="0.3"; sha256="02yv6f76pd9lw38yfb87nbb4z6cj9l0j67ddricfxxzlxmz6n8hv"; depends=[ars cluster]; };
   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]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
@@ -1409,7 +1421,7 @@ in with self; {
   FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; };
   FrF2 = derive2 { name="FrF2"; version="1.7-3"; sha256="11x9jpj0l5w7195gryimfmii84nk76ll1z6hrrzr2v9y4jcxpx4s"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
   FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
-  FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.1"; sha256="0l015v99hzmiyic0klvq71ljk9f8ipr57ki7x4cjyz1gam9f84p5"; depends=[]; };
+  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]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; };
@@ -1460,7 +1472,7 @@ in with self; {
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
   GDINA = derive2 { name="GDINA"; version="2.6.0"; sha256="02smx1q0a5zgms6h2dnl2786jss38vim8n3vh3dbsijkvj7m4cb9"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
-  GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; };
+  GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; };
   GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.17"; sha256="0v2aa9ig49vc8dz0s91bvs9jilca3pg8zxq7r2w6x195arb3ngga"; depends=[changepoint GENEAread MASS rpart signal]; };
   GENEAread = derive2 { name="GENEAread"; version="2.0.6"; sha256="1idqfg1ma8sy48j8v875j29p72slfqaj8cix6l9gpwlry6lnhg4g"; depends=[bitops mmap]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
@@ -1469,6 +1481,7 @@ in with self; {
   GERGM = derive2 { name="GERGM"; version="0.13.0"; sha256="1h3fzkgc553bvxhcmvmlgk9sdais186h4gs1qagdihwpwn8ymbjk"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; };
   GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; };
   GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
+  GET = derive2 { name="GET"; version="0.1-3"; sha256="115hrwdxv2kpfl372r1h7qjyazm50z3zx76ydhjsaj6pp5zspdw5"; depends=[caTools fda_usc ggplot2 gridExtra gstat plyr sp spatstat]; };
   GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; };
   GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; };
   GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; };
@@ -1480,7 +1493,7 @@ in with self; {
   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.9-1"; sha256="1mpp9zwk5gc50i2nyif2byjmzgr4c2p752wj6q73xad55p308sb7"; depends=[data_table Rcpp]; };
+  GGIR = derive2 { name="GGIR"; version="1.9-2"; sha256="1qdk0nq2ahznphi6hjr5c1r877xxgqi58bpsayzh19lnzckrcc92"; depends=[data_table Rcpp]; };
   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]; };
@@ -1498,20 +1511,22 @@ in with self; {
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
   GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.6-0"; sha256="0qf6rx93h9mgvzlraiy000sy9zl5jyn48yn3zi3av389dd35nr6a"; depends=[MASS nlme]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
+  GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; };
   GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; };
   GLSE = derive2 { name="GLSE"; version="0.1.0"; sha256="1snzcz637ppz3lkg1575ln3shfidkrnynqh1d8b5rk0z0974bpm1"; depends=[gRbase igraph mvtnorm]; };
   GLSME = derive2 { name="GLSME"; version="1.0.4"; sha256="1bh56dv4czl89dm9b6syfpsbds4wni03d5vamvjbp6wblhysxnpm"; depends=[corpcor mvtnorm]; };
   GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; };
   GMCM = derive2 { name="GMCM"; version="1.3.2"; sha256="0sm08kf6ia2fi69zqv4nhnlk71v75b5sz2vd3aj0kfhgan7bl93i"; depends=[ellipse Rcpp RcppArmadillo]; };
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
-  GMDH2 = derive2 { name="GMDH2"; version="1.4"; sha256="13vbzqxmqvp39rbxw41nqfrmk0w6w8qc9nzgfbfpc07h3gcwva41"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
-  GMDHreg = derive2 { name="GMDHreg"; version="0.1.0"; sha256="0z6xk2av3b124941ysx332kid3adxinyin5ly9kdfc432gbwx0iz"; depends=[]; };
+  GMDH2 = derive2 { name="GMDH2"; version="1.5"; sha256="0y132zc8q4daj4856xikp4xvrqcibmn9r2shnmwpwxnfbik2ikfb"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
+  GMDHreg = derive2 { name="GMDHreg"; version="0.2.0"; sha256="07qk9jbav9gm3gh3ag7nz273iab5zlkn0yz31zs2hw646ik1yn14"; depends=[]; };
   GMMAT = derive2 { name="GMMAT"; version="1.1.0"; sha256="0b6bw33bldnc525aka14bil7fcdjcr18hr92ln9p9afpqajzkayz"; depends=[CompQuadForm foreach Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
   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="0.3.6"; sha256="0ijl150f66hras89k0nxz7r8ws638x8rdglcia73b7wmmjmgdfid"; depends=[igraph wordcloud]; };
   GNE = derive2 { name="GNE"; version="0.99-2"; sha256="16mivsa4r8d2cg5qsh5rpg2244f74zk2ln3vbys7ivjgnjpjn7z8"; 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]; };
@@ -1543,7 +1558,7 @@ in with self; {
   GSAfisherCombined = derive2 { name="GSAfisherCombined"; version="1.0"; sha256="1xhq5nc3kbz3ml9qkdxm6m0c65fybabfhgqlwii2105jl0ll7qy5"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
   GSE = derive2 { name="GSE"; version="4.2"; sha256="0vrxn6j5brhwd38zqnr6m3in3hp1xfs1mfhps9qsj20d4w8d1rf9"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; };
-  GSED = derive2 { name="GSED"; version="2.2"; sha256="11pzpsjzxw61spcjhbbqrdc0m48p5wnapxchksql2njas80s7ynj"; depends=[memoise rootSolve survival]; };
+  GSED = derive2 { name="GSED"; version="2.3"; sha256="1mpbgdgz6c42bq8klk8b43clspbrnqs3vnrk7i5qjy7ngrd96c6i"; depends=[memoise rootSolve survival]; };
   GSIF = derive2 { name="GSIF"; version="0.5-5"; sha256="104v01yifpagj7kyjfy80c4dgn9wv76py0av90vmgc55qynmvv19"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
@@ -1554,18 +1569,19 @@ in with self; {
   GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; };
   GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; };
   GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; };
-  GUTS = derive2 { name="GUTS"; version="1.1.0"; sha256="05nm2jfz5c0shsf73jkp22bgs98hal0px4717djkyvylif8nycmg"; depends=[Rcpp]; };
+  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]; };
   GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; };
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; };
+  GWASinspector = derive2 { name="GWASinspector"; version="1.1.2"; sha256="0qvyp8camwvml0yi3p7zx6n8xilzbgaz77qmxnrffyxbnxbpjnha"; 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]; };
   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]; };
   GWSDAT = derive2 { name="GWSDAT"; version="3.0.3"; sha256="10xvnnhqjs2p1r6yzflhkfi4985ljs57k5k8r6g85y2hq46m80p8"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; };
-  GWmodel = derive2 { name="GWmodel"; version="2.0-9"; sha256="19zz9i0f8i03ri8wpb8vkih2qd1fsn9h3l43307w7bnl34nayydl"; depends=[maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; };
+  GWmodel = derive2 { name="GWmodel"; version="2.1-3"; sha256="1xha645sx73sy35s856qd4hd3y0n682bnrw0ahfzcr4fvzykc6iy"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; };
   GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; };
   GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
   GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
@@ -1576,18 +1592,20 @@ in with self; {
   GeNetIt = derive2 { name="GeNetIt"; version="0.1-1"; sha256="1xjz22m4yn642m0bqa33w4m2rygpxjwg43c54lw168jck9zzgv1f"; depends=[nlme raster rgeos sp spatialEco spdep]; };
   GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
-  GenEst = derive2 { name="GenEst"; version="1.2.4"; sha256="0liq9z4n48hxswa97bxskwjn6yi5k1b99zwgp2ldxm70h80srywz"; depends=[cbinom corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; };
+  GenEst = derive2 { name="GenEst"; version="1.3.0"; sha256="0bqnn78vjxc92gdi09qvijyc0fp5z5r3lmijaxs0zrvlp1r120j7"; depends=[cbinom corpus DT gsl gtools htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; };
   GenSA = derive2 { name="GenSA"; version="1.1.7"; sha256="03xqwxm7v7rnihx730a4p65dfwhjh4345r3d78y0qxxplk8d76cx"; depends=[]; };
   GenTag = derive2 { name="GenTag"; version="1.0"; sha256="0yirl7n7p7w1dfbbr48v1151qyqm7p9m00vc6jq0s2d6bjdspin9"; depends=[]; };
   GenWin = derive2 { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; };
+  GeneBook = derive2 { name="GeneBook"; version="1.0"; sha256="1cg8zyr7rbshj3shhzkrxs910dsz4brhh51jvn2qzipzd8dbvxiv"; depends=[dplyr repmis stringr svDialogs]; };
   GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; };
   GeneCycle = derive2 { name="GeneCycle"; version="1.1.4"; sha256="0pivwfjz1plfhwz7k2c33k6p0pa1014d80qsrk8ig9yqqqlyhy1z"; depends=[fdrtool longitudinal MASS]; };
   GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
   GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; };
   GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; };
+  GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.1.0"; sha256="02s1wbsdp5ma4pnmcsdl5dwm156zx12d3n1ypzkc33lxg21ashzj"; depends=[CVST kernlab mgcv xgboost]; };
   GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; };
   GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.5"; sha256="0a4wpn1zqw1aiygin43lrq55kb7z6macgi2hl5vng9wnx2gl9jiq"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
@@ -1604,17 +1622,18 @@ in with self; {
   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]; };
-  GetDFPData = derive2 { name="GetDFPData"; version="1.5.1"; sha256="1smnglqqjva8dp12paw0jvd1zz4dx362i99zsif7rxdfz6wd68fa"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; };
+  GetDFPData = derive2 { name="GetDFPData"; version="1.5.2"; sha256="1xa1dy1lm4v2lch3qmfa990bx8r1qzch7jkpnydlnzmd0qmcbvb4"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; };
   GetHFData = derive2 { name="GetHFData"; version="1.7"; sha256="05xmr880n6arvpn6lb51yn9qssc8594rsxp6cinshk2jh6hq4fnj"; depends=[curl dplyr lubridate RCurl readr stringr]; };
   GetLattesData = derive2 { name="GetLattesData"; version="1.3"; sha256="0fqm50095lap687qnf1gxmm7syyv1k75irkqgsajijyr5adrizrp"; depends=[curl dplyr readr stringdist stringr XML]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
-  GetTDData = derive2 { name="GetTDData"; version="1.4"; sha256="0dl5wbq0w28l05jfw12mw5c2ghzvf0aq3qcc0il9373pd29mx4v9"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; };
+  GetTDData = derive2 { name="GetTDData"; version="1.4.1"; sha256="0hm73i8rsrm58ci7hzmmgirxklcxxh1dg8l3nk8rfi9x8fnnfyhs"; depends=[bizdays curl RCurl readxl stringi stringr tidyr XML]; };
   GetoptLong = derive2 { name="GetoptLong"; version="0.1.7"; sha256="1fl3w2n602ldybc5qj7qw4xmzzb804bsjkqwf6dswzj0vf0qiadr"; 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]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
   Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; };
-  GillespieSSA = derive2 { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
+  GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; };
   GiniDistance = derive2 { name="GiniDistance"; version="0.1.0"; sha256="0jq1dwpsvh3k25lawvzf9ij72jsspzyqsbnrphz8aqwi1dkm3851"; depends=[energy randomForest Rcpp RcppArmadillo readxl]; };
   GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; };
   GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
@@ -1622,12 +1641,12 @@ in with self; {
   GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.0"; sha256="1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"; depends=[]; };
   GmAMisc = derive2 { name="GmAMisc"; version="1.0.0"; sha256="14rs13y509hijg4ars3j55fm0133487alm8b9jlffbz8qiln48g4"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos rworldmap shape sp spatialEco spatstat]; };
   Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
-  Gmisc = derive2 { name="Gmisc"; version="1.8.1"; sha256="1pgmnn6qwcfcly7rhnnblriyazpvqa793i12xvb05hq0qij9j06f"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; };
+  Gmisc = derive2 { name="Gmisc"; version="1.9.0"; sha256="0072aidb9x969g276id68vaqvjddkb72l5smx1wlqss0h70y2r16"; 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]; };
   GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; };
-  GpGp = derive2 { name="GpGp"; version="0.2.0"; sha256="0v8kvi950hlrjirx1rpaix8sdgr2s68g4ps602iib59p50dxrwrr"; depends=[FNN Rcpp RcppArmadillo]; };
+  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]; };
@@ -1651,7 +1670,7 @@ in with self; {
   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.2"; sha256="0y38fzg91wxf6klw28zfcxv6fibriamszx7q8iyv0yz03yc40sab"; depends=[ape pegas Rcpp RcppArmadillo]; };
+  HACSim = derive2 { name="HACSim"; version="1.0.3"; sha256="0d6r08phibs510w218mws7g8yd5igrgqhgfhxwsg8dib1x7b85zz"; 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="0.2"; sha256="18vjzv6nrvaxv758hakpd9y58byqibd9i7sr6kr6z5lshii8fklv"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; };
@@ -1716,22 +1735,21 @@ in with self; {
   HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
   HTSSIP = derive2 { name="HTSSIP"; version="1.4.0"; sha256="04wfwbi57rxjd69inagvj3qricshwia16k6d2r4fgg9wmikgx4yv"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; };
   HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
-  HURDAT = derive2 { name="HURDAT"; version="0.2.1"; sha256="0v2ilxf7fq6zxpcb4vgi9jhjfps0v57q09z57hwk7x0sdmfsd3ka"; depends=[dplyr lubridate magrittr purrr readr stringr tibble tidyr]; };
+  HURDAT = derive2 { name="HURDAT"; version="0.2.3"; sha256="1pcr0dlmhcblsgdyb79n377523x347d4gbzia247cpv52y4kbk0q"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; };
   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="0.1"; sha256="1k1qhgf5f9ssb9fxykzdmy8rwk8vjc04aj4g6qr1af7231gan6mg"; 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=[]; };
-  HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
   Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; };
   Haplin = derive2 { name="Haplin"; version="7.1.0"; sha256="0xj2816v4vilvb4cizsw1qb2zfi63bgfhqqakcjvkcp4b8hn5cw2"; depends=[ff ffbase MASS mgcv snow SuppDists]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.6.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.1"; sha256="16gch956386lsk83ns5ij4d2bd5mghdyv36s7sw1kdpn39pszlx7"; depends=[energy]; };
   HelpersMG = derive2 { name="HelpersMG"; version="3.6"; sha256="1wlx74akpcf5ny4qjd12kb4rlgz38s6b5pj8744vcl852xbfizll"; 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.3"; sha256="09x1zjpkm091yr7by83ksddka8ldczb0dg09yr1gb6j68rhlbigp"; depends=[doParallel foreach seqinr]; };
@@ -1769,7 +1787,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.1"; sha256="1nm07wlrnjx36wr3jbv2faayh1vrlfid124b27w9v0x0dk145i82"; depends=[dplyr qgraph reshape2 stringr]; };
+  IATscores = derive2 { name="IATscores"; version="0.2.3"; sha256="03pakvryg64y7w9q7v97yykqwv7w93hl6h1ry652fjgrk5z3c43k"; 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=[]; };
@@ -1778,6 +1796,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]; };
   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=[]; };
@@ -1817,6 +1836,7 @@ in with self; {
   IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; };
   ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; };
   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]; };
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
@@ -1828,6 +1848,7 @@ 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]; };
   INLABMA = derive2 { name="INLABMA"; version="0.1-11"; sha256="0wzyb3c7zpksqz198kigi4rpblvk0rjamngmyabw5xdpizxdg6zi"; depends=[Matrix sp spdep]; };
   INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; };
   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]; };
@@ -1846,7 +1867,7 @@ 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.1"; sha256="1gij59b068qp7sbn9d0b9ghmnhfks15a9anj7bp26acv0yvdsg3s"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; };
+  IRkernel = derive2 { name="IRkernel"; version="1.0.2"; sha256="040qig675zaxsf81ranmvk293amrswi5098k69wyq0vgqyin6vwp"; 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=[]; };
@@ -1881,7 +1902,7 @@ in with self; {
   IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
   IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-1"; sha256="16swmbkb6shxl0vxby4pi246ji7qqb849nzqr4pbdg4gdg1a36f5"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; };
-  IndexNumR = derive2 { name="IndexNumR"; version="0.1.1"; sha256="0979v4wc3w9jxvwzpdrn8snrnicw9i41r9r9rpmkqbfrzc0xv6l3"; depends=[]; };
+  IndexNumR = derive2 { name="IndexNumR"; version="0.1.2"; sha256="0dip7v4z36k3fhl8szrbl11gcqy1rr7kgmcsajpdwd16jixj1d27"; depends=[]; };
   IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; };
   InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
@@ -1957,13 +1978,15 @@ in with self; {
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
   JointAI = derive2 { name="JointAI"; version="0.5.2"; sha256="1g0vrjb3qma90qfalh51zw4cnyjb6yw3zhrcyzh4nvivz6cpp12j"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
-  JointNets = derive2 { name="JointNets"; version="1.0.0"; sha256="1kvpx1xmpw1pns8x9wk4s27vf8wq6bq3r5bv1w9kbdd7130bpspz"; depends=[brainR igraph lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; };
+  JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
   JuliaCall = derive2 { name="JuliaCall"; version="0.16.6"; sha256="17vwv2x8gzd92j1wrj36z05ljqz79pjpxsrjsbcf07mfcij0bkac"; 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"; sha256="1dq45psg8sisxzbi1iv7n45lk1ibarl3f7xf7icd6kv1jkc2f8za"; depends=[locfit matlab R_matlab]; };
+  KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; };
+  KCSNBShiny = derive2 { name="KCSNBShiny"; version="0.1.0"; sha256="1lv5r9qyvr3dnvcs00jyam0whv64qmv5vphhijlar1xa1g1llwqr"; depends=[caret dplyr e1071 rhandsontable shiny]; };
   KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; };
   KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
@@ -1984,7 +2007,7 @@ in with self; {
   KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; };
   KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; };
   KSPM = derive2 { name="KSPM"; version="0.1.2"; sha256="1vgd7m0p65asj1v5b77zh6rv9vfbmxdc274mdya002nm9n8xn3gz"; depends=[CompQuadForm DEoptim expm]; };
-  KScorrect = derive2 { name="KScorrect"; version="1.2.4"; sha256="16qdmvgx3y170i495vmph2bhnc3j1z5232jibr3yzxl9i887kk0f"; depends=[MASS mclust]; };
+  KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; };
   KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; };
   KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
@@ -1993,7 +2016,7 @@ in with self; {
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
   KernelKnn = derive2 { name="KernelKnn"; version="1.0.9"; sha256="1y9s3y9r51rq8nz33glf767wjjclmj988rxw9r7rc9bw01dxkd7f"; depends=[Rcpp RcppArmadillo]; };
-  Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.0"; sha256="06vb8zpdf5brjsfiyd1s3gmhlfprpkw7fmjr594p4lw354lvhb4m"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
+  Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.1"; sha256="1mc3jzgmg8gyxs6kk474yz911abqzigxwjwjrmhipc40rrdmmr2z"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
   Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
   KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; };
@@ -2005,7 +2028,7 @@ in with self; {
   KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; };
   L0Learn = derive2 { name="L0Learn"; version="1.1.0"; sha256="1lz919d096s98c5lddyqnf8k8q5008a9p38i4nw2227ygi0gz8gk"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
   L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
-  LAGOSNE = derive2 { name="LAGOSNE"; version="1.2.0"; sha256="01d6460nph55id8392sraksnrwpnkpgfwzwvafpjzm5hjcb6b7rz"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; };
+  LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; };
   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]; };
@@ -2017,17 +2040,19 @@ in with self; {
   LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
   LCMCR = derive2 { name="LCMCR"; version="0.4.3"; sha256="1pzavzlr3fml4chrh0fmj8688a3xa153w5gp404nx3qld5sizqrm"; depends=[]; };
   LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; };
+  LDATS = derive2 { name="LDATS"; version="0.2.4"; sha256="1glzg2v8fmbmx9rv4smsy3fcswg8kdhh3g21m1lzld50nlvg2w1f"; depends=[coda digest dplyr extraDistr here lubridate magrittr memoise mvtnorm nnet progress reshape topicmodels viridis]; };
   LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; };
   LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; };
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
   LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; };
   LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; };
-  LDheatmap = derive2 { name="LDheatmap"; version="0.99-5"; sha256="0il3g3n3bzv74lz7dlhyiwc2x2417v6yhx2g47pahxdzqa09kf4s"; depends=[genetics snpStats]; };
+  LDheatmap = derive2 { name="LDheatmap"; version="0.99-7"; sha256="1r0j8bihi5z1x0sgaf7dwzpsw9i0nc1vylvipvc0cia2ka1lr9dc"; depends=[genetics Rcpp snpStats]; };
+  LDlinkR = derive2 { name="LDlinkR"; version="1.0.0"; sha256="1ihwx67k83jn9fdhdkh991qypd84jrqygpiz8g9gnzhi2lzg8y5m"; depends=[httr]; };
   LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
   LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; };
   LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; };
-  LEGIT = derive2 { name="LEGIT"; version="1.2.3"; sha256="0plix2s2xmc1zhcman39hw6c22a80wdn35c5x3bj3lj1ix8bzsii"; depends=[boot doSNOW foreach formula_tools Hmisc iterators pROC snow]; };
+  LEGIT = derive2 { name="LEGIT"; version="1.3"; sha256="053ibvayfb9h54a3fcwbfciyx7nzy7sjr551bwv0wfchna8hcnmd"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; };
   LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; };
   LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; };
   LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; };
@@ -2040,7 +2065,7 @@ in with self; {
   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.4.5"; sha256="1m9plqfdm2mwjvkn5zxpkrdwiy5dqlspvq6h7i3mck1rrm1j255l"; depends=[MASS mix mmm MultiLCIRT mvtnorm]; };
+  LMest = derive2 { name="LMest"; version="2.5.1"; sha256="09xvl1sx891q9mhyl7sx0zwxzlsl3p22pxlh8y8pbvr2wnb7frr7"; 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]; };
@@ -2098,12 +2123,12 @@ in with self; {
   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.0"; sha256="1spbzgkda3qhls6m9bj24vdhc6xg7x55ip4a6lq1ql8zcy2wggfs"; depends=[abind Rcpp RcppArmadillo]; };
-  LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; };
+  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.2"; sha256="10424n1sfaj21x8mlsc35m2p2zgdn7pg75qsx495l4qqjci6g2pl"; depends=[data_table pbapply quanteda reshape2 scales stringdist stringi tibble]; };
+  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]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
@@ -2111,7 +2136,7 @@ in with self; {
   LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; };
   LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; };
   LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; };
-  LilRhino = derive2 { name="LilRhino"; version="0.1.0"; sha256="0bnlhgkqfv3v3567ylf22k51wjndqy4bb5pjphvlhiia51xp3lfd"; depends=[beepr dplyr e1071 FNN ggplot2 keras reshape2]; };
+  LilRhino = derive2 { name="LilRhino"; version="1.1.0"; sha256="0pfahvn1wl310w897qhv3ynlfx5mgp237al47piqkdqmxmgma7dz"; depends=[beepr data_table dplyr e1071 fastmatch FNN forcats ggplot2 keras readr SnowballC textclean tidyr tm]; };
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
   LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
   LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; };
@@ -2130,7 +2155,7 @@ in with self; {
   LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.2"; sha256="0cs2dz1p6kpc9ghihnkzjknxwd904c376ryyabkf6lkqzc2p91sq"; depends=[cluster lattice]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
-  LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-1"; sha256="1hy7fnahncpsgqxfy352lxk298i69w7drlspsgdvpzdbghca3y3i"; depends=[MASS mclust mvtnorm rgl tkrplot]; };
+  LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-3"; sha256="0gplkprvldw2dq43kvij215lv9x9xdnp47smn8m1r93nk4pxy5mr"; depends=[MASS mclust mvtnorm tkrplot]; };
   LogicReg = derive2 { name="LogicReg"; version="1.5.12"; sha256="074kyqkgnn04z5r3kq25cjbrr9rvkymmsjmy5fwjdkwvaww6dsys"; 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=[]; };
@@ -2141,7 +2166,7 @@ in with self; {
   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.0.110"; sha256="02abgnvvvb2cd3wwammks8blr7fcl4a8z31q6y7szsjkzgdn8y4d"; 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.3"; sha256="06rhqzli17j4lv87aiqwf43m14gy5c45jh9wzkn4kzqwwh1mzb5a"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M2SMF = derive2 { name="M2SMF"; version="1.0"; sha256="0hf5ckpridi70yv15h0771q1grhqr9c592r87hgba7yh55dqqcq1"; depends=[dplyr MASS]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
@@ -2172,11 +2197,12 @@ in with self; {
   MAd = derive2 { name="MAd"; version="0.8-2.1"; sha256="096vdhfsp7bd3zvv6ydai6p230r16jx8zlqc4hlhnzma8rqypm35"; depends=[]; };
   MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; };
   MBC = derive2 { name="MBC"; version="0.10-4"; sha256="1fp06xx9jpz5mcxs0yppzzhch9w9c1qbsdbb60r4izrxnrhggpf7"; depends=[energy Matrix]; };
-  MBCbook = derive2 { name="MBCbook"; version="0.1"; sha256="0rfjabcv7594kn6cmg5bjxx1zx5v8zwsayxsajc34kb7jvj9fbrs"; depends=[MASS mclust mvtnorm Rmixmod]; };
+  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="1.0.79"; sha256="1qz0igm8h3ij8yc9bg3vr3mkmf99h1kyxscdhkfphc66zaazhyw1"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
+  MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.3"; sha256="1iw0wfyvdmks4diwwj75hqvdkmwnjb3zfw30rgnmr3nmxc3fa0b6"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; };
   MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
   MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; };
   MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
@@ -2185,7 +2211,7 @@ in with self; {
   MCDA = derive2 { name="MCDA"; version="0.0.20"; sha256="1pzp68dirby5ddwz37kjh9dnmwsbdfi37gfr8pgmngqzgbr9x6dd"; depends=[combinat glpkAPI RColorBrewer Rglpk]; };
   MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; };
   MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; };
-  MCI2 = derive2 { name="MCI2"; version="1.1.1"; sha256="1d8grg2a3c0nyl9wqxfsi0nq5qb5qbaspr5p2v791mhnbnfzkyhf"; depends=[MCI osrm REAT reshape tmaptools]; };
+  MCI2 = derive2 { name="MCI2"; version="1.1.2"; sha256="1vxzfab8yn18icarsdvz8ky7frspxax22sb8c0ki91y1mj9m9mgj"; depends=[MCI osrm REAT reshape tmaptools]; };
   MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
   MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; };
   MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; };
@@ -2215,7 +2241,6 @@ in with self; {
   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]; };
   MESS = derive2 { name="MESS"; version="0.5.5"; sha256="13kln67ca9d5dnimg0mqbnl6bni52r04xjhrw1vyzlhvn0x684kg"; depends=[geeM geepack glmnet kinship2 MASS Matrix mvtnorm Rcpp RcppArmadillo]; };
-  MEclustnet = derive2 { name="MEclustnet"; version="1.2.1"; sha256="1pznisvvgshqbixyj8jya35yhmmpxxa1ivh48c9iafgapwc4yn4s"; depends=[e1071 ellipse latentnet MASS mclust mvtnorm nnet vegan]; };
   MEtest = derive2 { name="MEtest"; version="1.0"; sha256="0hiv676lwwis1mmnw51vq4iwhbrwx0dvd6bmbv7hmxd48bykrcvg"; depends=[statmod]; };
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
   MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; };
@@ -2224,6 +2249,7 @@ in with self; {
   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]; };
   MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; };
+  MGDrivE = derive2 { name="MGDrivE"; version="1.0.0"; sha256="1wjrc8mb0bh2b66g7qsqhz1w8pp53z4amaq7nv68y2j8i2lm39l9"; 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=[]; };
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
@@ -2244,7 +2270,7 @@ in with self; {
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
   MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-  MKmisc = derive2 { name="MKmisc"; version="1.4"; sha256="187m07h6i11v2zr6jn1qj69nwrbldrw8w8cnh2anihqc4a6yx513"; depends=[ggplot2 limma RColorBrewer robustbase scales]; };
+  MKmisc = derive2 { name="MKmisc"; version="1.5"; sha256="1b8fxhgszyj75ii9mlh84gh8bc5ljf5f8ap1i7jaall9q5m0hfhd"; depends=[ggplot2 limma RColorBrewer robustbase scales]; };
   ML_MSBD = derive2 { name="ML.MSBD"; version="1.1.1"; sha256="1j110kz2k5hyk3la771yx41k6c2pam2k5hzzx42fm5n127aq3q56"; depends=[ape]; };
   MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; };
   MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; };
@@ -2296,7 +2322,7 @@ in with self; {
   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]; };
   MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.2-0"; sha256="0bhxzg5q3slq5x281xnyqwlgazkddlcaw4z6k7nc419v5ym75cqz"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; };
-  MPV = derive2 { name="MPV"; version="1.53"; sha256="14qnvcqqscd9hwn2mxf5dclv3ncj7w6vc3blxaml3rflriha6rls"; depends=[]; };
+  MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; };
   MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; };
   MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; };
   MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; };
@@ -2313,7 +2339,7 @@ in with self; {
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
   MSCMT = derive2 { name="MSCMT"; version="1.3.3"; sha256="1962lc6p5cy8pkbshzbl3jnd2pqnk9afs4lmp4qb7fqkmb4xpka3"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; };
-  MSEtool = derive2 { name="MSEtool"; version="1.2.0"; sha256="0r3cnn5cnivd776cvljk4wqrj8778k5ff3rkadywxv4qimrs74xm"; depends=[abind coda corpcor DLMtool gplots MASS mvtnorm pryr RcppEigen reshape2 rmarkdown snowfall TMB]; };
+  MSEtool = derive2 { name="MSEtool"; version="1.2.1"; sha256="1y1hncpa6qbd2dbcrkm9kacxmnw38g75bknxgq0dqygg07hcaabw"; depends=[abind coda corpcor DLMtool gplots MASS mvtnorm pryr RcppEigen reshape2 rmarkdown snowfall TMB]; };
   MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
   MSGARCH = derive2 { name="MSGARCH"; version="2.3"; sha256="0dax3cx0dzmg086vhymnm5x5s7ljdnxx1k52xnnvrm6pprhdgaqn"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; };
   MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
@@ -2322,7 +2348,7 @@ in with self; {
   MSPRT = derive2 { name="MSPRT"; version="2.0"; sha256="16j66r8b4lh9x6wfblq2xxydvbzfajiixmq7144vv1rfmbs8if8m"; depends=[doParallel foreach ggplot2 iterators nleqslv]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
   MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; };
-  MSbox = derive2 { name="MSbox"; version="1.2.0"; sha256="04s6xvv4f6p9fsj5kkvy3169imh9h6p4j14acwffxqyfmhay48y1"; depends=[stringr xml2]; };
+  MSbox = derive2 { name="MSbox"; version="1.2.1"; sha256="0lmvpzsw13w18mzi5z85yzify3xsh5sx356ndggfzyl5d5wk7s8g"; depends=[stringr xml2]; };
   MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; };
   MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; };
   MTA = derive2 { name="MTA"; version="0.1.2"; sha256="1149xjq6ybjv6llzlq67j5xc6dspb4mvd72n62nlbq3zz80x7f84"; depends=[igraph rgeos sp]; };
@@ -2340,15 +2366,16 @@ 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=[]; };
-  MVar = derive2 { name="MVar"; version="2.0.6"; sha256="0lygisyglckkz7a1spya92q9h74snri66r1cxymxv75li3i9pmdv"; depends=[MASS]; };
-  MVar_pt = derive2 { name="MVar.pt"; version="2.0.6"; sha256="0z5zqncch4h0kijw5qvn73nyp8jwr7mwxma7jn5mbr98l067lr0w"; depends=[MASS]; };
+  MVTests = derive2 { name="MVTests"; version="1.1"; sha256="13q9bfzbcf2gz5mhp5rjja5d0k0m78f0253ziwrlg5ncyf2d8q0c"; depends=[matrixcalc]; };
+  MVar = derive2 { name="MVar"; version="2.0.7"; sha256="025k78ahia9mv983kr8p4gbn675b59zxl7ywv13kbvn4jcpakiy8"; depends=[MASS]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="2.0.7"; sha256="1aif7la0mfsyh2wksvhwvakkrgj9irzg3c84psbad58v9yabjrla"; 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]; };
   MXM = derive2 { name="MXM"; version="1.4.4"; sha256="1dmq8ws1dqd294lrhd60dh1avkj58n9dha5ag4igwgjw31mphsr9"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; };
   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.4.0"; sha256="14kzkc2rsj63ni5404p10b87kvgv6cng9my7fyn8s4ydv3prpydn"; depends=[abind foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; };
+  MachineShop = derive2 { name="MachineShop"; version="1.5.0"; sha256="1injyl578zd5qs13h8bwzavb4gzam896d7g9304ck6rh2lbci4hj"; depends=[abind 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=[]; };
@@ -2356,19 +2383,20 @@ in with self; {
   ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; };
   ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; };
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.3"; sha256="04fhnghakygpwrmhrwqr6g0r62zsxl0czy5bn3xl5iqzaswcd4i1"; depends=[rentrez]; };
-  MapGAM = derive2 { name="MapGAM"; version="1.2-4"; sha256="13663vnxhjsamjxr7kwkbh52hfxj4hb5bc8iii8nk2yw9rcwrzwm"; depends=[colorspace gam maptools sp survival]; };
+  MapGAM = derive2 { name="MapGAM"; version="1.2-5"; sha256="0ardqsa7smx0syh1l591bm6a1rb7kvcyw3rlb3hkfk8rk4k60qmr"; depends=[colorspace gam maptools sp survival]; };
   MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; };
   MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
   MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; };
-  MarketMatching = derive2 { name="MarketMatching"; version="1.1.1"; sha256="1rdrw4p48lfgl4mzyxvz8f4dgpsc2gszl2c1m9a6vi3k0z4z4qkv"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; };
+  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]; };
   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=[]; };
-  MatTransMix = derive2 { name="MatTransMix"; version="0.1.2"; sha256="13jg0rl9y7ifkn2zcsd95sgbf0azmlx83dbh3syv9xdij9n28l83"; depends=[]; };
+  MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; };
+  MatTransMix = derive2 { name="MatTransMix"; version="0.1.5"; sha256="0c4kmlzrscrlbvbsqvkmfr9v95hy4hkwk52vnkanh3gqjmpy2rjk"; depends=[]; };
   MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; };
-  MatchIt_mice = derive2 { name="MatchIt.mice"; version="2.0.1"; sha256="1lw1p0kzz3a9y5hr9mrk9cjvdr63aa1sl7wqy8s1s07krvv14nrj"; depends=[MatchIt mice]; };
+  MatchIt_mice = derive2 { name="MatchIt.mice"; version="2.0.2"; sha256="0wfd77fimadray59llyfkmilm6fmqd3w0asp8d6krfbisx8bdapc"; depends=[MatchIt mice]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
   Matching = derive2 { name="Matching"; version="4.9-6"; sha256="1p36id8cds865b44jdbk6c3fnadvhh203qx6d3g54bi4s7bww3cf"; depends=[MASS]; };
   Matrix = derive2 { name="Matrix"; version="1.2-17"; sha256="1k1zf92ycqr7fz44w7bp1p354ww7jg0wm23ybb8dzmbg37qfchyv"; depends=[lattice]; };
@@ -2381,7 +2409,7 @@ in with self; {
   MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; };
   MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; };
   MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; };
-  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.1.3"; sha256="1s4hjj7kn2zbyf7b59ywmbs494spz19s9bbxdzkv7bx684lwqvqw"; depends=[dplyr futile_logger lubridate stringr]; };
+  MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.2.0"; sha256="0rgrz42cv4m5cl8nfldgsnkipvmz0jn3dpv812gx7swyqbizp9hw"; depends=[dplyr futile_logger lubridate magrittr stringr]; };
   MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.1"; sha256="14sklx6ja5s1pv8pnqf7s2xvp83x7ddnzc9hzfp3qvdzyyfvwicw"; depends=[countrycode dplyr geojsonio lubridate 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]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
@@ -2389,11 +2417,12 @@ in with self; {
   MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; };
   MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.1"; sha256="11q1yn6l697qa33wqik9y9lji39r6pph109yxkkprg9p80c187xy"; depends=[]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
-  MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.0"; sha256="0ccah3ajk2m5b1hva3za95bd9g2k800x7rl76if92gnfdx0b5qcp"; depends=[lavaan Matrix survey]; };
+  MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.1.0"; sha256="0acrrj138sf8qivfh0rrflaw76sl6swf4lviwiap2z5i18f3dd17"; depends=[lavaan Matrix survey]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   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.8.8"; sha256="1ahbdfxqy7s27qizr50z70k577lzcadwn0af9j126n1cr24qha7i"; depends=[cluster dendextend igraph 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]; };
@@ -2404,8 +2433,8 @@ in with self; {
   MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
   MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; };
-  MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.0.0"; sha256="1hsv1ci0a4gjwbfs1h0lxw5sczpk7hl5ws5016zry26cyvf75gzl"; depends=[AnnotationDbi Biobase boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper magrittr manhattanly Metrics multtest pheatmap plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite snplist stringr zoo]; };
-  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.5"; sha256="0098flarh91mvc2ry6903fwxbk2r4193mmh6m7mldisfg9w6igfw"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
+  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]; };
   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]; };
@@ -2427,6 +2456,7 @@ in with self; {
   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.1.0"; sha256="0c6l5rvrdcrm8fy3rnggfbilw15j29zxin0hhrvg91dx2y024mll"; 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]; };
@@ -2439,6 +2469,7 @@ in with self; {
   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]; };
+  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.0"; sha256="0iahhshqxpkxhpchb4hiv7d9rir2d3zxazs2nz7ymzdlhnn41xi1"; depends=[]; };
@@ -2449,6 +2480,7 @@ in with self; {
   MixAll = derive2 { name="MixAll"; version="1.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; };
   MixGHD = derive2 { name="MixGHD"; version="2.3.2"; sha256="1fqimvfm25f2wkfxxpnbsnzjkpfz2fyi1rgpgg7fgj2rdf56mmhp"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
   MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; };
+  MixMatrix = derive2 { name="MixMatrix"; version="0.2.2"; sha256="0gpqggw0fskd37lr0vjpf0y6gv711w6invfwj09rzggxlq6vx2fh"; depends=[CholWishart Rcpp RcppArmadillo]; };
   MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; };
   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]; };
@@ -2462,7 +2494,7 @@ in with self; {
   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.2"; sha256="0sdcpjdpaj614a55kcsjwgn990fa7zl8rg2s7h297yan7cg4l2sc"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
+  MoEClust = derive2 { name="MoEClust"; version="1.2.3"; sha256="1bkknlp49bcx4s2lpdqwpqn5f5rr90lah0zkvmkih309rayirjr3"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; };
   MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; };
   MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; };
   Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; };
@@ -2471,7 +2503,7 @@ in with self; {
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2"; sha256="158ddbw2snlyzd2q6mdaif5i67kq4qfvadylwjxgv1w2cmszrmk6"; depends=[data_table Rcpp]; };
   Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
   Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
-  MomTrunc = derive2 { name="MomTrunc"; version="2.37"; sha256="19y73fv58sxdrqmgffk9mwmq2xd35y8yrvbwv0dlpf8qm8gmz80f"; depends=[matrixcalc mvtnorm]; };
+  MomTrunc = derive2 { name="MomTrunc"; version="3.19"; sha256="137ya4z16w8nxh2qds0bki59h81a87rsmwi50mp82qxr76zv5s5d"; depends=[mvtnorm]; };
   Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; };
@@ -2490,6 +2522,7 @@ in with self; {
   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]; };
   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.3.1"; sha256="0kavghk4453ifx4fphzc9z4hpdd2fd85wzpihpkb51234di6lgc8"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; };
@@ -2555,6 +2588,7 @@ in with self; {
   NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; };
   NHMSAR = derive2 { name="NHMSAR"; version="1.12"; sha256="034cjzbwyf5jkj24wf9s6dij7g416psd2iz7fjrg34q9ax2kzyyl"; depends=[glasso lars ncvreg ucminf]; };
   NHPoisson = derive2 { name="NHPoisson"; version="3.2"; sha256="0k6m6ampp7g95d0jm5msvrgc12rqirpanb1ykbdf1ii027pqpwsn"; depends=[car]; };
+  NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.1"; sha256="0i75dlb0z8i3kp4b7h5fy8ykmnv4ciih1maj21hl7a7l47s095if"; depends=[]; };
   NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; };
   NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
@@ -2569,8 +2603,9 @@ in with self; {
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
   NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; };
   NMOF = derive2 { name="NMOF"; version="1.6-0"; sha256="0m97xi1bpq1gw18fn512blh0li6xv2yfipf2c3aj7bwaq91wv12l"; 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.2"; sha256="0ah5ry1qk0hy6i77g5d7gskldrgbvl52ihq212wwa2r8nc95bm3l"; depends=[data_table doParallel rgl stringr]; };
+  NNS = derive2 { name="NNS"; version="0.4.3"; sha256="163kizr1ck4m0fvxwdlja2f1lc7347jgmnrxq89qyjx477gjpir0"; depends=[data_table doParallel 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=[]; };
@@ -2586,6 +2621,7 @@ in with self; {
   NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; };
   NPMOD = derive2 { name="NPMOD"; version="0.1.0"; sha256="1m3rfgyxdbyr0m5vznav5qk70ch45wz3dc8wccxjcxrcfkn8i18k"; depends=[BSDA clinfun gWidgets nortest pspearman readxl rlang RVAideMemoire]; };
   NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
+  NPP = derive2 { name="NPP"; version="0.1.0"; sha256="0pwspgwrwdjsdsny8qvhdnqcsxh5fsg33chlla75562hr2jaxqkb"; depends=[]; };
   NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
   NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; };
   NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
@@ -2609,6 +2645,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.5"; sha256="0nwzpn4qdw5idx9r69nh7bhn8hphjiysqyx721jl0qchp8ssbg51"; 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]; };
   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]; };
@@ -2623,10 +2660,10 @@ in with self; {
   NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; };
   NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.2.3"; sha256="0ldhrp3r9aqsqblvg249bi2ndgj66x53dm0zm941a6nf7kh6j3zl"; depends=[corrplot doParallel fdrtool foreach igraph MASS Matrix ppcor psych pwr qgraph R_matlab]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
-  NeuralSens = derive2 { name="NeuralSens"; version="0.0.3"; sha256="1nz1gd76wvyz924lh8iq4dfhq6ysyp36s5gvp3wp25v3p0h93iiw"; depends=[caret fastDummies ggplot2 gridExtra NeuralNetTools reshape2 stringr]; };
+  NeuralSens = derive2 { name="NeuralSens"; version="0.0.5"; sha256="1lbl2p9cc35dk0vlcna72nilbv63gv0v96cgwdn9w2hny1bff3za"; depends=[caret fastDummies ggplot2 gridExtra NeuralNetTools reshape2 stringr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
+  NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.2"; sha256="16lysb690n8jck6c82b8akrd88v77fj5hyi0hhqsz2kz5vj0vify"; depends=[oompaBase]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
-  Nippon = derive2 { name="Nippon"; version="0.7.1"; sha256="1nw0kaqw5my2bx7i82q4j2qlsmc95kgjnbm9r9np3swhq6wizrmq"; depends=[stringr]; };
   NipponMap = derive2 { name="NipponMap"; version="0.2"; sha256="0jk3zz05vhximbbm15h7ngb0ffxp5w8zhisifipkdgvg1hpi7pb7"; depends=[sf tibble]; };
   NitrogenUptake2016 = derive2 { name="NitrogenUptake2016"; version="0.2.3"; sha256="13mh63z3x8yqd31v5a4d10bhzk4y67ac38flwk2msv7qcx37sny6"; depends=[car MASS zoo]; };
   NlcOptim = derive2 { name="NlcOptim"; version="0.6"; sha256="121njnbfww6qijbc9x6prw35glyzm18di01qvvjn62z4kgq4f7vi"; depends=[MASS quadprog]; };
@@ -2636,6 +2673,7 @@ in with self; {
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
   NonCompart = derive2 { name="NonCompart"; version="0.4.4"; sha256="0m62jwp572z7gn4rykyr47b6cfi4sy9hxxghhlkjdclkxw7bjxx9"; depends=[]; };
+  NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.1"; sha256="135scrxwm52fg4drxfr8dgwp2jrgdgbi3fq13i4cka3i99bpx4lm"; depends=[cubature]; };
   NonProbEst = derive2 { name="NonProbEst"; version="0.1.0"; sha256="0h21w26d22ffcx384b0fb1cm8fcwh4ijp18a691q7vqzcxq0f101"; 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=[]; };
@@ -2693,8 +2731,8 @@ in with self; {
   OjaNP = derive2 { name="OjaNP"; version="0.9-12"; sha256="170hn5gx48n0i16cd5rwzs5inb4hsvqb7zwixxsg7pami6ild0vs"; depends=[ICS ICSNP Rcpp]; };
   OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
   OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; };
-  OmicsPLS = derive2 { name="OmicsPLS"; version="1.1.0"; sha256="16q226y8wshjdry538w6zk116rip97hr5bfjyz8g960gy40pjn6j"; depends=[ggplot2]; };
-  Omisc = derive2 { name="Omisc"; version="0.1.1"; sha256="1azlxim71hw4lx2srrxcvxxrijwhv6yhs70230ssgvwxcmlmdhz1"; depends=[copula MASS psych]; };
+  OmicsPLS = derive2 { name="OmicsPLS"; version="1.2.0"; sha256="108rp76g4cy7zaxv9q979rlv4pn9kb5i3f3iz29cdvxm55a55khv"; depends=[ggplot2 magrittr tibble]; };
+  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=[]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
@@ -2718,7 +2756,7 @@ in with self; {
   OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; };
   OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; };
   OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; };
-  OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; };
+  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="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; };
   OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; };
@@ -2743,6 +2781,7 @@ in with self; {
   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.1"; sha256="03ap3m4c6jbzc311aksnrwrfd8h65gskka9jpmnx4wnvcrkalapj"; depends=[BiocGenerics genbankr optparse RCircos]; };
   PAFit = derive2 { name="PAFit"; version="1.0.1.2"; sha256="10nwl2wbpka63qc66gk9n6m1rvpf5kx9dwl948n9l6wr488klial"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
   PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
@@ -2756,7 +2795,7 @@ 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.1.2"; sha256="15m6qyj9w65dcdvbfi65llzsqqky890fh5b194clw505zyf6ma46"; depends=[AGread dplyr ggplot2 lazyeval magrittr matchingMarkets rlang]; };
+  PAutilities = derive2 { name="PAutilities"; version="0.2.0"; sha256="06q77mr2g448n3avps9bsy16yacahqhxvrbp3yyv2qxqsnjxvf7m"; depends=[dplyr ggplot2 lazyeval lubridate magrittr matchingMarkets 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]; };
@@ -2791,7 +2830,7 @@ in with self; {
   PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; };
   PEGroupTesting = derive2 { name="PEGroupTesting"; version="1.0"; sha256="1z863ard0cc2g8ibxnmxhiqhvs53r6b8gpnavnfchm9432ifcbwi"; depends=[]; };
   PEIP = derive2 { name="PEIP"; version="2.2-1"; sha256="0bzynmd7azs33994dlsabxp29lncs1v2njp6iy5l62rwrnxj9y0a"; depends=[bvls fields geigen Matrix pracma RSEIS]; };
-  PELVIS = derive2 { name="PELVIS"; version="1.2.1"; sha256="12r3cylcahz6rzrwy580wr06yc60p9x0b7vzn0v16pbv3r3ssw0d"; depends=[DT MASS shiny]; };
+  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]; };
@@ -2807,14 +2846,14 @@ in with self; {
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; };
-  PKNCA = derive2 { name="PKNCA"; version="0.8.5"; sha256="0lklg2w1rcas70rj72q390n6lkxq557731a90b7plh2g32xsp32k"; depends=[digest dplyr lattice nlme plyr rlang tidyr]; };
+  PKNCA = derive2 { name="PKNCA"; version="0.9.1"; sha256="0b9ar6d487b7klvavv6c10q9a8q6ads8bv9x3pb5359jxbfilm3q"; depends=[digest dplyr nlme rlang tidyr]; };
   PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
   PKconverter = derive2 { name="PKconverter"; version="1.3"; sha256="1ddhj1qwdwr6g89q55l9njm1ms1wr80d56klz50ai9xvb91qzn89"; depends=[shiny shinydashboard shinythemes]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
   PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
-  PLMIX = derive2 { name="PLMIX"; version="2.0.1"; sha256="1m1v745v5gd5npxl5cz3dqm2839wyl5j8qx6d66nnqbqj6ywg15v"; depends=[abind foreach gtools label_switching MCMCpack rcdd Rcpp]; };
+  PLMIX = derive2 { name="PLMIX"; version="2.1.0"; sha256="1z89s4f22d1z6caqamksj17g0w9qlx10n2grg05hg1dpmhv1mf7b"; 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]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
@@ -2844,7 +2883,7 @@ in with self; {
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; 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]; };
-  PRIMME = derive2 { name="PRIMME"; version="2.2-0"; sha256="1iwwh871v87fz6j6q9nvfiq8x8nz2v87n52l80a15d5rvvxv2rbi"; depends=[Matrix Rcpp]; };
+  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]; };
@@ -2857,7 +2896,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.0"; sha256="14rap5s38xmx8hgqr71q7r4g5kz098qwwv8m0b3pgfxa6ghnsgjx"; depends=[homtest]; };
+  PRSim = derive2 { name="PRSim"; version="1.1"; sha256="0h4gncdnd48p7z1x3ja9gyi5mhmcbcr5fj8xqvlqfslvsdmsak1g"; depends=[goftest homtest]; };
   PReMiuM = derive2 { name="PReMiuM"; version="3.2.2"; sha256="1mw5arjg9jyiyvrlcxm1sxdn989jkjfhldncdjyzkp4qhns6cjjs"; 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]; };
@@ -2878,7 +2917,7 @@ in with self; {
   PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
   PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[survival]; };
-  PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.2.4"; sha256="088bw991f76l9pmzbfrlbasccvdrms8vw0ik8p5zhgibl57dpqs6"; depends=[cluster dplyr dygraphs geosphere ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaCoreUtils MazamaSpatialUtils openair png purrr raster RColorBrewer readr reshape2 rgdal RgoogleMaps rlang sp stringr tibble tidyr xts]; };
+  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-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
   PairViz = derive2 { name="PairViz"; version="1.3.2"; sha256="01nzf7as848i3vpwgdm450x3f5lapfh2vgd59sy6qr80c19nfjl9"; depends=[graph gtools TSP]; };
@@ -2898,7 +2937,7 @@ in with self; {
   PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; };
   PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; };
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
-  ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.1.1"; sha256="12s02gvb2ilra8xca3yqb6pzy0pizvnq08kp05gj0xkdas4rb5z9"; depends=[data_table dbscan foreach GauPro lhs]; };
+  ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.1.2"; sha256="07kbx156n0i59q65zrfbnhaimyzh4kkp5gs57lknzinvjqqblwdd"; depends=[data_table dbscan foreach GauPro lhs]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
   ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.0"; sha256="007linzn60bjs8nh1j1jzb292naxajjpkjwmhjc992h8himxfky4"; depends=[jsonlite snow XML]; };
   ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
@@ -2915,7 +2954,7 @@ in with self; {
   Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; };
   PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; };
   PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; };
-  PeakSegDisk = derive2 { name="PeakSegDisk"; version="2018.11.28"; sha256="153305pfih4yz33hj15ffnwyx3mhr67f6v68rxdkwdqzchy4jgv9"; depends=[data_table]; };
+  PeakSegDisk = derive2 { name="PeakSegDisk"; version="2019.7.29"; sha256="0vcmz57cvyjn69nxzz5ai8xpjj92f3b9cynll5pv76v4k3sms5ld"; depends=[data_table]; };
   PeakSegJoint = derive2 { name="PeakSegJoint"; version="2018.10.3"; sha256="0f0dw6swhhf301j4ci3rs8cmzd39dcjlb0kqxpdh7f00gp3qn7da"; depends=[PeakError penaltyLearning]; };
   PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; };
   PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; };
@@ -2975,7 +3014,7 @@ in with self; {
   PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
   PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
-  Polychrome = derive2 { name="Polychrome"; version="1.2.2"; sha256="0pw5ph77dwqdf5s2cjsplichj75p1ncla4sb8k731r9mcx9pb98c"; depends=[colorspace scatterplot3d]; };
+  Polychrome = derive2 { name="Polychrome"; version="1.2.3"; sha256="1frh21813ffgax487bcyc6a3z0j9jb27dq5djsbpi7ali38il738"; depends=[colorspace scatterplot3d]; };
   PolynomF = derive2 { name="PolynomF"; version="2.0-2"; sha256="06gkyhacc609s7si604rh4yyqdafc4mqy15wcz90qrwbrhr18gcm"; depends=[Rcpp]; };
   Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; };
   PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; };
@@ -3000,7 +3039,7 @@ in with self; {
   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]; };
   PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; };
-  PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
+  PredPsych = derive2 { name="PredPsych"; version="0.4"; sha256="00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
   PredictionR = derive2 { name="PredictionR"; version="1.0-11"; sha256="1dljdbya93dirx715yqs4vz7hbbcwpgrsvyfgikkm2fj28nnn6k9"; depends=[fitdistrplus]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
@@ -3010,7 +3049,7 @@ in with self; {
   PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
-  ProFit = derive2 { name="ProFit"; version="1.2.7"; sha256="0mbxlrfm7sdamrwyv587mrp86r82pk73fp8iq63dpwwv3nmdq00r"; depends=[celestial cubature FITSio LaplacesDemon magicaxis RColorBrewer]; };
+  ProFit = derive2 { name="ProFit"; version="1.3.2"; sha256="0knmlja0bclzl6v58kdmx5a649m2gyvm6497gbziqnj7vn28l3wg"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; };
   ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; };
   ProPublicaR = derive2 { name="ProPublicaR"; version="0.9.2"; sha256="17fghv7w4wm4q9nd6l4pl5ibk5i4zgdhlp5pvbzvymhvby0q06sw"; depends=[config dplyr httr lubridate stringr]; };
   ProTrackR = derive2 { name="ProTrackR"; version="0.3.6"; sha256="1lhk3lrspiqcw2ckss52gdjk1f6ph8m7dlb05qxcx8mycq0xd3z9"; depends=[audio lattice signal tuneR XML]; };
@@ -3073,7 +3112,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-7"; sha256="1xkqp2z18fv4z0m5wc9cjd44zk3vk1wpl2lw09x8j10p65n717fm"; depends=[Matrix]; };
-  Qtools = derive2 { name="Qtools"; version="1.3"; sha256="1vbjydacgczjlsf8b8id25n3k0cq74i43nsvax22k8hbvj4g0b94"; depends=[boot MASS mice quantreg]; };
+  Qtools = derive2 { name="Qtools"; version="1.4.1"; sha256="0mv0pq4ryaijlz31r7w0qwqw4g8lr1pl9pf2319w2h4p86xp3g8m"; 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]; };
@@ -3100,6 +3139,7 @@ in with self; {
   R_utils = derive2 { name="R.utils"; version="2.9.0"; sha256="1w4zn2db15bggfnh64fbyi2z2sj47rcd4xn53b28dsnkamdcramj"; 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=[]; };
   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]; };
@@ -3132,8 +3172,9 @@ in with self; {
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; };
-  RATest = derive2 { name="RATest"; version="0.1.4"; sha256="1r5r10nkdcwrk13hfpv5b7apb0zq6hwxwg22i6smig447s4gk5h3"; depends=[ggplot2 gridExtra quantreg]; };
+  RATest = derive2 { name="RATest"; version="0.1.6"; sha256="1xbsdl302ybgcx58rvsz0c1055j7jr01a6zyaq34sq2rdy18vwrs"; depends=[ggplot2 gridExtra quantreg]; };
   RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; };
+  RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
   RAppArmor = derive2 { name="RAppArmor"; version="3.2"; sha256="0apw4l7z0jwa7bs7scfysv2amk2rxi7knw9x9j7vqlrgj0i059gm"; depends=[unix]; };
@@ -3165,7 +3206,7 @@ in with self; {
   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.0"; sha256="199igyynmgzfx4czffa6y8mv8radzhpxjd1z7spg3xaia8jz30ky"; depends=[curl httr jsonlite lwgeom magrittr sf]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.4.1"; sha256="0dbira0qw64dpichfshb84f0fwd3nki5fcmdxcqcbnl20fp8qnsn"; depends=[curl httr jsonlite lwgeom magrittr 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]; };
@@ -3238,18 +3279,20 @@ in with self; {
   RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; };
   RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; };
   RInside = derive2 { name="RInside"; version="0.2.15"; sha256="0azhialpdkfm5yzgazq2mfynm8ndyg9d9b569jmg6qa9b2iqf78y"; depends=[Rcpp]; };
-  RItools = derive2 { name="RItools"; version="0.1-16.1"; sha256="1s3nv9fwr235czc744sisrkhlz2l4k4vwxb165gl12yar52qb6sm"; depends=[abind SparseM survival svd xtable]; };
+  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]; };
   RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.2"; sha256="0zid1573iv25zsa93ni9r6zhbli9ymc84yvlcxnkg1j1q3vih3jm"; 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]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; };
-  RKEEL = derive2 { name="RKEEL"; version="1.2.7"; sha256="13i753gadi9511kpfv8zb0zsgj43cy5pd47yw29nsz1jdzaafgsa"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
+  RKEEL = derive2 { name="RKEEL"; version="1.3.1"; sha256="0k13j460jalmjdicrm7rqxb1b25cx1h4c276xbiybmhrmzmjlv5y"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
   RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; };
   RKEELjars = derive2 { name="RKEELjars"; version="1.0.19"; sha256="1a879b0xq5jk7r2pf4n41nm0c4himl4yqw083xh2ha4qdhab5kq0"; depends=[downloader]; };
+  RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; };
   RKUM = derive2 { name="RKUM"; version="0.1.1"; sha256="1w0v6l61dm7xixnyywsc7xziixz7k9r1ja26zcy77nry5kn6v60q"; depends=[]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
   RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
@@ -3262,7 +3305,6 @@ in with self; {
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
   RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; };
   RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; };
-  RMCriteria = derive2 { name="RMCriteria"; version="0.2.0"; sha256="1bdlvb86zqjjpfd6ixjzf9c7r8h6nmzwf646274c76a59523izxk"; depends=[dplyr ggnetwork ggplot2 gridExtra linprog lpSolve network pastecs Rcpp RcppEigen RcppNumerical]; };
   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]; };
@@ -3271,11 +3313,13 @@ 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.6"; sha256="19pjxgz9h3bb89ra6ha6mbnzyz1sagmm82qd57y0rbrsvwn0pk2i"; depends=[BH bit64 DBI hms plogr Rcpp]; };
   RMark = derive2 { name="RMark"; version="2.2.6"; sha256="0ihidwk7fbjjh6qmrd3rjmk2yjrjdf7a53sdnh6ynkjkzlqb2gr7"; 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]; };
+  RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.0"; sha256="09s1qpism2a9ixkza53jiny9k5ysyq8vq3hvcc23nmnjncaanar2"; depends=[BH doParallel foreach Rcpp RcppEigen]; };
   RMySQL = derive2 { name="RMySQL"; version="0.10.17"; sha256="1xamf99ih44dvaxg5x4ivj0hkqssmabgqd7gh8b8q1srw7yg8kbm"; 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]; };
@@ -3292,8 +3336,8 @@ in with self; {
   RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; };
   RNetCDF = derive2 { name="RNetCDF"; version="1.9-1"; sha256="0idfskxb1k8x0zzl6b0kgskdxn7zr49gw9xcj870ah9zp93iwnkx"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; };
-  RNewsflow = derive2 { name="RNewsflow"; version="1.1.0"; sha256="15dq5xmci20il4xgbsjcgx1x9l443x6cizvzfzr1w66ab7aa4jxz"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales slam stringi tm wordcloud]; };
-  RNifti = derive2 { name="RNifti"; version="0.11.0"; sha256="0zs8ffa6gpi9cygxk7xjin6k3vpvfgb540a506zlk50bf6kc5nlf"; depends=[Rcpp]; };
+  RNewsflow = derive2 { name="RNewsflow"; version="1.1.1"; sha256="1vigzkyh8p6x4hzrmcsbvv2jk3pz39kix6b12xzzllkvi1kq784q"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales slam stringi tm wordcloud]; };
+  RNifti = derive2 { name="RNifti"; version="0.11.1"; sha256="0jcgdg5k2swmi57aqj347kfi1fc4nvag7pxdfz61kc0vqqamm0wg"; depends=[Rcpp]; };
   RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.6"; sha256="0a1f2nzlw1w9hd8kdiqal1kz8jabc5wvc5l9w5z1pjfgsry4jy75"; depends=[ore Rcpp RcppEigen RNifti]; };
   ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
   ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; };
@@ -3330,6 +3374,7 @@ in with self; {
   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]; };
   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]; };
@@ -3341,6 +3386,7 @@ in with self; {
   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]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
+  RPEIF = derive2 { name="RPEIF"; version="1.0"; sha256="13psw9sjpqq55vqf09ja4xkhpb6mp9zpzbka40v2gzxr503n69rq"; depends=[ggplot2 PerformanceAnalytics Rcpp RcppArmadillo RobStatTM 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-2"; sha256="1hyqhyn8g43cpdvh3iyrf12dbyafp6gv64hb53hr0h1094hrvz81"; depends=[]; };
@@ -3355,13 +3401,14 @@ in with self; {
   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.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; };
+  RPushbullet = derive2 { name="RPushbullet"; version="0.3.2"; sha256="0bky2qy4pvxak8wkly6ldckx2gvirvxw2mfbig3vcgabs9l4g6pq"; 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.9"; sha256="1pirjgnf7yzddkidk1d0gbp6f1wlag6f1bzh1rmvm6c5zkww69nl"; depends=[Rcpp zoo]; };
-  RRF = derive2 { name="RRF"; version="1.9"; sha256="1j8s07h0bn8imi0g1lkdwismisd6m4v454nldjp5jl11lffyiiaq"; depends=[]; };
+  RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; };
+  RRI = derive2 { name="RRI"; version="1.0"; sha256="163imfrhx435fxw39pi4vj1fmk6g6cldlsgmwcpgfqmp45ycclpj"; depends=[Rcpp RcppArmadillo]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
   RRPP = derive2 { name="RRPP"; version="0.4.2"; sha256="1x1vrnqsd8ab70pj63vlpiwf8c76xriggb87j7p6c7yj96syp911"; depends=[]; };
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
@@ -3378,13 +3425,13 @@ in with self; {
   RSDA = derive2 { name="RSDA"; version="2.0.8"; sha256="1lnqncjmqci6lbdm2pph6ankwb9vhwi7mvgjip2qvc2ydgyv6gy9"; depends=[abind dplyr FactoMineR ggplot2 ggpolypath glmnet lazyeval nloptr pander princurve purrr randomcoloR reshape RJSONIO rlang scales scatterplot3d sqldf stringr tibble tidyr tidyselect XML xtable]; };
   RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; };
   RSEIS = derive2 { name="RSEIS"; version="3.8-3"; sha256="1qrv41r17svz7dyzz1sik5zyqck29mzzxrjhj5q6mvrwag3x7fi5"; depends=[RPMG Rwave]; };
-  RSGHB = derive2 { name="RSGHB"; version="1.2.1"; sha256="07iz1i04069vdns73zn0qna7lxmc3zlpmxwvxmajwbirs9db6lc3"; depends=[MCMCpack]; };
+  RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; };
   RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; };
   RSKC = derive2 { name="RSKC"; version="2.4.2"; sha256="0r9gpwhzscb6rbba3dg13p78pvskahgvsd59biag0shyii3xvwpm"; depends=[flexclust]; };
   RSNNS = derive2 { name="RSNNS"; version="0.4-11"; sha256="0z27rgbqa1lsxvcqyl1456mb0pigvkrx099hdqv7zr4ax4k33547"; depends=[Rcpp]; };
   RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
-  RSQLite = derive2 { name="RSQLite"; version="2.1.1"; sha256="1giwk4335sc6yhj3rs8h070g1mwy38kyqyqv6vcfxvskykj7vp6z"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
+  RSQLite = derive2 { name="RSQLite"; version="2.1.2"; sha256="1inrhap5cs0wry2jbw42fx9wwxb3qdzlpy0ba4f6a29bs8jx9nk6"; 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]; };
@@ -3402,7 +3449,7 @@ in with self; {
   RSpectra = derive2 { name="RSpectra"; version="0.15-0"; sha256="1ab975scdqaxdna9sayjl6l14hz991y0pc8c8ah48w000616km8s"; depends=[Matrix Rcpp RcppEigen]; };
   RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
   RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; };
-  RStoolbox = derive2 { name="RStoolbox"; version="0.2.4"; sha256="1lj3jlmlg1cffkpi0x5mjl0ypppjxcsl5zamxvld9ng8m2pgkbm7"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
+  RStoolbox = derive2 { name="RStoolbox"; version="0.2.6"; sha256="1pq0vxq53x8f0358qfq1rakb59cdfi4micp7hjb9fbz95q9am8mj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
   RStorm = derive2 { name="RStorm"; version="1.0"; sha256="1n2kiy9b8w6rnv2zmzbl22grwibf619hadf2cjq1ch7rmbr7qb65"; depends=[plyr]; };
   RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; };
   RSuite = derive2 { name="RSuite"; version="0.37-253"; sha256="18ddhv5wbwp9qx33zskf11q8c9grdyvm93y8lxd5jy245x5hgzph"; depends=[devtools git2r httr jsonlite logging processx roxygen2]; };
@@ -3422,7 +3469,7 @@ in with self; {
   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]; };
   RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
-  RVenn = derive2 { name="RVenn"; version="1.0.0"; sha256="1nk1s8zj7f8zhxp5xfa5a3drq06vqds8i0vcr04iw0s2n9qvhrwg"; depends=[ggforce ggplot2 magrittr purrr rlang]; };
+  RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; };
   RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
   RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.8"; sha256="0lh23g8zyd50p6hnl4dfmzrsg48y74g2h7dism9j2n1pfd9p9k5d"; depends=[]; };
   RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.13"; sha256="106lr6iz28gscczs18759zaki7dnxy1873swiakimfqmwpw9dp9n"; depends=[Rcpp]; };
@@ -3441,9 +3488,10 @@ in with self; {
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
-  RZigZag = derive2 { name="RZigZag"; version="0.1.6"; sha256="1sb1lmm5vnzkbzqxbmipkm2zb01zg2x15jgyrsplardyy8kpqxn7"; depends=[Rcpp RcppEigen]; };
+  RZigZag = derive2 { name="RZigZag"; version="0.2.1"; sha256="1civ8qrk5y95775vzkd2m5arqczgan584r632ixy4q76nd5wa8zc"; depends=[Rcpp RcppEigen]; };
   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-4"; sha256="0zaswmig1fmxdsfij5hl58z2q5iw15p9w5yd9i03rdyn3gnkka4g"; depends=[]; };
   RaceID = derive2 { name="RaceID"; version="0.1.3"; sha256="1kmhjqhm6v4blwnll67b79ywrpsiygipz30nylxfi0030p37bld2"; depends=[cluster coop FateID fpc ica igraph irlba locfit MASS Matrix pheatmap quadprog randomForest RColorBrewer Rtsne 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]; };
@@ -3472,14 +3520,14 @@ in with self; {
   RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; };
   RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; };
   RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; };
-  Rbeast = derive2 { name="Rbeast"; version="0.1"; sha256="08yzf6hny95vkhjdf9z73i23zmsxvbfshw2wpbzakp8pq2s0sb7v"; depends=[]; };
+  Rbeast = derive2 { name="Rbeast"; version="0.2.1"; sha256="03m7461j816sgdr3xvv6llyblmkcnhfxsrfiraqslg197xjbj978"; depends=[]; };
   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.0"; sha256="187w7pfx4f7gly1isfs5cr3m6cxzr5ml25x3775xwm3xjjsh7ylg"; depends=[RCurl xts]; };
   Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; };
   Rborist = derive2 { name="Rborist"; version="0.1-17"; sha256="0vsld7qr9zl9a6fj1vwdh6avdh23vkibyng6j8q0kd3za0dibcl0"; depends=[data_table Rcpp]; };
-  Rcan = derive2 { name="Rcan"; version="1.3.71"; sha256="14xfwd99z12ryn4c8pa690c3q64nsi00fl076lpbzpilh64azjnb"; depends=[data_table ggplot2 scales]; };
+  Rcan = derive2 { name="Rcan"; version="1.3.72"; sha256="1c2a0p6nc040irgmg50bw0w43ad55flrni8k37avpns1m9k309h1"; depends=[data_table ggplot2 scales]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
   Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
@@ -3511,7 +3559,7 @@ in with self; {
   RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
   RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
   RcmdrPlugin_RiskDemo = derive2 { name="RcmdrPlugin.RiskDemo"; version="2.0"; sha256="1mclhcb138f13p7ghiggdm8zjrgxqrn3zn8biygfy6yvhw2j396p"; depends=[demography ftsa Rcmdr rgl]; };
-  RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1.1"; sha256="0lky4vmia97vcpwsvzprgmkwkdwjwnmi8bdjx3r3w6rrc2lqb6a8"; depends=[Rcmdr SCMA SCRT SCVA]; };
+  RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.2.0"; sha256="1yg2b5vcnf956w04phxg15a4my9hvkbc27nzyn30b2wn47ysxghj"; depends=[Rcmdr SCMA SCRT SCVA]; };
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
   RcmdrPlugin_TeachStat = derive2 { name="RcmdrPlugin.TeachStat"; version="1.0.10"; sha256="0kbbvwjyfmd14d2nxiyin934vz3n3fgbp04bb8hxpcff3sp3wbxk"; depends=[Hmisc randtests Rcmdr tcltk2 tseries]; };
   RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
@@ -3533,14 +3581,14 @@ in with self; {
   RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.10"; sha256="02rs5xdj6g57frndc87fly0ans16584j4d0rfpy1h72655cz66ab"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="1.0.1"; sha256="015rmxns8mhmnd9wnz9bmma4iwx2sf4bcwkkp9hcgvdmblzf0vg7"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="1.0.2"; sha256="170jlmjrs92z5qdv58badhxycjvfjpqwwpic7rm13pc9zkb3i4xd"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.5"; sha256="0188sabgfmgh83yr3hmqpg5cmhllfkxzbxxchqr2r2fmj6x0ib1a"; depends=[Rcpp]; };
-  RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.3"; sha256="0kjijcl5gkdqqf5smxcai53x9zk0praf942gllc8xj0ymjyah4z4"; depends=[gmp Rcpp RcppThread]; };
+  RcppAlgos = derive2 { name="RcppAlgos"; version="2.3.4"; sha256="1rmadfvavjn17xs0fs93h2dahil5nqg0w59f4zdsnn193cwcfi7p"; depends=[gmp Rcpp RcppThread]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.12"; sha256="1b0fmip9c4i0my1yjrvqy8jxfiiqcggq2kms135q0b53njxnqwwg"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.500.2.0"; sha256="1lyvpb7n54ijlqns29qiixqr39334knf67cnixvlic58945glrhv"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.600.4.0"; sha256="07jg2667xyhmp1fbcdi5nnhmkk81da76s9rlswfq4k2sjsmbfmr0"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
-  RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.5"; sha256="03r7qfhxmn20925yjvqs5cbm255yk4kbrvw16dl2r98argblcmmk"; depends=[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]; };
@@ -3548,7 +3596,7 @@ in with self; {
   RcppDE = derive2 { name="RcppDE"; version="0.1.6"; sha256="1i9jj595nqpb16y22z2b8fcf0gq1fg0pbiisbd837p1cyw4nff69"; depends=[Rcpp RcppArmadillo]; };
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
   RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; };
-  RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.2"; sha256="0bp2ml70wclvqm39vylawwwd8jz245cxzkv97j6wlvni16g8yprn"; depends=[Rcpp RcppArmadillo wrapr]; };
+  RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; };
   RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.5.0"; sha256="01bz41c29591ybzqn4z88ss036ai3anh9figryvmfpqcfwbszip5"; depends=[Matrix Rcpp]; };
   RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; };
   RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.1.15.0.1"; sha256="01jx7vkfj1fa2b6lwjvhjf0a78zsi5hb4viqsfrka0sg385vlark"; depends=[Rcpp RcppArmadillo]; };
@@ -3559,6 +3607,7 @@ in with self; {
   RcppGreedySetCover = derive2 { name="RcppGreedySetCover"; version="0.1.0"; sha256="1v84i9gsmvpkmgd4niqnzp58nhrgn2j4rggsrnlh391ikdfrl51x"; depends=[BH data_table Rcpp]; };
   RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; };
   RcppHNSW = derive2 { name="RcppHNSW"; version="0.1.0"; sha256="158a069n42pbnjrlmvqsr6bm2cfp9hxpnk3nhp3dwi9qjlq4r9bm"; depends=[Rcpp]; };
+  RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; };
   RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; };
   RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; };
   RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; };
@@ -3575,7 +3624,7 @@ in with self; {
   RcppTOML = derive2 { name="RcppTOML"; version="0.1.6"; sha256="1nyv4ynryh8vcrzyq01nzj13is40bjhxazlj9ilapyjdv9h5w3bs"; depends=[Rcpp]; };
   RcppThread = derive2 { name="RcppThread"; version="0.5.3"; sha256="1ndidhzzwxcg01kl867a1mm64zgxf4hiaf858zr7dfkr3gzdd3lp"; depends=[]; };
   RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.1"; sha256="0jh64c46gp99d2nsih14vx34pamc8i7gkmiy2nj94rx3sxq62yh5"; depends=[Rcpp]; };
-  RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.3"; sha256="15c7lbgg0n7jsbpzf808yz272ncpscncmrdrgaq7cnxhl9i9yhgi"; depends=[Rcpp]; };
+  RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.4"; sha256="171281f8lbdnnv3q9x5c35ak8fkrymx7llnpv88dlh742z8nny1j"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
   RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; };
   Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; };
@@ -3600,7 +3649,7 @@ in with self; {
   ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; };
   RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
-  Recon = derive2 { name="Recon"; version="0.1.0.0"; sha256="153963p75vnaikp55khr1qnhvhhpzs82hc8fyrpcglpbmymq27v7"; depends=[rootSolve]; };
+  Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; };
   RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11.1"; sha256="1b5bw87h2lrf5vkd2ni75rz3dj4vjls28wys5g39aajsn55ql10k"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.1.5"; sha256="1b6pp1vdn7jnyl8k828dgkxrx8sy2wyhkrn4rnfavqw4qvhm0mhm"; depends=[dplyr igraph magrittr RJSONIO rlang visNetwork]; };
@@ -3620,20 +3669,20 @@ in with self; {
   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]; };
-  Renvlp = derive2 { name="Renvlp"; version="2.6.5"; sha256="0yw9c5115q4vism33avgak3b63pb77x9mvk2m8gfzdkphd2v3ndv"; depends=[Rsolnp]; };
+  Renvlp = derive2 { name="Renvlp"; version="2.7"; sha256="1h65m1av2z5zj5mmhrf0vspnbws2dp6s6ihyrvcrm24ipcnkvinz"; depends=[Rsolnp]; };
   ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
   Replicate = derive2 { name="Replicate"; version="1.1.0"; sha256="1iqzg7aspd2h0mc4w059nfz7hcxgbbl15389isrr63zfm0kcsbf6"; depends=[metafor]; };
-  Replication = derive2 { name="Replication"; version="0.1.0"; sha256="0qykpc0lr18wis0xgn16y4a99n7plwl07dlc6knmqdp27193fry5"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; };
-  Repliscope = derive2 { name="Repliscope"; version="1.0.1"; sha256="10713c7z84l8n7bmckybgvanzxmrckbk040ss7hbwsjk8xyy0s60"; depends=[colourpicker ggplot2 shiny]; };
+  Replication = derive2 { name="Replication"; version="0.1.1"; sha256="1jf08kd7zwsgrabg14p0ad5ga8gcr2xdiy5mgljb9hz4ffyhb6fs"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; };
+  Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; };
   RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; };
-  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-4"; sha256="0892p714ddx2ffxg7n81599l0qm1dhfd3vm38ivxiiii8ws4nr5v"; depends=[MASS Matrix pbapply]; };
+  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; };
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.9.4"; sha256="08czcm7sd6p47hwffbmjcza8nhcs3xmszp404nnllyq4vc796xc0"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
-  Rfast2 = derive2 { name="Rfast2"; version="0.0.2"; sha256="026gp22z8bhq422qjvzj7idkaxkwvkdmlmxxraaknfvi47sjz0fd"; depends=[Rcpp RcppArmadillo Rfast]; };
+  Rfast = derive2 { name="Rfast"; version="1.9.5"; sha256="003ghzhq9jnxqdmz3fjn3r32s40lspxrsc5n004n1py1kra0fxmx"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast2 = derive2 { name="Rfast2"; version="0.0.3"; sha256="0kl4kvj30y4ns7yvdwyhyjpznsswaq1jlb9fmvp8kdwp5ii6y9ra"; depends=[Rcpp RcppArmadillo Rfast]; };
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; };
   Rfssa = derive2 { name="Rfssa"; version="0.0.1"; sha256="0d1lpc57msw57i78d1hcjphxlci7rsvfn6mzfkh18x3dw90md9gv"; depends=[fda lattice plot3D Rcpp RcppArmadillo]; };
@@ -3643,7 +3692,6 @@ in with self; {
   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.3"; sha256="06ab3lg1rwm93hkshf1vxfm8mlxq5qsjan0wx43lhnrysay65js4"; depends=[png]; };
-  Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; };
   Rhpc = derive2 { name="Rhpc"; version="0.18-204"; sha256="0ja2cx6sa8ihxnq96qhxfp43z5zd45b8jfb0y2rzzklnd7kj9kl1"; depends=[]; };
   RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-205"; sha256="1ls2286fvrp1g7p8v4l6axznychh3qndranfpzqz806cm9ml1cdp"; depends=[]; };
   Ricetl = derive2 { name="Ricetl"; version="0.2.5.1"; sha256="1d7229ylnxgh2rvarwga229378ja79l978zjabf3sph4cqc1b965"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; };
@@ -3664,7 +3712,7 @@ in with self; {
   RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-  Rlabkey = derive2 { name="Rlabkey"; version="2.3.0"; sha256="0n9cp9fnccvqsmjqa5m7dvkkzg32i6jjsbhgh30n50psmyfwc8wl"; depends=[httr jsonlite Rcpp]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.3.1"; sha256="0m5v8wf6a1pipp0xi0ajxfk0fyslbmdx3698z439g4i5hbrg0i3r"; depends=[httr jsonlite Rcpp]; };
   Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; };
@@ -3678,12 +3726,12 @@ in with self; {
   Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
   Rmixmod = derive2 { name="Rmixmod"; version="2.1.2.2"; sha256="1kfhaj47igcjs3h22slk8jywq85kbm5rnj4c1jhrp03hyzy2vg0v"; depends=[Rcpp RcppEigen]; };
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
-  Rmosek = derive2 { name="Rmosek"; version="1.3.4"; sha256="19y7l2nch7ahb4j8hcf84ampm7jxipqim47g68v0c6hj81m7r9s2"; depends=[]; };
+  Rmosek = derive2 { name="Rmosek"; version="1.3.5"; sha256="18q39n2p3gms9zqrl8g15rjjk4v64365v0rm8r7zvvivh1hy5xa0"; depends=[]; };
   Rmpfr = derive2 { name="Rmpfr"; version="0.7-2"; sha256="1zq3as34r27v2yc729731997wdhxb6cs5ilmak4nmsljabnac7gc"; depends=[gmp]; };
   Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; };
   RndTexExams = derive2 { name="RndTexExams"; version="1.5"; sha256="17azzxcawqqvfdbw1i34n03bj5yla8npyi7xh3pnx22xb7sbwq3x"; depends=[data_table stringi stringr]; };
-  Rnets = derive2 { name="Rnets"; version="1.0.2"; sha256="1mym5zd7717mq6dlnv9b3qry7cfa5ylp3h596dbnnq5b1rhbbfis"; depends=[data_table glasso igraph rlang stringr]; };
+  Rnets = derive2 { name="Rnets"; version="1.2.1"; sha256="08441hhmf1i97z5xb9pq651y6hwr2yraiyg1ns7qkxm2svz3kwxs"; depends=[data_table glasso ICSNP igraph rlang stringr]; };
   Rnightlights = derive2 { name="Rnightlights"; version="0.2.3"; sha256="014bw1xln699y0zjaf5xifc2f3yl9zgb0acv7v1qw0q478ka9aak"; depends=[cleangeo data_table doSNOW dplyr ff ffbase foreach lubridate R_utils raster readr reshape2 rgdal rgeos rvest rworldmap settings snow sp stringr xml2]; };
   Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.4"; sha256="0n2nqxn3js3avnln9y5718r73rplr0mcyak70gwhzw4mph2z6i26"; 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]; };
@@ -3698,7 +3746,7 @@ in with self; {
   RobStatTM = derive2 { name="RobStatTM"; version="1.0.0"; sha256="00c79qmq9r9vqwzzv0ijzpkz9ns33xlysml62b3y4lcfz15scbx9"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robust robustbase rrcov shiny shinyjs xts]; };
   RobinHood = derive2 { name="RobinHood"; version="1.0.7"; sha256="0zvibrkqs5awyshs4r61fxbsx4h81vsslma1c6a7r85255jq9vs3"; depends=[curl dplyr httr jsonlite lubridate magrittr profvis]; };
   Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
-  RobustAFT = derive2 { name="RobustAFT"; version="1.4-3"; sha256="0x7sn2y9s6nwzlj8476irv893crwag6v4k7w3w589k33kkz5n2hp"; depends=[robustbase survival]; };
+  RobustAFT = derive2 { name="RobustAFT"; version="1.4-4"; sha256="17qjfpagz0wpl8hbyksnag51nj6b9arl9mk5a56avykd2nii95kd"; depends=[robustbase survival]; };
   RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; };
   RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.7"; sha256="1zjil79a5zwi51bsrifplj2yyxpqg4v9471bsclwzyzll24c46vk"; depends=[nloptr Rcpp RcppEigen]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
@@ -3706,7 +3754,7 @@ in with self; {
   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]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
-  RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; };
+  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=[]; };
@@ -3725,6 +3773,7 @@ in with self; {
   Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; };
   Rraven = derive2 { name="Rraven"; version="1.0.6"; sha256="01yhmanf9hixv0pm5zw219b0hrazqcnxr5bkxm2bxpn7fz0hm8zr"; depends=[NatureSounds pbapply seewave tuneR warbleR]; };
   Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; };
+  Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.1"; sha256="15lk35kb69q55z7mjv4ar5nkfn6nkah802272jp9wvf5r5zlw5zp"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr XML]; };
   Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; };
   Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; };
   Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; };
@@ -3757,7 +3806,7 @@ in with self; {
   Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; };
   RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; };
-  RxODE = derive2 { name="RxODE"; version="0.9.0-8"; sha256="0cwh5glxbiy63zq1i5yqmrv3pjb0p5yqanx46c4njghd1xgjhnq7"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast n1qn1 pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; };
+  RxODE = derive2 { name="RxODE"; version="0.9.1-2"; sha256="1bb8pyna64nr2383b8dn4scgyhd3pkszh87gz92g89kirc7v50c5"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast n1qn1 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="0.4.1"; sha256="1gd8zmrj98r4qsnlmn3qd2pldjk5dhj3f0ybn1dijwy192g1w3vd"; depends=[Rcpp settings xml2]; };
@@ -3766,11 +3815,11 @@ in with self; {
   SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
   SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; };
   SADISA = derive2 { name="SADISA"; version="1.1"; sha256="00qixqbbkpc8g8nmggvrknsc03v9w04nb4dlcq91fs7g76rpzs92"; depends=[DDD pracma]; };
-  SAFD = derive2 { name="SAFD"; version="2.0"; sha256="1ing0zkhl7f9pdcddivp3ii2siaxrrh0al7cdh1r92r4b93kfr70"; depends=[]; };
+  SAFD = derive2 { name="SAFD"; version="2.1"; sha256="078ki9wrmcf80bwhx4d56gas79xrc17a0081i13yxvjqn6w7f7jd"; depends=[]; };
   SAGMM = derive2 { name="SAGMM"; version="0.2.4"; sha256="18ig7ncmrfs5cyc28xpbqk9zjhwqfp7gwix7y2v1j4j2wbdc2hzs"; depends=[lowmemtkmeans mclust MixSim Rcpp RcppArmadillo]; };
   SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; };
   SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; };
-  SAM = derive2 { name="SAM"; version="1.1.2"; sha256="0ywl66z9q3ra70cczz3zjxanfcb707csik765zsi1zhxhn5m1hyb"; depends=[Rcpp RcppEigen]; };
+  SAM = derive2 { name="SAM"; version="1.1.2.1"; sha256="01gj9k1gf35vm11p0p590irqc5daaiwmq05rl2v3n8h2azaz1c7l"; depends=[Rcpp RcppEigen]; };
   SAMCpack = derive2 { name="SAMCpack"; version="0.1.1"; sha256="1nnrfc74hd39vnb94lxwfjksmjaz62x0alc2ga46gqyygrrg57g5"; depends=[Rcpp RcppArmadillo RcppXPtrUtils Rdpack]; };
   SAMM = derive2 { name="SAMM"; version="1.1.1"; sha256="175jk3s9w68ccw1h019380lp9cajfsy3zigcnplp87pcn3qg7x2i"; depends=[Rcpp RcppArmadillo]; };
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
@@ -3799,15 +3848,15 @@ in with self; {
   SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
   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.1.0"; sha256="1j3qnjyg9igdmqh22azzibb33lhlqcmx4d5mbawns7168azrw9h9"; depends=[gplots MASS]; };
-  SCMA = derive2 { name="SCMA"; version="1.2.1"; sha256="17hn3axhmd6wchh1zmgrj026y5yhg6w68d1mif38rrf5cb2wwjnq"; depends=[]; };
+  SCINA = derive2 { name="SCINA"; version="1.2.0"; sha256="1gv9widjwvk5j535r1zx6f41ylpa2r4168ya580llgblx85z402d"; depends=[gplots MASS]; };
+  SCMA = derive2 { name="SCMA"; version="1.3.0"; sha256="0izpbvgimqyj529nzng94p0cvmz9l545b3ra4ycc23rsbg50q315"; depends=[]; };
   SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
   SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.3"; sha256="0ppxqb6lxxb9m9m89j52d49i873kilyscdnyalrkpky1b1xh22x0"; depends=[dplyr dyndimred dynutils ggplot2 MASS Matrix mclust pbapply pheatmap princurve purrr ranger RColorBrewer reshape2 tidyr TSP]; };
   SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; };
   SCRABBLE = derive2 { name="SCRABBLE"; version="0.0.1"; sha256="15k8fqcyvbqminqf41n9wx3xm7bg8v47g5vaf65aclj5wn2gn5y2"; depends=[ggplot2 gridExtra pracma rARPACK RColorBrewer Rcpp RcppEigen reshape2]; };
   SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; };
-  SCRT = derive2 { name="SCRT"; version="1.2.2"; sha256="1x6bzcgb5blavj4zdw4jam5r8yad3plyfzk31vz9pjv39784k229"; depends=[]; };
-  SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; };
+  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]; };
   SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; };
   SDALGCP = derive2 { name="SDALGCP"; version="0.2.0"; sha256="04yqa0dlr4p6fpc4dsiqwb02j056fz9j8qwf7939b5hpg8k9qwjg"; depends=[geoR maptools mapview Matrix pdist plyr PrevMap progress raster sp spacetime spatstat splancs]; };
   SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
@@ -3815,12 +3864,13 @@ 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.1"; sha256="1fsgnlc7glawimzijp11j53g5bnfp1mdq9wb0754idmxcdi8a99q"; depends=[R_utils]; };
-  SDMtune = derive2 { name="SDMtune"; version="0.1.0"; sha256="1x83qh9gzfq9lfysv7brzhj32y9bk3fb0i12kdb6gw8ac3ynz6jy"; depends=[cli crayon dismo ggplot2 htmltools jsonlite kableExtra maxnet progress raster rasterVis Rcpp reshape2 rgdal rJava rstudioapi scales stringr whisker]; };
+  SDMtune = derive2 { name="SDMtune"; version="0.1.1"; sha256="03a09k43wi9dsr3pxbwwvcg7zsc37ls6krdcqgsk0nrkqzyd9a97"; depends=[cli crayon dismo ggplot2 htmltools jsonlite kableExtra maxnet progress 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]; };
   SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; };
   SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
+  SECFISH = derive2 { name="SECFISH"; version="0.1.4"; sha256="0bzm15k3rpyfa35gwpb6041cyfhnxfc4x08aryiy50j6xwcaif7n"; 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]; };
@@ -3838,6 +3888,7 @@ in with self; {
   SGL = derive2 { name="SGL"; version="1.2"; sha256="13lpziwkxw2qj4496lvh76d59nfnmrd371jbgz78dhy8dpzyd7c3"; 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]; };
+  SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.1"; sha256="0lkd63k5npvdv35kw6q8smfb0afjgliy0pxx5285vh3dqp5d287y"; depends=[data_table ggExtra ggforce ggplot2 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]; };
@@ -3926,14 +3977,14 @@ in with self; {
   SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQRL = derive2 { name="SQRL"; version="0.6.2"; sha256="1hdbqifc8gmgp5g3ffng83dpd62qfygcahbl55xfl185l2fzqrvm"; depends=[RODBC]; };
+  SQRL = derive2 { name="SQRL"; version="0.6.3"; sha256="006ahmqrwy2ckq098klvajwfzdmnx58pw0hy1plpw4slp7a3f2ls"; depends=[RODBC]; };
   SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
-  SRTtools = derive2 { name="SRTtools"; version="1.0.0"; sha256="0kxsmmxm5x7qv98kx0rmihv0qps5w7j1mlxickx9mz1vk6jdmgjf"; depends=[magrittr]; };
+  SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; };
   SSBtools = derive2 { name="SSBtools"; version="0.4.0"; sha256="0rmvqhhw5zv8za3h8m59sqz0857hryn6c1bpsl4bdnyjzjfqa675"; 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.6"; sha256="1fpsj2rvqdy65ccy9hbw5k7pdaysxy2kjac2dsl2js4ah3pjfdrb"; depends=[MAd MASS metafor psych TSA TTR]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.5.7"; sha256="0j6a7imd9q2s1szvazs1rcbs1sbhxh399wab845ilxxz12krd0zb"; depends=[MAd MASS metafor psych TSA TTR]; };
   SSLASSO = derive2 { name="SSLASSO"; version="1.2-1"; sha256="0x9nbq9lsnq9g47y50z2ymfbj09l2d1lbii2cfjm76nzk3k5lb39"; depends=[]; };
   SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; };
   SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
@@ -3964,6 +4015,7 @@ in with self; {
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SVN = derive2 { name="SVN"; version="1.0"; sha256="0v0nyph5llvv3k1zn1ak4kvk6mqb0xd5iamqc1xlcdzamx8rjaib"; 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]; };
   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]; };
   SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; };
   SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; };
@@ -4004,11 +4056,11 @@ in with self; {
   Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
   SelectBoost = derive2 { name="SelectBoost"; version="1.4.0"; sha256="14i6dgg1yqnghjjfvi7l58kqm6pry9b91sy9gkwrvfqg0nz1dpny"; depends=[Cascade glmnet igraph lars msgps Rfast]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemNetCleaner = derive2 { name="SemNetCleaner"; version="0.9.9"; sha256="1pbp1h3kqgrdwr28psbrnd8i67rbff8hyldry46511zjmc8c7zaq"; depends=[qdap]; };
+  SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.0.0"; sha256="0bxc6i4qa81pqfcxvms55avnnys15iwibnawckvr900pn9mns50w"; depends=[searcher SemNetDictionaries stringdist]; };
   SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.2"; sha256="1swrccbdzqx8yv6z1kacd8zllsma94cg4vmrc08hz6fj93bya73j"; depends=[]; };
   Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; };
   SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; };
-  SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.5"; sha256="18ma6098zng3ckf082qhjl837g8ppn3gli8l8nfnxirg5ra8zflp"; depends=[MASS numDeriv Rsolnp]; };
+  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=[]; };
@@ -4036,7 +4088,7 @@ in with self; {
   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.2"; sha256="0lfnafkkwfhqv984mrbd13inck1sdzn7rq1qdklfjwks89dx9ql9"; depends=[ggplot2 lavaan stringr tidyr]; };
-  ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; };
+  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]; };
   SiZer = derive2 { name="SiZer"; version="0.1-5"; sha256="1ldl7rza58fzfbqidr1kanhfhy744nrsxrm13qdpxirdxx3vji6q"; depends=[boot]; };
@@ -4048,7 +4100,7 @@ in with self; {
   Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; };
   SimComp = derive2 { name="SimComp"; version="3.2"; sha256="04rmpxasaa888p6f0rhhpvpqc39fppdkcwbq5sxcslx7bwc9w9z8"; depends=[mratios multcomp mvtnorm]; };
   SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; };
-  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.6.0"; sha256="0x0wcc3nqw57xs7jiwc8bzmcwnb69dvpfp7anhx6bx607rcbxfpi"; depends=[evd]; };
+  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]; };
   SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; };
@@ -4066,7 +4118,7 @@ in with self; {
   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]; };
   SimVitD = derive2 { name="SimVitD"; version="0.1.1"; sha256="0xq9qi3vf1aggcwy2hn7q57zvis6ws1z4azvgp2xsndbn7rg9qda"; depends=[poisson]; };
-  SimilaR = derive2 { name="SimilaR"; version="1.0.5"; sha256="0r1nbgf44i9b901l147qx06lncn0x86ngrd9lxhnrk8jkcnkkyhd"; depends=[BH Rcpp stringi]; };
+  SimilaR = derive2 { name="SimilaR"; version="1.0.6"; sha256="1cdcpl8mhzx0yp9x1djpana6fh3wi75350xdjxrikhpx1pmfl8mi"; depends=[BH Rcpp stringi]; };
   SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; };
   Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; };
   SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
@@ -4087,14 +4139,14 @@ 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.3.0"; sha256="1cy5vbsb7a62hf8rarq5fmkqn23cf2jvsbl0hcwd68h37b8sparp"; depends=[Matrix SSBtools]; };
-  SmartEDA = derive2 { name="SmartEDA"; version="0.3.1"; sha256="09wgj3nyznspjf9bllfjx0l6rnalyxlzz45bx75cbiv5hwibasqf"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; };
+  SmartEDA = derive2 { name="SmartEDA"; version="0.3.2"; sha256="153bh9igdiq93ydibmfj9xklc5qj66zsakgkynk0apnczzzipn3y"; 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]; };
   Smisc = derive2 { name="Smisc"; version="0.3.9.1"; sha256="1dsgn37w690xh2r4mk3nwsbnaxjnw1a5qywihridvybf58nqgs06"; depends=[doParallel plyr]; };
   SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
   SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; };
-  SmoothWin = derive2 { name="SmoothWin"; version="2.0.0"; sha256="1mkmrh9f08sgvx4zvca2q09lrwvy24bcgi72bhy1dzdc4fbpg2s5"; depends=[nlme]; };
+  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=[]; };
@@ -4128,6 +4180,7 @@ in with self; {
   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.3"; sha256="02knqjc12ynjk7pnr7i0mcmksmn8q5pr43z6pp02qmmm018yy4rq"; depends=[]; };
+  SparseBiplots = derive2 { name="SparseBiplots"; version="3.5.0"; sha256="00ynx0cr543zyx9b633cbdalza9wmfgbvvgvr8b6s5r71lpjii8f"; depends=[sparsepca]; };
   SparseDC = derive2 { name="SparseDC"; version="0.1.17"; sha256="0gsfj8631s67a0r9qjjll4rbb57nzk5fwm5bbggvf0027b9hk0pp"; depends=[]; };
   SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
   SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
@@ -4139,28 +4192,28 @@ in with self; {
   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]; };
-  SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; };
+  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"; sha256="1y0h1pcfqp9ynxsr3yrfbihlwm25ypyb88jmm5k2g7xvm8h9g050"; depends=[fields maps]; };
+  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]; };
   SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-3"; sha256="1azymigqychsydqvy2n5fplv971i1gzxfhfnclm5r5rqh0xcdp3k"; depends=[]; };
-  SpatialPack = derive2 { name="SpatialPack"; version="0.3"; sha256="12mx62drwqx351x4jfvv87rxr28ggz7iw83firkzr5xwfwfgr02c"; depends=[]; };
+  SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.0"; sha256="00z1kbkd7as4xnzqnizaap9qga4vakx7swyayli26ghp11krgfwr"; depends=[isoband lwgeom raster rgeos sf sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; };
   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.2.0"; sha256="0xl1431847a0wlawaxyb81xzp91q91s6ckkfs4bq4qxfwwcawvxd"; depends=[Rcpp RcppArmadillo]; };
+  Spbsampling = derive2 { name="Spbsampling"; version="1.3.0"; sha256="1jy3dbadn4aa4h7s020ydgs9pksf7h3p2q9laxaqm1ygia71n6l0"; 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.6"; sha256="19z4h7kwx0jl7nc3bqqny08k24kax2g4xi0f2z8bsn2gg073wddk"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; };
+  Spectrum = derive2 { name="Spectrum"; version="0.7"; sha256="1wkz7q1c67p25czna2s3n76gqhmcp9b3kv8i0npbrfvcahyqxwjb"; depends=[ClusterR diptest ggplot2 RColorBrewer Rfast Rtsne umap]; };
   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]; };
@@ -4199,8 +4252,8 @@ in with self; {
   StrainRanking = derive2 { name="StrainRanking"; version="1.2"; sha256="1r8avm9xajqmsy4x7pgh1yaffq7wl5i5kg75kdilydwmii6n19i0"; depends=[]; };
   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.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; };
-  StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.1.0"; sha256="153blc204hc1jdkbszvsk6799cqll7vjq6p8wp3vqpk5sf250y5b"; depends=[BART coin dplyr ggplot2 glmnet grf mvtnorm partykit ranger rpart survival survRM2 TH_data]; };
+  StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; };
+  StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.1.1"; sha256="08ym6b4hfirny2xqbxlk9klin4yb9xzfafgbrqs15jiqsg9svwzl"; depends=[dplyr 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]; };
   StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; };
@@ -4249,7 +4302,7 @@ in with self; {
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="3.1-45"; sha256="0zxh6z5pvpi0c4kvhgs2s1xvxx3z0pgg1xfh2vcwmvwsqbvampmr"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
+  TAM = derive2 { name="TAM"; version="3.2-24"; sha256="1m185pkz56w6shc49cm2jpc9gyks1bv7r5qpqhqnib6xbbkz01xz"; depends=[CDM Rcpp RcppArmadillo]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; };
   TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; };
@@ -4295,11 +4348,11 @@ in with self; {
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
   TOSTER = derive2 { name="TOSTER"; version="0.3.4"; sha256="1pxcvlw2nhh1sv0d662xc61rykf7kz7f4xjq3yrqf119gjcmps5s"; depends=[ggplot2 jmvcore R6]; };
   TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; };
-  TPD = derive2 { name="TPD"; version="1.0.0"; sha256="1fwj5l519mwsffm2pw2nbpm1mnlxkxzl53i7sqy810fccw47hgag"; depends=[ggplot2 gridExtra ks mvtnorm]; };
+  TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; };
   TPMplt = derive2 { name="TPMplt"; version="0.1.2"; sha256="1sq72b0n0bskd488z2cag6hz9p48xgkwvp43hfc2gzs5x6ca7pmn"; depends=[directlabels e1071 ggplot2 RColorBrewer rgl rowr VBTree]; };
-  TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
+  TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; };
   TR8 = derive2 { name="TR8"; version="0.9.20"; sha256="01xkjl269q1qlpm8cxpnb64czcv2xhrjjwp3brhxywx07za1q8lq"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; };
   TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; };
   TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; };
@@ -4312,13 +4365,16 @@ in with self; {
   TSDFGS = derive2 { name="TSDFGS"; version="1.0"; sha256="1wk1j0bzcapp2pknhiichh947xs6dpkrfr2h7s1vqyzb9a0yajif"; depends=[Rcpp RcppEigen]; };
   TSDT = derive2 { name="TSDT"; version="1.0.0"; sha256="0cscy8g6qab09lgzdpz9s85l7m7v5gnjf0n3h82730xzd50r4za7"; depends=[hash mlbench modeltools party rpart survival survRM2]; };
   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]; };
+  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]; };
   TSHRC = derive2 { name="TSHRC"; version="0.1-6"; sha256="13x5l0y0nh972p39s32dv8byds19g8265s2mphbrzz1v59aq0xk3"; depends=[]; };
   TSMCP = derive2 { name="TSMCP"; version="1.0"; sha256="1wzi6wzd8l5bkm0qc1mfvj067xywm208xl6r87a4svcn1ydr4vl4"; depends=[lars plus]; };
   TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; };
+  TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; };
   TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; };
   TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; };
   TSP = derive2 { name="TSP"; version="1.1-7"; sha256="0rxxhvqi55869dg2p82hzg5kvgcqf9h60cjcg00k3pv9aw4x07kb"; depends=[foreach]; };
@@ -4334,13 +4390,15 @@ in with self; {
   TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
   TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; };
   TSdbi = derive2 { name="TSdbi"; version="2017.4-1"; sha256="0vwx2wyls4byyp67q9bp1psxdq5jnlimwk2162khk6daaxs14aiv"; depends=[DBI tframe]; };
-  TSdist = derive2 { name="TSdist"; version="3.5"; sha256="1drql61vh0qwmcxxp07rfsz1bd7zqn1zqx5mh0zczshv91blm0bi"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
+  TSdist = derive2 { name="TSdist"; version="3.6"; sha256="13asbgak6p0zyfigz1j2paw7qm2l02186cgblixrcp6jj8q8mm0l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
   TSeriesMMA = derive2 { name="TSeriesMMA"; version="0.1.1"; sha256="0dkrz3m5lh872c0q9nw4h0p6g4j1j9fn92hz8xlifpsbsyzpz63b"; depends=[]; };
   TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
   TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; };
   TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
+  TSplotly = derive2 { name="TSplotly"; version="1.1.1"; sha256="0amy8lmxl4mid6f5jhd0mcaqwpr8smxj0wa5561md15ix4qnvwmi"; depends=[dcemriS4 forecast ggplot2 plotly prettydoc zoo]; };
   TSrepr = derive2 { name="TSrepr"; version="1.0.3"; sha256="1sbspq2pyyrc9zh2dx8nq3yv58rwziv2a2j1jfgkz8v9zqrsbhqf"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; };
   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.4"; sha256="0cc59f7zw5plyj35svh6vr3id0j8c8ywihz5ms9c1gpfiq101a9w"; depends=[bsts data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr viridis xts zoo]; };
   TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.4"; sha256="0r79qbmn4z9v4f4g737xs3mhc4dp6s6llkcz6c3hihwnq1vrvd7h"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape rkt tcltk2 zoo]; };
@@ -4376,9 +4434,9 @@ in with self; {
   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.1"; sha256="1l5hhr89n8yp62a5azdd2b828x48qmasspzmcrd20w5194n6jpcw"; depends=[viridisLite]; };
-  TestCor = derive2 { name="TestCor"; version="0.0.0.9"; sha256="0734lkpk2kx4lpbr8rqiwrzdxcy22v3515v2dn3cna4fhk85isxs"; depends=[MASS Rcpp]; };
+  TestCor = derive2 { name="TestCor"; version="0.0.1.0"; sha256="0jqx74khjw8d3gvw5kn3yqfps877043d9wa6ffb33b5x7nfnj4hj"; depends=[MASS Rcpp]; };
   TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; };
-  TestDimorph = derive2 { name="TestDimorph"; version="0.1.0"; sha256="18dfq7m7yv5kv1l0a2xjb5gd3bmmalfixsnjgi70bhi3lsma0wlx"; depends=[biotools plyr purrr reshape2 rowr]; };
+  TestDimorph = derive2 { name="TestDimorph"; version="0.2.0"; sha256="1ckcfr4il1bcjcwvri35wj1bps4nxy1s959n40mx41211khj0rz1"; depends=[caret corrplot dplyr klaR MASS mda plyr purrr reshape2 Rfast rlang rowr stringr 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.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; };
@@ -4405,7 +4463,6 @@ in with self; {
   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=[]; };
-  TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-8"; sha256="1yx4jyh3a5s4h8anvd6pc73fzzcfdll4kp89b2xi0i01yswx22pd"; depends=[DescTools mclust TeachingDemos]; };
   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=[]; };
@@ -4418,7 +4475,7 @@ in with self; {
   TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; };
   TraMineR = derive2 { name="TraMineR"; version="2.0-12"; sha256="11bgksw8bps9s5kmp9kyfh3pdxbqiq1iq21jl1j7i4m62bgrwyhn"; depends=[boot cluster Hmisc RColorBrewer]; };
   TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.5"; sha256="1xi2il33qklkjviayz644iwghpak0nvzakqfaln5l8gsg33gk7lg"; depends=[cluster RColorBrewer survival TraMineR]; };
-  TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
+  TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; };
   TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
@@ -4446,7 +4503,7 @@ in with self; {
   TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; };
   TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; };
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; };
-  Tushare = derive2 { name="Tushare"; version="0.1.1"; sha256="0iz3wa11i8k4ss9iayab0vn80aq1ll8darmpkw0qpia8j50kcb2s"; depends=[data_table forecast httr tidyverse]; };
+  Tushare = derive2 { name="Tushare"; version="0.1.2"; sha256="1ai218cjw1hsxw75cc84w11y3gljccjsflwbnxp4mhr0af3lp2r3"; depends=[data_table forecast httr tidyverse]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
   TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; };
@@ -4455,11 +4512,12 @@ in with self; {
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
   UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; };
   UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; };
-  UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.1.1"; sha256="0y655ixxqm6rka3dk3i7arrapy0qiafics58dklnhb99riadpzqf"; depends=[dplyr DT ggplot2 magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes UCSCXenaTools zip]; };
-  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.3"; sha256="0zl45fxjimxq6f2923xp5vmqghraf5agzdaagxqmfkshc26xr6a2"; depends=[dplyr DT httr jsonlite magrittr readr shiny shinydashboard]; };
+  UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.2.0"; sha256="04v5px1ph8529xn93bhr2r6kmfdr96xzbp3wnyr6i3a9rf3kdlb0"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes tibble UCSCXenaTools zip]; };
+  UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.5"; sha256="1l7jblnwsywmkmjb7iqzyv0hbr9ldls374hcz4wynw1fbl66zk94"; 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]; };
   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]; };
   UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; };
   UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; };
   USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; };
@@ -4477,23 +4535,24 @@ in with self; {
   Umpire = derive2 { name="Umpire"; version="1.3.7"; sha256="1yg1vrz36jgni7pkl4ch095ckcdx177j2w28zb7s8scjpvm20h3z"; depends=[]; };
   UncDecomp = derive2 { name="UncDecomp"; version="0.0.4"; sha256="1v29y64jm3axllwy0cgmyki6ii3ph2zyvcgbzv1pdrgxgj14qhck"; depends=[]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
-  UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.7"; sha256="0b7mx919lbj12zrj8l01wfrdpqiq7s7p9q25alp7yf4jpv9w4vfa"; depends=[nloptr reshape2 rootSolve]; };
+  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.0.1"; sha256="03r375cy36vjlcksvjwhrgi2vh6gvycbp9ml5x0jmgfi729drdqd"; depends=[ggplot2 httr magick plyr scales]; };
   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.2"; sha256="1wwnwm9rhz3pld76ihd0camlyli8namjayljz151fqp64inwrik1"; depends=[curl jsonlite Rcpp]; };
+  V8 = derive2 { name="V8"; version="2.3"; sha256="1cq5snck0hnjwchy92g5ysdabf70i5hjw3r3401sqv6nq5rdf87p"; 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=[]; };
   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.3.4"; sha256="1qyf20i6bgjg3lxivhx4kgr66m63wkzw8r26aqhz0cs1j0w741dk"; depends=[lme4 Matrix numDeriv]; };
+  VCA = derive2 { name="VCA"; version="1.4.0"; sha256="076li3bd192lyg9hpcj391sg38jnr6mm8br550l31lqkz9f4nifn"; 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=[]; };
@@ -4515,9 +4574,10 @@ in with self; {
   VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; };
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
-  VSURF = derive2 { name="VSURF"; version="1.0.4"; sha256="1sby2ls8yhxv4hx0y508pypsj1sbc0d269yl0xnqbxz44bhj8zzm"; depends=[doParallel foreach randomForest rpart]; };
+  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.1.0"; sha256="1ccrim9nx5fmmadg687gz9qrfkyxp48rskg1n2pxfwd3h10c9js1"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
+  VWPre = derive2 { name="VWPre"; version="1.2.0"; sha256="1s9fc86gr8yf8h53sz8gg4dhm2vqxwpp42symsmy2xscrjavd7ph"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; };
   VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
@@ -4537,13 +4597,12 @@ in with self; {
   VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; };
   VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; };
   ViSiElse = derive2 { name="ViSiElse"; version="1.2.1"; sha256="14vv25wnqcplf7k0ybfdlcvyhnja0h0kvz39yzlh2qkavjvdaf2y"; depends=[chron colorspace Matrix stringr]; };
-  VineCopula = derive2 { name="VineCopula"; version="2.1.8"; sha256="1sdj6561ya7px4bp4kq23ggjf1bmis465zpnwn0i650z3q6y7al7"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
+  VineCopula = derive2 { name="VineCopula"; version="2.2.0"; sha256="12p1bmp3b5vm0zfmwhbjj5gbmp0gf1ad7dcyzk6lda3zqkvfyfmi"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
   VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
   VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
   W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
   W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; };
-  WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; };
   WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; };
   WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; };
   WCM = derive2 { name="WCM"; version="0.2.1"; sha256="0d2yw6kzn7mvxwllxfbk6vfiy8l1fd7ggjgi92kjn0j0y66cadw4"; depends=[pracma raster]; };
@@ -4556,27 +4615,27 @@ in with self; {
   WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; };
   WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
   WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
-  WMWssp = derive2 { name="WMWssp"; version="0.3.7"; sha256="1bjah78il3g1lr4wz1a7d41frlqsyy1pn4cdc9k3yq1gm5sxx6kk"; depends=[]; };
+  WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; };
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="1.0-0"; sha256="1ax7lchbg0f5miq5779p1zmk6pw36hvwwmbpvsfqwahl5wlvii0s"; depends=[MASS mc2d plyr reshape]; };
   WRSS = derive2 { name="WRSS"; version="2.3"; sha256="182753820fjwl544sv7rhkjsdy268r8fgspyq88brqlpfj7k6rdw"; depends=[GGally ggplot2 Hmisc network nloptr]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.1"; sha256="0q2rdzbz3cbgr19sh9j3fqdn0lvwrq93qq2rjmnhx6ia9avkywa8"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="1.1.0"; sha256="0nwfjjyz54r6xjh9hzrpy3mc6as92db2vb4d39l34n2ni496xky9"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="1.1.1"; sha256="0922r7h03aczhqjw20djc6nwvmj7rq8dbhk2752jv3ndjdl5ywlw"; depends=[cdata ggplot2 gridExtra mgcv sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; };
   WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; };
   WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
   Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; };
-  Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
   WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; };
   WaveletANN = derive2 { name="WaveletANN"; version="0.1.0"; sha256="08qnx0lk2laiyx1q1wxj15j0yic65r7mbhr6lqbdllq30v4dcj88"; depends=[forecast fracdiff wavelets]; };
   WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; };
   WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
   WeMix = derive2 { name="WeMix"; version="3.1.1"; sha256="0hg7ib3spfd5fp71gfbrh234wxinv3xswyaxb4gzd8342qg2xxhk"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; };
-  WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.0"; sha256="0jqhkfxvz17ypib4481fgmpg1fjmmijy8xzfn1s0aldzlyl770k8"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang whisker]; };
+  WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.1"; sha256="1xr4qxrp98jawmpw9k2nlbl4qr8ydgm2krmf606ybjrng8l8mdzn"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang 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.10"; sha256="1h2w1rgap9yjns7cby0559jwzzwhzjq1h6lwsawrfnni7c36iliq"; depends=[Rcpp RcppArmadillo]; };
   WeightIt = derive2 { name="WeightIt"; version="0.5.1"; sha256="16gj7ynk4l67z7fjc345211hgqwxbdb6z1bpy27z5s4i7x4fyf8y"; depends=[cobalt]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
@@ -4601,7 +4660,7 @@ in with self; {
   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.5"; sha256="1cn17m8q16516gyjnbkkdsxhyjcsxi83h3nm7pwzyh2qjp5qhmkl"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges MASS Matrix RCircos S4Vectors supraHex tidyr]; };
+  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]; };
   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]; };
@@ -4616,7 +4675,7 @@ in with self; {
   XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; };
   XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; };
   Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
-  Xplortext = derive2 { name="Xplortext"; version="1.1.1"; sha256="18a8qqpakwgv60gm89cmil18q35mlir3xl4yl5j5fswcj5qpdkdx"; depends=[FactoMineR ggplot2 gridExtra slam stringr tm]; };
+  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]; };
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YRmisc = derive2 { name="YRmisc"; version="0.1.5"; sha256="0vdxw67j4sx3m713s2spvj7jlk9h2g9hg4169zabfah8ni7gdman"; depends=[ggplot2 gridExtra robust]; };
@@ -4647,6 +4706,7 @@ in with self; {
   aSPU = derive2 { name="aSPU"; version="1.48"; sha256="0kjvwwvyhiz9i5kxqg68lq6cvxnk9vzvp5zca5hfv2g77j42wh9h"; depends=[fields gee MASS matrixStats mvtnorm]; };
   aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
   aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.1"; sha256="1jg19ns3mxfycc11i2c152d83n4kqz3dd6d269sijnxrw80kzjki"; depends=[party randomForest rpart]; };
+  aaSEA = derive2 { name="aaSEA"; version="1.0.0"; sha256="0x0vp91m3vxgzrs38mf36d24i5i7f03jsisbdrx7s1slbqzdrkv8"; depends=[Bios2cor DT Hmisc magrittr networkD3 plotly seqinr shiny shinydashboard]; };
   abbyyR = derive2 { name="abbyyR"; version="0.5.5"; sha256="1vldnd3dg89aj6a73nhirirqddbfdrnzhb5m3679i60sark8nk6r"; depends=[curl httr plyr progress readr XML]; };
   abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
   abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
@@ -4658,7 +4718,7 @@ in with self; {
   abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
   abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; };
   abjutils = derive2 { name="abjutils"; version="0.2.3"; sha256="0n4zps65y3zg0gfzlv97w91si52a9izkncirskbkj5x9hk0nhxcv"; depends=[devtools dplyr furrr future glue httr magrittr progress purrr readr rlang rstudioapi scales stringi stringr tibble tidyr]; };
-  abn = derive2 { name="abn"; version="1.3"; sha256="1q9hzpxwg835711kxwygd0l2awal6f015f8s6fprwz7graz1wbbm"; depends=[Cairo lme4 MASS nnet Rcpp RcppArmadillo rjags]; };
+  abn = derive2 { name="abn"; version="2.1"; sha256="08jlvb6i5f7ry2dwm0jgrnn2w95vr0l67dpx13n9878lz9ld131b"; depends=[lme4 MASS nnet Rcpp RcppArmadillo rjags]; };
   abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
   abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; };
@@ -4671,8 +4731,9 @@ in with self; {
   accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; };
   accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
   ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; };
-  acebayes = derive2 { name="acebayes"; version="1.6.0"; sha256="19bf3swcpr13a3mw767p2wadsmfh8sbj2nw8if4m4ykmnk66r7a2"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
+  acebayes = derive2 { name="acebayes"; version="1.7"; sha256="1zp78gq72waqglgafapir3jf1r5dzwqar594mg440vva85m741za"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
   acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
+  acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; };
   acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; };
   acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
   acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; };
@@ -4683,10 +4744,12 @@ in with self; {
   acs = derive2 { name="acs"; version="2.1.4"; sha256="0ajw9rf8l8akcvgqvbxjvryc6wjx74521xyxswz2b0bky3m6kah5"; depends=[httr plyr stringr XML]; };
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
+  activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; };
   activity = derive2 { name="activity"; version="1.2"; sha256="11w2bz6p9xbzdh6773dmbbh6rws0h5dj18p8m0ivzizgq932vdzs"; depends=[circular pbapply]; };
+  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-1"; sha256="0i0w5y0bgma42p4cbrbv0bxkambp7hgqqlsg90p5skfvg7r1n3bk"; depends=[expint]; };
+  actuar = derive2 { name="actuar"; version="2.3-2"; sha256="176ch6lbjn2f7vx2npjvl4y1j3l4v2g87g9sag2shvgh6sh5d7ix"; 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=[]; };
@@ -4727,11 +4790,11 @@ in with self; {
   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]; };
-  admisc = derive2 { name="admisc"; version="0.2"; sha256="1kz0zvvlkpwzq7xkmdyysnhsk40m9445x22z041n42s00fv09ji2"; depends=[]; };
+  admisc = derive2 { name="admisc"; version="0.3"; sha256="10khlmkiv9xyhd8rhcj4fb5h24pflmdl6np26rky6j5sa7vhi97y"; depends=[]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
   adnuts = derive2 { name="adnuts"; version="1.0.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.2.0"; sha256="1iqw8sbsn7pq5azv9pg7v9lisw4pb4qfd9chnk4y7bgiis46sy6w"; depends=[nloptr]; };
+  adoptr = derive2 { name="adoptr"; version="0.2.2"; sha256="0mxknvrwkmd46n45zcai3d6jgw27rjf2k9wbr4ma8vivbnykgsxn"; depends=[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]; };
@@ -4740,7 +4803,7 @@ 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.23-0"; sha256="0yv4s7461swn0116y4wq9v139p1br5rr6hhnq1cmkbvybmwj2vp7"; depends=[car lme4 lmerTest pbkrtest reshape2]; };
+  afex = derive2 { name="afex"; version="0.24-1"; sha256="14w7kcwr5hxmjcjmdm5ia9ka3bw1nl18pxlm1vpw62nmvicn3455"; 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=[]; };
@@ -4771,12 +4834,13 @@ in with self; {
   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]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
-  alakazam = derive2 { name="alakazam"; version="0.2.11"; sha256="0p6rg09cxphp6mcbllwrvps4l9y2qssxhgxy6ryr4958gc1may16"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi tidyr]; };
+  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=[]; };
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
+  alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; };
   alfred = derive2 { name="alfred"; version="0.1.7"; sha256="1467rg5q2dqbqy8vj2061glb1gksq96rnjlifgyiv5rarwzy9b4y"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
   algaeClassify = derive2 { name="algaeClassify"; version="0.1.0"; sha256="19iad7av908zrfsv6nwwk4yllfls6pyhyzg78zyh4lk76r04kbjp"; depends=[]; };
-  algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; };
+  algorithmia = derive2 { name="algorithmia"; version="0.2.0"; sha256="0h1llcwk1qkxg26ikib44nd19da1q39n3gd8jwwb36687drl26qp"; depends=[base64enc httr rjson]; };
   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]; };
@@ -4794,6 +4858,7 @@ in with self; {
   alphavantager = derive2 { name="alphavantager"; version="0.1.1"; sha256="0rbvbws0g50z76pvkydadf97gq5yg1l03xlfqyy3yblqh59cj5s6"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; };
   alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; };
   alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; };
+  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=[]; };
@@ -4826,21 +4891,22 @@ in with self; {
   anim_plots = derive2 { name="anim.plots"; version="0.2.1"; sha256="0z811y4zzrqas1ynrq4syhxvbcw2girxa6g9biry9d0qgq1w8cp1"; depends=[animation]; };
   animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
   animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; };
+  animint2 = derive2 { name="animint2"; version="2019.7.3"; sha256="13s6s0py5hfywgknl0521d0xhdb86988pqwymwsw054l9xhp5dns"; depends=[digest gtable lazyeval MASS plyr reshape2 RJSONIO scales tibble]; };
   anipaths = derive2 { name="anipaths"; version="0.9.7"; sha256="1h6rcrybjfc4kn377bay2c3nfv6qwwi0nk14xh6jfdsxqybq6dw2"; depends=[animation ggmap knitr mgcv RColorBrewer rgdal scales sp]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
   anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; };
   anomaly = derive2 { name="anomaly"; version="1.1.0"; sha256="0v1pgyckqkimyh1hh68clyqnm9hkzmz3dal676l9qaiwbgqmkxi4"; depends=[dplyr ggplot2 Rdpack rlang]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
-  antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.6"; sha256="0fl25phnzjv93qw20d2mkhl1w2rix44qiqxg44i3rhfn3qncpa05"; depends=[antaresRead assertthat data_table whisker]; };
+  antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.7"; sha256="0whwlqsjc9ygh2iv9bmgxglqk061l3mgfsq1a0848180wci6frwb"; depends=[antaresRead assertthat data_table whisker]; };
   antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; };
-  antaresRead = derive2 { name="antaresRead"; version="2.2.3"; sha256="0ylj2q39w82xkbq5qfz8srqmmcrkrpgf3k15apswf2hzax2pvik0"; depends=[bit64 data_table lubridate plyr shiny stringr]; };
+  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]; };
   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.4"; sha256="1q3qdld3qk709c0jg1ljv8zbvw4xycwiwjwbdc3ikwcqnvafrl9q"; depends=[BH RApiDatetime Rcpp]; };
+  anytime = derive2 { name="anytime"; version="0.3.5"; sha256="0jbbfcrggkm04m50b6m2y62x4qvnch4d0wh4l1j26r687a39a0py"; 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]; };
@@ -4856,9 +4922,10 @@ in with self; {
   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]; };
   apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; };
+  apexcharter = derive2 { name="apexcharter"; version="0.1.1"; sha256="16zndkg4kgaxcgm1434l2lc5h4jkm5849aacadakq3jh0qa9fbqg"; depends=[ggplot2 htmlwidgets magrittr rlang scales]; };
   aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
-  aplpack = derive2 { name="aplpack"; version="1.3.2"; sha256="14vwzzshsgkw6gxwnnf6h9fixnwp3g8pd3rv6qjr0y8gis1lmjbg"; depends=[]; };
+  aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; };
   apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
   apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; };
   apollo = derive2 { name="apollo"; version="0.0.7"; sha256="1znbxyvwyv7mm8jz86xj50yx2x9hpp6awdh567aw9pkvdy6bwmjp"; depends=[coda maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; };
@@ -4898,7 +4965,7 @@ in with self; {
   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.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; };
+  ari = derive2 { name="ari"; version="0.3.1"; sha256="0hrmvnqs56v94lgl8i14p336nfcnd2x5yam4hclw7i4mj2l3r9ys"; 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]; };
   arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; };
@@ -4972,7 +5039,7 @@ in with self; {
   astsa = derive2 { name="astsa"; version="1.9"; sha256="0s5d94ra8fiy0c5h8n6mk7nk9k3cmcdirafb8rcps2aqr3yh4k4d"; depends=[]; };
   asus = derive2 { name="asus"; version="1.0.0"; sha256="16hp8xajb631a5amm1cvhzq8z4cwh1vjiavv3n11fzpxyskhmfrb"; depends=[rwt wavethresh]; };
   asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; };
-  asymmetry = derive2 { name="asymmetry"; version="2.0"; sha256="02l9sg4f7i0mxzh4p7r930fswy4b04dv0icm7f2h1rldsnswh2sk"; depends=[gplots smacof]; };
+  asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; depends=[gplots smacof]; };
   asympTest = derive2 { name="asympTest"; version="0.1.4"; sha256="02l07psiy1888zx86j2r1l5lznz47wdmzbh39pd2nbj8r9i80szr"; depends=[]; };
   asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
   atable = derive2 { name="atable"; version="0.1.2"; sha256="0859yyg2a548wajsmjljzk5hysj14fgsk63qhy35838rkgw85zxc"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; };
@@ -4992,6 +5059,7 @@ in with self; {
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
   auditor = derive2 { name="auditor"; version="0.3.1"; sha256="1ndd5a5264b91qaw0qj9rwjvhn9lgw7y5dirjqlzkib6q9mcyanq"; depends=[car factoextra fdrtool GGally ggplot2 ggrepel gridExtra hnp plotROC ROCR tseries]; };
   augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; };
+  augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.1"; sha256="0l2x8f8xqrvsn4gbi707xw2nfxcvcmxwgpzq4vh8ngxnq89m2179"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; };
   auk = derive2 { name="auk"; version="0.3.3"; sha256="0ysp1wn8ik2sgl2cc21bjvfhr39clc485frpi6z7xmnh57aqi56q"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
   auth0 = derive2 { name="auth0"; version="0.1.1"; sha256="1snmd6b16paglfpaf0bawja25rj3n7k8cv3hd7112vspc7lb62h0"; depends=[htmltools httr shiny yaml]; };
@@ -5008,17 +5076,17 @@ in with self; {
   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.4"; sha256="1d0zx0k6pxcymm6h915039rs6ncq3cmjnci571520fc3l0svvl8j"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; };
+  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.2"; sha256="0vw6136sh1rgsah10xrcrgrpb6rpf5l8vixs950yq51syxc1y2qc"; depends=[]; };
-  available = derive2 { name="available"; version="1.0.2"; sha256="0fhynbw75f7adw3168a4mkaqkpb910bi0rym8imbpasgnqrr6smc"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
+  available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; };
   aws = derive2 { name="aws"; version="2.2-1"; sha256="1g0saj3v67cjdk6396ck3ah7qvv3m9awj4b3v1n86nkwdpa75z91"; 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.1.6"; sha256="0mcrgkz6kc2i59m0s40szkaz1hqvs5nak53q4wxxpc2ykc6r6izn"; depends=[curl 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]; };
@@ -5040,6 +5108,7 @@ in with self; {
   baRcodeR = derive2 { name="baRcodeR"; version="0.1.3"; sha256="06fk70d52c4vi5bc42wljpxkvr3n45likhvs5b5r0lpw4himy1fm"; 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.0"; sha256="054m108wws0i58r4zk1qgd2fkfccdb7rw95ja467m63k0g9pxzn3"; depends=[crayon dplyr dynutils processx purrr]; };
   babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; };
   bacistool = derive2 { name="bacistool"; version="0.9.8"; sha256="1yq7d2657l6iyy5v094c9rwphbpyhnijhwvacwhb07k6c6h069wh"; depends=[rjags]; };
   backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; };
@@ -5050,19 +5119,21 @@ in with self; {
   badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; };
   badger = derive2 { name="badger"; version="0.0.4"; sha256="0y0kr0r5b44c19w93sisd61khiwhlgj3n88mhfgs3ljbl68qjcvh"; depends=[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.1.0"; sha256="04iqvdj3ih5i6qwb25rmngvhw66v00xb2x5mzgbicd712dydp57s"; depends=[bayesplot BH crayon ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders]; };
   bain = derive2 { name="bain"; version="0.2.1"; sha256="0z3c6k4hr6zkkzm2v8m1rmblbcz2j7hzipa9brirhhwqdlh8l6mj"; depends=[]; };
   bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
-  balance = derive2 { name="balance"; version="0.1.9"; sha256="1nr6v0m98rx30ij4q80w5i1f9rss7w4k9yk074y9xp2dpaxh36s6"; depends=[ggplot2]; };
+  balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; };
   ballr = derive2 { name="ballr"; version="0.2.3"; sha256="1bfbdzn4q3i5m87vbxymxha54vgxjfckzpxk52m54fkwpz6yw9cl"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
   bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; depends=[rscala]; };
-  bamdit = derive2 { name="bamdit"; version="3.2.1"; sha256="18l9kd3a0d4y6z38k9nm18j32g6dxmwylv8cv1wp3fzffv51lm1s"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
-  bamlss = derive2 { name="bamlss"; version="1.0-1"; sha256="1nxy8a075dhdwz9jhyicqj1naz95w0mns64c6j59gpzwp03nvml4"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
+  bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
+  bamlss = derive2 { name="bamlss"; version="1.0-2"; sha256="1g28c91j6zkmcah7dblgpgw789fsrcd9f3gbr8n8aa2yfflazjkp"; 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]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
   bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; };
-  bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.0"; sha256="0ycx771g9a73w0sx8zzix8kswwbjagzhbyvaq7l5r8a9ayfli8ic"; depends=[]; };
+  bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.1"; sha256="0ndm4z6gkd9flxsh1sx08c5ahm8297hzn8f5hc1mpn5m998ajjsj"; depends=[]; };
   banter = derive2 { name="banter"; version="0.9.3"; sha256="1ziys0zy66477ynr8rp2kv7w82n6226whn47aa06kkb4nhcqfk2c"; depends=[dplyr ggplot2 gridExtra magrittr plyr randomForest ranger rfPermute rlang tibble tidyr]; };
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
   bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
@@ -5078,8 +5149,8 @@ in with self; {
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
   basefun = derive2 { name="basefun"; version="1.0-5"; sha256="1w8nbwpa9invndhlndha4dsrmvmar4xar1hzixnxkcbrzj6yzmi8"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
-  basetheme = derive2 { name="basetheme"; version="0.1.0"; sha256="05b1fk65x1hhkd10pihpqpdf5kqgckrs8sr7y6s9yv9rifq9m650"; depends=[]; };
-  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.0"; sha256="0j8hsgs91qv9l0xngv87w6my61207c56jkl9s125xmlrqg5ifj84"; depends=[]; };
+  basetheme = derive2 { name="basetheme"; version="0.1.1"; sha256="021zgrdqz1yvb2linraskfk9cxqjjc3p5z5r0dhhnrkpy4ijbkyz"; depends=[]; };
+  basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.2"; sha256="1yhdhl1vzvz7wysrgj96dgqsbdc1p7031m0m69m8ha8wx4vryil8"; depends=[]; };
   basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; };
   basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; };
   basictabler = derive2 { name="basictabler"; version="0.3.0"; sha256="1dzjdgc8ffnr219m5zb410ln1rbnzz96g1aqb70pkg9gp0ykgk29"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; };
@@ -5093,7 +5164,7 @@ in with self; {
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
   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]; };
-  bayesAB = derive2 { name="bayesAB"; version="1.1.1"; sha256="0kxrhxg43hzkcziyqpwy29iqs7i0qi3pn3jz0z1s8paf8drbgdf4"; depends=[ggplot2 Rcpp]; };
+  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]; };
   bayesDP = derive2 { name="bayesDP"; version="1.3.2"; sha256="1xv133v01mbfsy0w5acc9819m92dcxfdjg4a8p7kdfkycz4ilwnl"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
@@ -5116,13 +5187,14 @@ in with self; {
   bayeslm = derive2 { name="bayeslm"; version="0.8.0"; sha256="1gvqkbz1wmqkxjwkdgj5pir5j1qy5dzjm4jv6mz3mplm16z5vzbl"; depends=[coda Rcpp RcppArmadillo RcppParallel]; };
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
-  bayesm = derive2 { name="bayesm"; version="3.1-1"; sha256="0y30cza92s6kgvmxjpr6f5g0qbcck7hslqp89ncprarhxiym2m28"; depends=[Rcpp RcppArmadillo]; };
+  bayesm = derive2 { name="bayesm"; version="3.1-3"; sha256="041ach2f2vrqzd5kz17v7wmkjz6z8cjjihpk4qvczm4cr9z85r2i"; depends=[Rcpp RcppArmadillo]; };
   bayesmeta = derive2 { name="bayesmeta"; version="2.3"; sha256="12rljnlr7wv0q95ild7vrsbgkpg7zw1lmh6gx4kpip1ckax04360"; depends=[forestplot metafor]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
   bayesplot = derive2 { name="bayesplot"; version="1.7.0"; sha256="0h23sbfny2hcipvvfhq5aiwdh1vanizn7f8lpb9kffypxhcd7v7w"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; };
   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.2.2"; sha256="09r654lrhwwnshn5h2s2fbx3c8wigv3j4sva5hmfnkwjg8cclhd9"; 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=[]; };
@@ -5155,6 +5227,7 @@ in with self; {
   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]; };
   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]; };
   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]; };
@@ -5185,7 +5258,7 @@ in with self; {
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmarkme = derive2 { name="benchmarkme"; version="1.0.0"; sha256="1jslcz56m48rx64w80xxccdzhmqbpg2b81rp8i358mj9xjrasya9"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; };
   benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.1"; sha256="1azjsvz855kzrd2fwc2v06pzdlc75492sq8pxwk4via8jp11jm67"; depends=[dplyr tibble]; };
-  benchr = derive2 { name="benchr"; version="0.2.3"; sha256="1rjcjhjarmrbw5mn77vpi18cykf0lvagv6hnfcc24057anng48ip"; depends=[Rcpp RcppProgress]; };
+  benchr = derive2 { name="benchr"; version="0.2.3-1"; sha256="1q8g9v7zbspd2gmydwwfi3avdsnmn5ahr9iybdqsicgfch5plsf5"; depends=[Rcpp RcppProgress]; };
   bender = derive2 { name="bender"; version="0.1.1"; sha256="07npksrj094h884lli0fjvwjc1lhcwzlsk9wx82761mka5xajv4v"; depends=[httr jsonlite R6]; };
   benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; };
   bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
@@ -5203,7 +5276,7 @@ in with self; {
   betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; };
   betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; };
   bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
-  beyondWhittle = derive2 { name="beyondWhittle"; version="1.1"; sha256="178bhy2plkahklgwyhk2rlamjzyi8md612z58wi1mrbryzv4lsy1"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; };
+  beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.1"; sha256="1nr414wvfwycp3s9v592jd4gk5wdjfklk7ypqabx73k5fsxrcc0g"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; };
   bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; };
   bfa = derive2 { name="bfa"; version="0.4"; sha256="08n6446xl2w8z0rsqi6v2hp9cp744frxw6vrbxg5cpybhyyfzr36"; depends=[coda Rcpp RcppArmadillo]; };
   bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
@@ -5214,7 +5287,7 @@ in with self; {
   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.5"; sha256="1yqj3761zs64kdh63vaz6glpv65i3ji8fi51nqq8wlggak0zklnx"; depends=[CholWishart coda EDISON inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; };
-  bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; };
+  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]; };
@@ -5225,6 +5298,7 @@ in with self; {
   bife = derive2 { name="bife"; version="0.6"; sha256="1fmzmzq3hxr9kzqq5zmmsm2927vjb5mj08g2pnzljhmvsn2b7x3y"; 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.4.0"; sha256="1b89yfa0gwd3frdh1z6ygxv2dfncb6g4lp67nh7hkm6r9xamfrxr"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; };
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
@@ -5242,11 +5316,11 @@ in with self; {
   bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
   bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
-  bigreadr = derive2 { name="bigreadr"; version="0.1.5"; sha256="1w9kk7kpa7g549dhr39md4qazgx94ss54an7sz0gq0frm3flg2sc"; depends=[data_table fpeek Rcpp]; };
-  bigrquery = derive2 { name="bigrquery"; version="1.1.1"; sha256="1if39xkr231xmjq10fx2g7bgg4jgfd3wzx1p9g3pq4hbf2s6x0is"; depends=[assertthat bit64 curl DBI glue httr jsonlite prettyunits progress rapidjsonr Rcpp tibble]; };
+  bigreadr = derive2 { name="bigreadr"; version="0.1.7"; sha256="0sdjdwdgw2jicdqrpyan4nma060yimd6wpxwvw06h4spljbp00yl"; depends=[data_table fpeek 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]; };
-  bigstep = derive2 { name="bigstep"; version="1.0.1"; sha256="1x93g7nsndxdan42zpn1f155cnahbmw5l2zchq4j49g62db1n06x"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; };
+  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=[]; };
   bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; };
@@ -5294,7 +5368,7 @@ in with self; {
   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]; };
-  bioinactivation = derive2 { name="bioinactivation"; version="1.2.2"; sha256="1rpza2a0chkg1r1bhc8wm24gmg5fwzxnxm9nlc040890xqdzpadg"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS rlang]; };
+  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]; };
   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]; };
@@ -5309,7 +5383,7 @@ in with self; {
   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]; };
   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.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
+  biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; };
   birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
   birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; };
   birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; };
@@ -5327,7 +5401,7 @@ in with self; {
   bivariate = derive2 { name="bivariate"; version="0.4.1"; sha256="13qmwz8lwgxppjsq491f8grsg2myhwma4ikhx2k40lag98dpgc9f"; depends=[barsurf intoo KernSmooth mvtnorm]; };
   bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; };
   bivrp = derive2 { name="bivrp"; version="1.2"; sha256="1yrciaadxlkxzbgdsig80yjn9iqrv8a6ccz62hsnyb3knycpcln1"; depends=[MASS mrfDepth]; };
-  biwavelet = derive2 { name="biwavelet"; version="0.20.17"; sha256="183h9mdlpizikg1xnrnd03hbij4fnf5ibsad4jcfmh6d73qcgn9b"; depends=[fields foreach Rcpp]; };
+  biwavelet = derive2 { name="biwavelet"; version="0.20.19"; sha256="0pdjjjjiwnl7ihlwzjd9hwl5kzq5wbnbqfmm5pp8gvkcypj9k7rb"; depends=[fields foreach Rcpp]; };
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
   bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; };
   bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; };
@@ -5336,7 +5410,7 @@ in with self; {
   blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; };
   blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; };
   blastula = derive2 { name="blastula"; version="0.2.1"; sha256="1w9g858c6p7qzv86pfndycvpgv6k63r85wlq11249mi2zqzvh7rl"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr magrittr stringr tidyr]; };
-  blavaan = derive2 { name="blavaan"; version="0.3-4"; sha256="01a5mf5gmkgxpa79hg3lhrg1ywlggpy07552dmjsai07j05wrc84"; depends=[coda lavaan loo MCMCpack mnormt nonnest2]; };
+  blavaan = derive2 { name="blavaan"; version="0.3-5"; sha256="1hvv33wqa5c57bszds0jad4c7sh3c78glrppy3g64lj0awjk90p7"; depends=[BH coda lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; };
   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]; };
@@ -5345,8 +5419,8 @@ in with self; {
   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.1.1"; sha256="0lsg91hk508dd95ivig2lwg62qafwnarjw68110kx63cfk4zkjxc"; depends=[prettyunits]; };
-  blockForest = derive2 { name="blockForest"; version="0.2.0"; sha256="1cfbhhk2dyh1jqcsnndv8hmqs33bsmhh84mr6hsf7jm695w0dy17"; depends=[Matrix Rcpp RcppEigen survival]; };
+  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.0"; sha256="0f71azkjlaj6vcpjq77991vkfjr77nwifyxaqnli94svbbvf3yb6"; depends=[arm bayesDP 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]; };
@@ -5356,11 +5430,12 @@ in with self; {
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
   blocksdesign = derive2 { name="blocksdesign"; version="3.5"; sha256="04bsax0f3q332920xllbxawz49wr8k4cwlizp649gpz82a2rs7zd"; depends=[crossdes lme4 plyr]; };
   blockseg = derive2 { name="blockseg"; version="0.5.2"; sha256="1i2c9prr51ak6vrdh5gzxlwkdmmky1sj71b4m12khrizigbqgysa"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 shiny]; };
-  blogdown = derive2 { name="blogdown"; version="0.13"; sha256="0sh0cl40062rsrcwr3cxn1j8rf87ny628k647555gs918yfsff9k"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
+  blogdown = derive2 { name="blogdown"; version="0.14"; sha256="0g46wjji2bynhbmd7magkqnd6mfpwkbqvfnpdcjkvyiw5idgpxci"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
   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]; };
+  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]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
@@ -5376,22 +5451,24 @@ in with self; {
   bnlearn = derive2 { name="bnlearn"; version="4.4.1"; sha256="1nb4m945650538d7w383j4f1d2h3ndy608mfr3amxjrpp7d9ys3k"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
+  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.0.5"; sha256="01bqh8h9kbpnr9a3hr5p6ydzda5y2is2971ba7991mnk3f0g4pc1"; depends=[doParallel foreach gRain gRbase raster rgdal]; };
-  bnstruct = derive2 { name="bnstruct"; version="1.0.4"; sha256="0xlq5y2pa7d36pj316idh84hkbgn0c8jjp0d2x1p92zfvd8xpxnw"; depends=[bitops igraph Matrix]; };
+  bnspatial = derive2 { name="bnspatial"; version="1.1"; sha256="1mgqll65b1kngg89nf9vc4zlwr0qy2y3zzxd0wgqnywp31mhwpzi"; 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.3"; sha256="0sr9wjm75gs6y9sbfz3vscwdrnsgfx0nxgps4mmxz976fq571y4c"; 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.5.0"; sha256="16p6pd5is5gw31q5iw1s8ky4iw8zz12g72i18mdgdn444fh8nlig"; 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.11"; sha256="0w4fkv5fqiaqgkx44p0s161imf29zir9742126xkz1pl1j25jn1r"; depends=[htmltools knitr rmarkdown tinytex xfun]; };
+  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.12"; sha256="1c2v0rpa1rrpbx8yb66sfvrf4gf57f6a8x7ydjqqbkbwhxdlrsrq"; 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.3.0"; sha256="0q1lgjvbc15m2gygnmh63m0wy2c6x25iwrh9cbn0baq598hnr7j9"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
-  boot = derive2 { name="boot"; version="1.3-22"; sha256="1z2dig1mi76b3b9ck6qlkh07l3hs478gaf70db5nv8x7w2qhq7yg"; depends=[]; };
+  boot = derive2 { name="boot"; version="1.3-23"; sha256="0bx07zbb5nfz2xfgnzbspg7r5vxz4bjdz1ry4d1vk434vlcrxj1h"; 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]; };
   bootRes = derive2 { name="bootRes"; version="1.2.4"; sha256="1lzj154qqqxqg6q2bjnzba8hlcx473i9cpp8kkjkpy7k87fgpm7v"; depends=[]; };
   bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
@@ -5406,6 +5483,7 @@ in with self; {
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
   bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; };
   boral = derive2 { name="boral"; version="1.7"; sha256="0li7jdzgq2ffhrf0nly96syp72vv3c6rbcni19kk2wgyv16mjwcm"; depends=[abind coda fishMod MASS mvtnorm R2jags]; };
+  borrowr = derive2 { name="borrowr"; version="0.1.0"; sha256="0va4sp1xc91qfrzxlbqq499npn50azhw6cdr4ra3aamin54n9pgk"; depends=[BART mvtnorm Rcpp]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
   boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; };
@@ -5416,6 +5494,7 @@ in with self; {
   bpbounds = derive2 { name="bpbounds"; version="0.1.3"; sha256="1lqhrvd7hf8ryij5rf7zrcqc3k89bj1665x81m9rn7dixk7qlb6h"; 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=[]; };
+  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.0"; sha256="0mpwrhbbbw8m3cz0fl0x9j9m3n9zfdamnw83mmg4bjd0wmxkkm90"; depends=[BH haven MASS Rcpp RcppArmadillo]; };
   bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; };
@@ -5443,7 +5522,7 @@ in with self; {
   brglm2 = derive2 { name="brglm2"; version="0.5.1"; sha256="1vjgy9vxcx1n8syb04ck5sa4wnc4klrpyl8pk4ywkxzjflayh8ca"; 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.6-0"; sha256="1526lsqhgjh0v8jb2sb7rw9jxj2kkbidsqapqp309a2f05bsfb8p"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; };
+  bridgesampling = derive2 { name="bridgesampling"; version="0.7-2"; sha256="0kd4p5pz46vssjb8faxwy5nv6r403a89h8hylxhq50n2rj94x934"; depends=[Brobdingnag coda Matrix mvnfast scales stringr]; };
   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.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; };
@@ -5456,12 +5535,12 @@ in with self; {
   broomExtra = derive2 { name="broomExtra"; version="0.0.4"; sha256="15732zpiy0dgbqaahqc2cpszk647fi3lmb9v5pgvfgv24k8d9d3p"; depends=[broom broom_mixed dplyr magrittr purrr rlang rsample tidyr]; };
   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.4.0"; sha256="0jzwk7mn5wan0qg12zfk99s445r7gwsdb9xvih929q1xvmk19k48"; depends=[ape crul curl phylocomr phytools taxize]; };
+  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=[]; };
-  bs4Dash = derive2 { name="bs4Dash"; version="0.3.0"; sha256="10chkkryn7i6kx6jl6vg6dhahwjij661r8qxn2h5cailpn4sq5ga"; depends=[htmltools shiny]; };
+  bs4Dash = derive2 { name="bs4Dash"; version="0.4.0"; sha256="192fpy4qbra264smv9xqdzmm9wx86gm0k7bpaapjlpb30lb4izh3"; depends=[htmltools shiny]; };
   bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
-  bsamGP = derive2 { name="bsamGP"; version="1.2.1"; sha256="0b4a6ll11cykqq05ys1b0y9gdhbw6y60hjclz678vy5w8jia7a1m"; depends=[ggplot2 gridExtra MASS]; };
+  bsamGP = derive2 { name="bsamGP"; version="1.2.2"; sha256="1r7jmrj91na9718digggsjqfqc2l0s0md68vr3s9xcb77c4bbhyi"; depends=[ggplot2 gridExtra MASS]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
@@ -5476,7 +5555,6 @@ in with self; {
   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.1"; sha256="0ds48qnydwc3kngik2r78y70q50yca497xi83p643g4yl1kcybfy"; depends=[lme4 mgcv plyr]; };
-  bujar = derive2 { name="bujar"; version="0.2-5"; sha256="1mdn9kisbgsz8bp9nb9kvqng1wsf3a32wqqc5z5lp1c32ry58sii"; 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]; };
   bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; };
@@ -5484,7 +5562,7 @@ in with self; {
   bundesbank = derive2 { name="bundesbank"; version="0.1-9"; sha256="05sc6m2v8bfgdka7v28rxhq5a8c88gsxkv0zjk08rpw8k8zql0dk"; depends=[]; };
   bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; };
   bupaR = derive2 { name="bupaR"; version="0.4.2"; sha256="0fg16lw3liwmp1y92ky32wq18lfzn8psn2sqfja0322q6b34fgjk"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
-  burnr = derive2 { name="burnr"; version="0.3.1"; sha256="0s6p106mq989k1al6dsx9qxi7gmmjc4lw1vnfhkkxzmhnbwi0r3k"; depends=[ggplot2 MASS plyr reshape2]; };
+  burnr = derive2 { name="burnr"; version="0.4.0"; sha256="096z4bzmvalyihy45bdcvp1zsxvmwk3mkz7wj5x077z2pg8kfq38"; 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]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
@@ -5496,16 +5574,16 @@ in with self; {
   bwimage = derive2 { name="bwimage"; version="1.0"; sha256="0qh5qhcp8fm2d39dk4637biphv6rc6i687h5pip7ydp5f5bvgz77"; depends=[jpeg png]; };
   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.1"; sha256="0dl26xhfry8pb7gvnfv1670l13vh8lz5djclpgdyy7rn0ybx392w"; depends=[BH Rcpp]; };
+  bzinb = derive2 { name="bzinb"; version="1.0.3"; sha256="1n5ga5v6v71cgrgga5jlhmxs0s62pz93lsp3x8qz6vg042m5dl0s"; depends=[BH Rcpp]; };
   c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
-  c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.2"; sha256="03siiadhj8wp80jhm99lw7xb1p24yk9ycx2kp085a7xj82hl22jj"; depends=[crayon data_table dplyr magrittr pbapply RCurl rlang tibble tidyr]; };
+  c14bazAAR = derive2 { name="c14bazAAR"; version="1.0.3"; sha256="1fnsaadnam8njj1gskz26j71jd3n229y61psk3scnbrr5fyawlhh"; 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]; };
   cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; };
-  cNORM = derive2 { name="cNORM"; version="1.1.8"; sha256="0qwqwmy2awyaji93kz9jkhqxc2fh8h7n353z5hyqa20rrnm028nw"; depends=[lattice latticeExtra leaps]; };
+  cNORM = derive2 { name="cNORM"; version="1.2.0"; sha256="1mhdagdbz02zcr4dggmm54h2pk2zkzn4hlwa0ngki55l14bhg6k2"; 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]; };
@@ -5518,7 +5596,7 @@ in with self; {
   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.26"; sha256="0g1jfcm0xxaxvab21533dcrfwydpis7vl1ww7raj45g1i6vz3iiy"; depends=[]; };
+  cairoDevice = derive2 { name="cairoDevice"; version="2.27"; sha256="0hhzndaqcpkdfbvrsfp54k8bl82wffmp0s0689vd7zhwxvp7l3wg"; 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]; };
   calendar = derive2 { name="calendar"; version="0.0.1"; sha256="18ha6vpx2bpk8p08hajiq2d201fbqhzcycp8ks6wrr06fy04z689"; depends=[lubridate tibble]; };
@@ -5526,18 +5604,18 @@ in with self; {
   calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; };
   calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; };
-  callr = derive2 { name="callr"; version="3.2.0"; sha256="1s5h2k7c1vgbry90xczin66q89cbkc6mvh4679l5rsz83087pd2b"; depends=[processx R6]; };
+  callr = derive2 { name="callr"; version="3.3.1"; sha256="0rvrlg86fxr5nadvqa0dr1iifqjs4d1rc32v76m3ccvx6m3xlq5z"; 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]; };
-  cancensus = derive2 { name="cancensus"; version="0.1.8"; sha256="12mhnx9bx8wdhz7cb3lz0r0i6hgq6v401hl9v3bng27pz3va2fad"; depends=[digest dplyr httr jsonlite rlang]; };
+  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.2.3"; sha256="1486fz24dl47kv545zbx2swh7p396rcydzlnwd8g2g3dap93qk59"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; };
-  canvasXpress = derive2 { name="canvasXpress"; version="1.23.9"; sha256="14b9l49b3a46b55a5dfa83qq7qs8b5vfby2v1c05xradwj89sjsi"; depends=[htmlwidgets httr]; };
+  cansim = derive2 { name="cansim"; version="0.3.0"; sha256="0byyrwwsx4msfj7nmsp8s5gibvkf05rjajl5a3a92jj41qhw6hy4"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="1.24.8"; sha256="1sxhxddl9fdvxs1hdn5b03jg0sp8wgpfli9v0p2n381lq1z30m3s"; 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]; };
@@ -5574,13 +5652,14 @@ in with self; {
   caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
   casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; };
   casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; };
-  castor = derive2 { name="castor"; version="1.4.1"; sha256="084bfdacxdpvhfn9y9gbhmg6g4npyzgyjk9cdpfsqh3dkllnp1kg"; depends=[naturalsort nloptr Rcpp]; };
+  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.4.2"; sha256="02z000ngy63nk4hq6cv0drn5jcm4il4c4pbrc39byaq9ihf0iy3c"; depends=[naturalsort nloptr Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
   catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; };
   catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
   catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; };
-  catchr = derive2 { name="catchr"; version="0.2.0"; sha256="132mldi195xx0ywmms6fc9dgj2s9nyb1i1b39yry3kl5gvxmd07s"; depends=[purrr rlang]; };
+  catchr = derive2 { name="catchr"; version="0.2.1"; sha256="00h7gizv90zq78a80pqvp78f2l55xxnmya2g275pj84dqj1g9pfb"; 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]; };
@@ -5621,13 +5700,15 @@ in with self; {
   ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; };
   ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; };
   cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="1.1.0"; sha256="1h11g3cj53a1m8ra8j0brlbxg95h2x2x63fg4zcr20jvx2zlwsg8"; depends=[rquery wrapr]; };
+  cdata = derive2 { name="cdata"; version="1.1.1"; sha256="03kfhpi5cbj2rwjmhrd8h95frz68p82as1wi4js0pgb0vj7hjq6h"; 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]; };
+  cder = derive2 { name="cder"; version="0.1-0"; sha256="1cbvb8va9if520a5wg568cd06dyf3p477ma534ygapckajy9mbv1"; 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.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; };
+  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=[]; };
@@ -5646,6 +5727,7 @@ in with self; {
   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]; };
   censusr = derive2 { name="censusr"; version="0.0.4"; sha256="1n9571fyr46wj1dcxc2xgns9865655yzlq7yfz8im014wh0ycwqc"; depends=[dplyr httr stringr]; };
+  censusxy = derive2 { name="censusxy"; version="0.1.1"; sha256="16mk90xksk0v5zbrlkd91ddqjca97n2vv11h1sr18ay8208l5vji"; depends=[dplyr httr readr rlang sf tibble tidyr]; };
   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]; };
@@ -5653,6 +5735,7 @@ in with self; {
   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]; };
   cepreader = derive2 { name="cepreader"; version="1.1-3"; sha256="0jqmz3gm6fprfjjzw22qdk055csvy1np7vm0mjjsnpim7js5xvc2"; depends=[]; };
+  ceramic = derive2 { name="ceramic"; version="0.6.0"; sha256="0n0l1b7gb05kqjrh696faq868q3nbwlg34y6wgr0w205kdq6qs17"; depends=[curl dplyr fs glue jpeg magrittr png purrr rappdirs raster reproj rlang slippymath sp spex tibble]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
   cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; };
   ceterisParibus = derive2 { name="ceterisParibus"; version="0.3.1"; sha256="1vysa4yq5qjvhpl0x3snaqa45ywsn8hhpnc657v02kvvzlgx508j"; depends=[DALEX ggplot2 gower knitr]; };
@@ -5670,7 +5753,7 @@ in with self; {
   cgmanalysis = derive2 { name="cgmanalysis"; version="2.4"; sha256="17njw0abcmfwaqhglfnmgmbyp4zxjmxbchjiabsv6nan1scl9z43"; depends=[gdata ggplot2 lubridate pastecs pracma readr zoo]; };
   cgraph = derive2 { name="cgraph"; version="4.0.3"; sha256="0q3zfwa910h1y8hgm5pam8jnqak9zvkq55bkary0h3kglmg25p67"; depends=[]; };
   cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; };
-  chandwich = derive2 { name="chandwich"; version="1.1.1"; sha256="0dpd1b9bq9i8a9wlmid6rvhpmvxj8dilv9xppmzr0jrh0nrcj9yx"; depends=[numDeriv]; };
+  chandwich = derive2 { name="chandwich"; version="1.1.2"; sha256="196k13qg9kl94yki989ncx2mrvvj82vv8mi453s8lqmv9s875841"; depends=[numDeriv]; };
   changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; };
   changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
   changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; };
@@ -5684,8 +5767,8 @@ in with self; {
   chebpol = derive2 { name="chebpol"; version="2.1"; sha256="0dvmdcrdk7mc2gxbmz645x42rras8iqdp8yzg1kslcynaj665arb"; 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.3"; sha256="15ccwvmw73c2zz1k10k5zdn8px0rrbnvs1b4nzvlb0iwj7cimhp4"; depends=[backports]; };
-  checkpoint = derive2 { name="checkpoint"; version="0.4.5"; sha256="0ml6lr8vmnrj2d073mr6dxsy0sqf50vyc956j9pnmzan2k7qv2wc"; depends=[]; };
+  checkmate = derive2 { name="checkmate"; version="1.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.4.6"; sha256="1cpb0dm5f0y08zlv8w1fyqpgw431avg9dcbbs9z0v95ibkdmw6px"; 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]; };
@@ -5736,7 +5819,7 @@ in with self; {
   civis = derive2 { name="civis"; version="2.0.0"; sha256="1hbwbpwbnlg08gh8fg15fa254m7ibnq7x020yd4q75pzbdwlj4v2"; depends=[future httr jsonlite memoise]; };
   cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; };
   ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; };
-  ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
+  ckanr = derive2 { name="ckanr"; version="0.3.0"; sha256="0qbsq40yxy9j7q49k5712gk8iv0c7rcr8w0hnv410035i1rddlfj"; depends=[DBI dbplyr dplyr httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
   cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; };
   clam = derive2 { name="clam"; version="2.3.2"; sha256="1za0njc10mcvdmyyy4yy6sgzl6kk2kix319w84d5mcs2zrfb83j4"; depends=[]; };
@@ -5750,7 +5833,8 @@ in with self; {
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
   classyfireR = derive2 { name="classyfireR"; version="0.2.1"; sha256="0a3di6agn6vvyzx1w8c3wcij6l313hnaxdbhpfa72rlsfdj68mqn"; depends=[clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; };
   cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; };
-  cld3 = derive2 { name="cld3"; version="1.1"; sha256="00jbncap8h0s26iw5i0891rag5gpf1n3s9imn6n0zbwdn1791ayr"; depends=[Rcpp]; };
+  cld3 = derive2 { name="cld3"; version="1.2"; sha256="11bjkbhjxaf6lc96qm8zk4k1i66b69f8dmc303i1560b2jj2zah3"; depends=[Rcpp]; };
+  clean = derive2 { name="clean"; version="1.0.0"; sha256="09nm205hszcmhs227ia1lhigrnkkwh45rjrxp31gmxipz5gbw32p"; depends=[crayon knitr rlang]; };
   cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; };
   cleanNLP = derive2 { name="cleanNLP"; version="2.3.0"; sha256="0d3v87ylp5vxkg6x5wfc1v482a3wcy02bb5xl3k2s8jpsawf2vxd"; depends=[dplyr Matrix stringi]; };
   cleancall = derive2 { name="cleancall"; version="0.1.0"; sha256="0g52nvr8fnwlhfzx0ja87xkg4ff3jafj08qz9xkwc790zfszc6z1"; depends=[]; };
@@ -5779,7 +5863,7 @@ in with self; {
   clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
   clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; };
   clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; };
-  clipr = derive2 { name="clipr"; version="0.6.0"; sha256="0k9kimkmmj9k7290sxiqn4kd1vvm4w7q9a44wp0w30b7yjpavx2m"; depends=[]; };
+  clipr = derive2 { name="clipr"; version="0.7.0"; sha256="1qn2p13d0c1bpqss6mv9hk60980rzhznfqpyaf5x0fy65svy9903"; depends=[]; };
   clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; };
   clogitL1 = derive2 { name="clogitL1"; version="1.5"; sha256="0y6a6s5l98i0vrj66biwr17g6pzpmm5kfz4c57af0yhv7c4s4was"; depends=[Rcpp]; };
   clogitLasso = derive2 { name="clogitLasso"; version="1.1"; sha256="1j2kscd6d1jham6yqx5rp78x5vfj2faylkxkbcjaqbynlnqbbxd0"; depends=[foreach lassoshooting]; };
@@ -5789,7 +5873,7 @@ in with self; {
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
   cloudml = derive2 { name="cloudml"; version="0.6.0"; sha256="0p34wrrs06c17lbjlkjhm04ffg3l3zfkxb7swikjbim0j5aww2kh"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.11"; sha256="0xwwv4ccflrrapqlzwccblyhda5bmbhs7agwwwjriwxnhxghlpbm"; depends=[]; };
-  clr = derive2 { name="clr"; version="0.1.1"; sha256="1vg9c8w25ac3l9wh8prv8h6ghxfslag301bbrsy6zcsfg4rjm0y8"; depends=[dplyr lubridate magrittr]; };
+  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]; };
@@ -5817,13 +5901,13 @@ in with self; {
   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.6"; sha256="0c0br3nf5zgq5d4119sr4cmm1hq9f1ayphi0j4n5dzpwc8kq4518"; depends=[ggplot2 reshape]; };
+  clusterlab = derive2 { name="clusterlab"; version="0.0.2.7"; sha256="18np2laaarv2iarlyq71ddazkpchfv6bylfxlxhvg3jbb68vrwj5"; depends=[ggplot2 reshape]; };
   clustermq = derive2 { name="clustermq"; version="0.8.8"; sha256="0znyfrsnzrvizpazk8630szln3gxqm5c47x1z1749bqciy39g25m"; 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=[]; };
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
-  clustrd = derive2 { name="clustrd"; version="1.3.1"; sha256="0a354lfcc8sky4ijxq3vynh169fgb4if4v80i8m7nyni5gs7w4kw"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; };
+  clustrd = derive2 { name="clustrd"; version="1.3.2"; sha256="06i8rny2fbpk32mj0r1br9dymf2y98xjzbj7cikyp7k481693a0m"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; };
   clustree = derive2 { name="clustree"; version="0.4.0"; sha256="0lcky7sacp2m3mrxcp7h6xs8x7l97w6qi3277wddvs4q3v0q8hkb"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; };
   clustringr = derive2 { name="clustringr"; version="1.0"; sha256="07f0ywpkf8igic7ijvvrjlngq3smjcv9nqnah41fp6wfgvh49ifq"; depends=[assertthat dplyr forcats ggplot2 ggraph igraph magrittr rlang stringdist stringi stringr tidygraph]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
@@ -5835,7 +5919,7 @@ in with self; {
   cmenet = derive2 { name="cmenet"; version="0.1.0"; sha256="19cqd3ppama2g4a7mwnq4fry0nzkyny1z1irln3xqd22gb8lz38r"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo]; };
   cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; };
   cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; };
-  cmna = derive2 { name="cmna"; version="1.0.0"; sha256="1x4w47j39p2f2n4jxrp4r1vw6gvpqzkgr5h158s18z26zllpvrnr"; depends=[]; };
+  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]; };
   cmprsk = derive2 { name="cmprsk"; version="2.2-8"; sha256="1nacbzx950ygaqgnj0949skhwpzar5i3xlscd44jsimk2gsppx6z"; depends=[survival]; };
@@ -5848,20 +5932,20 @@ in with self; {
   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.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
+  coala = derive2 { name="coala"; version="0.5.3"; sha256="02gfw20lhwdz9mbdwgla6kcvi84sjy916vxb9zwdgair493z3cay"; 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.5"; sha256="0s91yg60cpnn2fd185m7bww93kls4qlcq6bcy5nr5kmgiscril3p"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
+  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.7.0"; sha256="02d7p242kz95j41cqcjhrs2bsfwpjf7512rn0g1smwn78axq30f0"; depends=[backports crayon ggplot2 ggstance]; };
   cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
-  cocktailApp = derive2 { name="cocktailApp"; version="0.2.0"; sha256="05jw72v7gayyfflyy5g249d4sl689a55bf7ycijiks2s5gbj68b6"; depends=[dplyr DT forcats ggplot2 magrittr shiny shinythemes Ternary tibble tidyr]; };
+  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]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
-  coda = derive2 { name="coda"; version="0.19-2"; sha256="03fs3sdrrym3is92dgpa6ydk3m63gaihwy7bva4k0wm2hxm7x2k7"; depends=[lattice]; };
-  coda_base = derive2 { name="coda.base"; version="0.1.12"; sha256="00cijr1x6w7frd7qrfyir29rh2747m926rf3h2izmx08kxjnsgc8"; depends=[MASS Rcpp RcppArmadillo]; };
+  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]; };
   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]; };
@@ -5883,6 +5967,7 @@ in with self; {
   coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.2"; sha256="1r3r5ifl663pdmkvkrf6yhdg1kwmwdjg9kvp0ykbdvpbvqjcjhkv"; depends=[curl 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]; };
   colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; };
   collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; };
   collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.7"; sha256="0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343"; depends=[data_tree htmlwidgets]; };
@@ -5890,7 +5975,7 @@ in with self; {
   collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; };
   collections = derive2 { name="collections"; version="0.1.6"; sha256="1wd2wz6xg7nk54kwb142fw8qi0zbwk3j07v0kj7myradhcs6a29b"; depends=[R6]; };
   collector = derive2 { name="collector"; version="0.1.2"; sha256="02w4rlxqmag43qb424hpnqpb8rnkgkx7rz2g8hnp9iyj7h125p94"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; };
-  collidr = derive2 { name="collidr"; version="0.1.0"; sha256="1mdwy7fw2sy5gv2skw5vxz0xnnmh0v4jd7xn2dkrvrnclz5sl4ah"; depends=[dplyr stringr]; };
+  collidr = derive2 { name="collidr"; version="0.1.1"; sha256="08rmasvm9c01li29c1k8hbmcjnks6k9himxc6j6789iz48pzccpj"; depends=[dplyr jsonlite stringr]; };
   collpcm = derive2 { name="collpcm"; version="1.0"; sha256="15k6khsgikjpsasyz02bhgd43nij2n7nl0m0sgxvjlcn0nv95y2n"; depends=[latentnet network vegan]; };
   colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
   coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; };
@@ -5925,7 +6010,7 @@ in with self; {
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
   commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; };
-  commonsMath = derive2 { name="commonsMath"; version="1.2.2"; sha256="0vayi4s3nbja3lxx1y98ld6mrn6zpvydf5acvd43v6jc18qa821n"; depends=[]; };
+  commonsMath = derive2 { name="commonsMath"; version="1.2.4"; sha256="12hwl3xjm7kl5y36v3y4jyr2gk4l87mff237qms2hy8y41nwwagr"; depends=[]; };
   comorbidity = derive2 { name="comorbidity"; version="0.4.1"; sha256="0dgbhbm5jjxqy6spm0sw9gmx6v0b426m6aj6gr9jjnd06vraw6pc"; depends=[checkmate stringi]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
@@ -5947,7 +6032,7 @@ in with self; {
   complmrob = derive2 { name="complmrob"; version="0.6.2"; sha256="0r8yz1zsqd030k0qqsfvqh9z5vx632cwynnz5ch6ndg6g89baxmf"; depends=[boot ggplot2 robustbase scales]; };
   compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
   compositions = derive2 { name="compositions"; version="1.40-2"; sha256="12mp05yi7jkdqg9iwh6bc9sx6sdxagcnrirznxy9hq8502p7238i"; depends=[bayesm energy robustbase tensorA]; };
-  compound_Cox = derive2 { name="compound.Cox"; version="3.17"; sha256="04fgxs522gqm28lbsa0qr8mlpnlzpxfdisax3l1mpy7j8kxy22ys"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.18"; sha256="1ksgh94k2qqq6xs9fdar88564pkdgsvbqs4yrkah6q60n406qh7r"; depends=[numDeriv survival]; };
   comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; };
   compstatr = derive2 { name="compstatr"; version="0.1.1"; sha256="0lamnhch443rz01gpjyyva7k7fcxg4ca7szxzxvwpmln5vvpsagr"; depends=[dplyr fs lubridate purrr readr rlang sf stringr tibble tidyr]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
@@ -5960,7 +6045,7 @@ in with self; {
   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="1.0.6"; sha256="05xflwjn2w9v3xr02kas1l70hk4i4pyvbry8lzid0f40iv8h7b4a"; depends=[ggplot2 metafor]; };
+  concurve = derive2 { name="concurve"; version="2.0"; sha256="090j7fv9c1m13xynq5sdrdrl0g2c1lamlb2nwg5xsjlv93ckm3az"; depends=[dplyr ggplot2 metafor scales survival survminer tibble]; };
   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]; };
@@ -5973,7 +6058,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.0"; sha256="16qyhydxwz4wdgckvrqcypdybb4rcyh99f3w3xghxjai20qskadj"; depends=[fitdistrplus SDMTools STAR statmod]; };
+  conf = derive2 { name="conf"; version="1.6.1"; sha256="07fhdk5ccak3pv3rf0ail46v822m8ycq8la1qivhl6jzi7ga45x9"; depends=[fitdistrplus SDMTools STAR statmod]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
@@ -5994,11 +6079,12 @@ in with self; {
   constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
   container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; };
-  contextual = derive2 { name="contextual"; version="0.9.8.1"; sha256="1phcbqsa01qz2m5zd4s3nzf06szwyhh231hlqnarqvhn38lynsa9"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; };
+  contextual = derive2 { name="contextual"; version="0.9.8.2"; sha256="03123mghmixy9v2c5lqg0df5ycxa09mir94rkjgs8lp62ncq170r"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; };
   contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; };
   conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; };
   contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; };
   contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; };
+  contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; };
   control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; };
   controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; };
   convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; };
@@ -6012,7 +6098,7 @@ in with self; {
   coop = derive2 { name="coop"; version="0.6-2"; sha256="052n2h7yhjj88x87sd3ci9ahhhn5r5rvsm79kh3r2zqbxsr8zzrh"; depends=[]; };
   coopProductGame = derive2 { name="coopProductGame"; version="2.0"; sha256="1348pgqfvvysdixsjibgkvwjsmqasnlmwf9kyr39lw8jb81z25h0"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
-  copBasic = derive2 { name="copBasic"; version="2.1.2"; sha256="0h73lnxjf2mji8x2jl0r9559a4sgj1pxivp89hmmnj8zl4b4c3gl"; depends=[lmomco randtoolbox]; };
+  copBasic = derive2 { name="copBasic"; version="2.1.4"; sha256="0bcnpqc54lxgnxr6zgp2rz8vcbsicnjcs3vs3lsdhymlxifps7la"; depends=[lmomco randtoolbox]; };
   copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; };
   cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; };
   coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; };
@@ -6039,14 +6125,14 @@ in with self; {
   corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; };
   corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; };
   corpustools = derive2 { name="corpustools"; version="0.3.3"; sha256="1hgcwnjhqfyylvqcy2j5f2k6chwyybnx38vzzvq62s6qf6p9p7by"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi udpipe wordcloud]; };
-  corr2D = derive2 { name="corr2D"; version="0.3.0"; sha256="1dx3mjcbpwmq9iy7rwxn3fghaw9g1m8ksa9gj4yqkagw6k4hjnin"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; };
+  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]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
   corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; };
   correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; };
   corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; };
   corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; };
-  corrr = derive2 { name="corrr"; version="0.3.2"; sha256="1xscrbdhpy3nkm66pb5dg7mrpa2kjy3d2fs1z8q7mm66qr70pnds"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr rlang seriation tibble tidyr]; };
+  corrr = derive2 { name="corrr"; version="0.4.0"; sha256="0zjqkgsnwgcyi8hdskr7in0liqhpj9qml96agawzj11iy0bf6387"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
   cosa = derive2 { name="cosa"; version="1.2.2"; sha256="10cfpzrccqg9i6pb2z1m57lxr7yf7bfdhvcxhmamdn1ps9mjkmlw"; depends=[nloptr]; };
@@ -6055,7 +6141,7 @@ in with self; {
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
   costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; };
-  costsensitive = derive2 { name="costsensitive"; version="0.1.2.1"; sha256="0q50q39wngyqfg4vxhxdb8v64v0ws7njs2zzf6qhlhipqhhxq55n"; depends=[]; };
+  costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; };
   cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; };
   couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; };
   countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; };
@@ -6081,23 +6167,23 @@ in with self; {
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
   covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; };
   cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; };
-  cowplot = derive2 { name="cowplot"; version="0.9.4"; sha256="0yvalwalvyddyqk0q66y8361nxlh2cvp3ssazax9g5q89lghjmzv"; depends=[ggplot2 gtable plyr scales]; };
+  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.2.4"; sha256="147rrr72s55lk18snljy1i66wr9chv2s3mqwxn35gg20nqxjwki4"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
+  coxed = derive2 { name="coxed"; version="0.3.0"; sha256="01fwkw6ba8zj09a7mzm7rja188rapd6knwjq247pm4panqih8m5l"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
-  coxme = derive2 { name="coxme"; version="2.2-10"; sha256="12p41qc3ryxdcw2zljgvw2gk1wl1pj7h61naqbyc1h0l3dqy8dg2"; depends=[bdsmatrix Matrix nlme survival]; };
+  coxme = derive2 { name="coxme"; version="2.2-14"; sha256="0pcmf44c3v1hvr8031lwgib58j6la5hsphsbc57mcgz09ppw30zg"; depends=[bdsmatrix Matrix nlme survival]; };
   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.1"; sha256="0srlpbxzqgbwhdj1fr4lkfxyf7zn6sm2aim2xmabri41zzl77mhx"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; };
+  coxrt = derive2 { name="coxrt"; version="1.0.2"; sha256="0sj99jfnbd20k81pax3f614z0kafmvmglkykh10nadyc0g2sv5mm"; 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=[]; };
   cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
+  cpcens = derive2 { name="cpcens"; version="0.1.0"; sha256="18hv659021wmw4v69xf0k5bq4dvyjkz9gmad0a8fr1ym1qr0ip8i"; depends=[cents Rdpack tbart]; };
   cpd = derive2 { name="cpd"; version="0.1.0"; sha256="1qcyb7n69ppa0py7w31msim7gf2wdh94hmsilsdk8ivxljc1gv8n"; depends=[fAsianOptions Rdpack]; };
-  cpgen = derive2 { name="cpgen"; version="0.1"; sha256="1cp3d6riy65lc1mfrxh92lc6f1qal7amhjilfzz0r529j5fipd2v"; depends=[Matrix pedigreemm Rcpp RcppEigen RcppProgress]; };
   cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
   cplexAPI = derive2 { name="cplexAPI"; version="1.3.6"; sha256="1yj0ighr64v1wdz40ml8dmypa01r6r9lr59fc0mfq4n1l0df62gw"; depends=[]; };
   cplm = derive2 { name="cplm"; version="0.7-8"; sha256="0gvl3xwqbyqgqd42l97ryy8qsf23njqfgvc16w21124s77wsixaw"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
@@ -6111,25 +6197,26 @@ in with self; {
   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]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
-  cquad = derive2 { name="cquad"; version="2.0"; sha256="0y2vwlbplp8b9xpv3byy3nah3xa3jwv57jaqqmjjwaw8m3q8ss9v"; depends=[MASS plm]; };
+  cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; };
   cr17 = derive2 { name="cr17"; version="0.1.0"; sha256="1zyq77gxycbwyqhv5w0zw4n7v3ipjs6rcbja43g0k5q8h0gjnnn1"; depends=[cmprsk dplyr ggplot2 gridExtra gtable scales survival]; };
   cramer = derive2 { name="cramer"; version="0.9-3"; sha256="1kdad8nndhics4282gfy9ncllk2kpawdy8ybq71vcd7hc7kf0zq5"; depends=[boot]; };
   crank = derive2 { name="crank"; version="1.1-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; };
   cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.1"; sha256="02d9qrqyjj33naq3g7ykaw9dzzl1dq8qf13id6h7kfx1fvx9b7zd"; depends=[httr jsonlite]; };
-  cranly = derive2 { name="cranly"; version="0.3"; sha256="1kv2281awvd4xc657wprbsy13smx6779msnczby7sw0x87y5k0x1"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; };
+  cranly = derive2 { name="cranly"; version="0.5.3"; sha256="15ngklyqjp0yxz42ijhfpvraxd549fidj1k4b1s1v3iilwvsd7q4"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr tm visNetwork wordcloud]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
+  crassmat = derive2 { name="crassmat"; version="0.0.6"; sha256="1c4ii34vh8y5b3z2maby4cafb3n2m9bnxv3762cy0z12mbg7zk1s"; depends=[svMisc]; };
   crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; };
   crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; };
   crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; };
   crch = derive2 { name="crch"; version="1.0-3"; sha256="0f1kby790symj5r3z1dhmnzjs6xbfirsbkzapkmn1hs8i5la2rqr"; 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.0"; sha256="1xcd4ias6wb9k759h7cqzri83153dmgdx1brjlcrpa3gr2gqhjv4"; depends=[car data_table doParallel dplyr foreach gbm ggcorrplot ggplot2 glmnet gridExtra pmml randomForest rpart sqldf stringr xgboost XML]; };
+  creditmodel = derive2 { name="creditmodel"; version="1.1.1"; sha256="06nxbvwlg0j7z3x31jm767faqdfnppbzxzsn3razv35s69sq1k83"; depends=[car data_table doParallel dplyr foreach gbm ggcorrplot ggplot2 glmnet gridExtra pmml randomForest rpart sqldf stringr xgboost XML]; };
   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]; };
   crfsuite = derive2 { name="crfsuite"; version="0.3"; sha256="10mify8y1f6iwfckfrhhhw6j01p1cd9bq5xwcyz121wkfhnny6rx"; depends=[data_table Rcpp]; };
-  cricketr = derive2 { name="cricketr"; version="0.0.20"; sha256="19aih3246mzq7b2cz6gpkyy7y6k480qvnvz1h8f3smdj6c0qnmgj"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
+  cricketr = derive2 { name="cricketr"; version="0.0.22"; sha256="10dfzm297knwcqnznsprrwgrfa83hxqvr3px9mdgqj9q97c2bn3b"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; };
   crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
@@ -6141,6 +6228,7 @@ in with self; {
   crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; };
   cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; };
   cronR = derive2 { name="cronR"; version="0.4.0"; sha256="0ydlwhlzb57vbr8ya6hdsw2mhsjkb01jspn0jw081anrxfy5m2jw"; depends=[digest]; };
+  crone = derive2 { name="crone"; version="0.1.0"; sha256="02k9n6ajfgxkpkssac788dvr4fwjakggh9dim9dzmw2nvir23cc8"; depends=[]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
   cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
@@ -6153,7 +6241,6 @@ in with self; {
   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.1"; sha256="0h6kdi9h16m5n344y59jk2cwrqczhs0gl2a1zg20bxy015jma6hn"; 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]; };
@@ -6163,9 +6250,10 @@ in with self; {
   crseEventStudy = derive2 { name="crseEventStudy"; version="1.1"; sha256="0xq8shwdiri8v35s016g1wfpgbpal4j8psazgwmi9h220rh5b6p5"; depends=[sandwich]; };
   crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; };
   crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; };
+  crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; };
   crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; };
   crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; };
-  crul = derive2 { name="crul"; version="0.8.0"; sha256="0y8n1iy759ln7dvw6v7zz79apkz9yxdy75qx2cagzwayn04h0c25"; depends=[curl httpcode mime R6 urltools]; };
+  crul = derive2 { name="crul"; version="0.8.4"; sha256="12scs09qk9d7jrgs4fn98v4bvjdmphd5nqamb5d2wh387fnm1nfv"; depends=[curl httpcode jsonlite mime R6 urltools]; };
   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]; };
@@ -6192,9 +6280,9 @@ in with self; {
   ctmm = derive2 { name="ctmm"; version="0.5.6"; sha256="04jpmjlpnh8zmk6l14sll945s5bjgkcwnj11yq5297nbggl4wmsx"; depends=[data_table expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape]; };
   ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; };
   ctrdata = derive2 { name="ctrdata"; version="0.18.2"; sha256="1nnqfg7x6wq5lzb4xxb52fb8ljxgnbwswfywv1d4ibcn7m5y0947"; depends=[clipr curl httr jsonlite mongolite rvest xml2]; };
-  ctrlGene = derive2 { name="ctrlGene"; version="1.0.0"; sha256="0gz2js2n990sfwxwigp4dxqcf94f9bzcinyzjign5yvyr53fakvk"; depends=[psych]; };
+  ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; };
   cts = derive2 { name="cts"; version="1.0-22"; sha256="0kcbppfsx1hvnsz6nmj8frrqrglcr6cmasd1ma34qkqb9f6q0xry"; depends=[]; };
-  ctsem = derive2 { name="ctsem"; version="2.9.6"; sha256="01vabpy96a9124nwxrb8l9hhddimj9cqb2fv017kzcvxxqzxa22w"; depends=[BH data_table GGally ggplot2 KernSmooth MASS Matrix mvtnorm OpenMx pkgbuild plyr Rcpp RcppEigen rstan rstantools shiny StanHeaders ucminf]; };
+  ctsem = derive2 { name="ctsem"; version="3.0.0"; sha256="1w8rw7wsgv6vdc1mvpan4yz0rx4nnrizv7n4371pkrnx1j7vj23j"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm OpenMx pkgbuild plyr 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]; };
   cubeview = derive2 { name="cubeview"; version="0.1.0"; sha256="1gy023qnkxmkfmcrihjlwd504z7n3c4a8baxa2wkz0l45pf4y2c1"; depends=[base64enc htmltools htmlwidgets lattice raster viridisLite]; };
@@ -6204,7 +6292,7 @@ in with self; {
   cumSeg = derive2 { name="cumSeg"; version="1.2"; sha256="0ix8g3w04n799pppyhyd365bdx9cwrgn7k7qljs1fdiq8s135wzk"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
-  curl = derive2 { name="curl"; version="3.3"; sha256="1gd5i25anzi28lg1f8p7g63z9d46xi0qaw4lxpml5p0f52lvkc0c"; depends=[]; };
+  curl = derive2 { name="curl"; version="4.0"; sha256="0wb1j87fa2nd4a9x1w2nmc453nzvx6qiq8dviwc4jr36hsf9ra89"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
   curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; };
@@ -6220,11 +6308,13 @@ in with self; {
   cutpointr = derive2 { name="cutpointr"; version="0.7.6"; sha256="0mwpl807h8mdzlw710jngwimwgq4hns79mv2pd5lh36pd9s5qx6b"; 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=[]; };
   cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
   cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; };
   cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; };
   cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; };
   cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; };
+  cvms = derive2 { name="cvms"; version="0.1.1"; sha256="11kszmhibds0axy0ha78bc6y1bwj19k93zirfp7a00c5hwvd3jnf"; depends=[AICcmodavg broom caret data_table dplyr ggplot2 lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; };
   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]; };
@@ -6247,17 +6337,17 @@ in with self; {
   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.5"; sha256="061226iwmir3d1crh449mrbrrqfccknyflqhnbmzn9by5pmq1qf7"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.8.6"; sha256="0vcmiyhd000xyl28k6rm7ba50x5sz5b2cpllxnq36q13qhdnqw6k"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
   dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; };
-  dLagM = derive2 { name="dLagM"; version="1.0.12"; sha256="1x0r0r7sspk4wjz0lag93030r4caxna9i85cbfbnc4dj2vjvc801"; depends=[AER dynlm formula_tools lmtest nardl plyr strucchange wavethresh]; };
+  dLagM = derive2 { name="dLagM"; version="1.0.15"; sha256="188hm82f6g0n3asj560kbxlqbhikvnn4a375ph1kd13zdijjyj3i"; depends=[AER dynlm formula_tools lmtest nardl plyr 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.3"; sha256="006sm1npxi812x3yd8cnd1hrz85j44wn5vz3kid8hw5yxm10l6nn"; depends=[]; };
-  dabestr = derive2 { name="dabestr"; version="0.2.1"; sha256="1j4n4976dw9vv76c1d5ih52a9ln5wbni71fbk4gpnacpkzj15m2m"; depends=[boot cowplot dplyr forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; };
-  dad = derive2 { name="dad"; version="3.2.0"; sha256="1qg60jwfl8c2ak2989zcm7ab7hcbs78hxzpm4yavn37av2ajbymp"; depends=[e1071 lattice]; };
+  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.0-32"; sha256="0syv6kjnicb0x7sxbaavxhiv9mcqvc2zzbf4wyar933q3hzrxnrd"; depends=[ggplot2 plyr]; };
   daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; };
   daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; };
@@ -6266,7 +6356,7 @@ in with self; {
   dagitty = derive2 { name="dagitty"; version="0.2-2"; sha256="11jpjr2l89glr9962mbhy4dfbdjs80nf603w90xx16s4qcmcsghc"; depends=[boot jsonlite MASS V8]; };
   dalmatian = derive2 { name="dalmatian"; version="0.3.0"; sha256="06j7ampp0hwjqgw2agplfc8mngxnb6g4yv3l08plg35769jxxz7f"; depends=[coda dglm gdata ggmcmc rjags]; };
   dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; };
-  damr = derive2 { name="damr"; version="0.3.3"; sha256="1r3d937m28zz2afkflp3601wvqhqka6g2qqcp018a912whlsp3sf"; depends=[behavr data_table readr]; };
+  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.10"; sha256="1q4378wvn0fmvm3gqb0si9x5sq0dh6mkxzhxbh570npjhb15p272"; depends=[]; };
   dani = derive2 { name="dani"; version="0.1-0"; sha256="05npr3i49wn01rbcsr1pfbb0d5l8c0pz48q961v28s6kdxp0vwr3"; depends=[Epi]; };
@@ -6280,9 +6370,9 @@ in with self; {
   data_tree = derive2 { name="data.tree"; version="0.7.8"; sha256="05svd1h70dn92imadw2djqqvchx30md74d4z6a00grkajj16cchb"; depends=[DiagrammeR R6 stringr]; };
   data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; };
-  dataMaid = derive2 { name="dataMaid"; version="1.3.0"; sha256="169ih8y09ws1xs77fi0w6b5gb7q94d8iag216dd8v7kd968401dx"; depends=[DT ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; };
+  dataMaid = derive2 { name="dataMaid"; version="1.3.2"; sha256="10c5b1xp1mca5h0vdqikfn549jf981xk7c2rcpq71rf0fng93qz6"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase stringi whoami]; };
   dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; };
-  dataPreparation = derive2 { name="dataPreparation"; version="0.4.0"; sha256="1zr6qx934vw6rxmx2bi6d9i1ykaxdc5x568djnhvjc7vz7dfcb6r"; depends=[data_table lubridate Matrix progress stringr]; };
+  dataPreparation = derive2 { name="dataPreparation"; version="0.4.1"; sha256="0jxfvsx7wvsnhvlxb65a041pd3va7slryrblpbpj5xbnbdpyi4i7"; depends=[data_table lubridate Matrix progress stringr]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
   dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.5"; sha256="0aagj04x5792rp73h5lwvrx63nh739jn3cmhhrzchm9symq8x8mx"; depends=[curl httr jsonlite lubridate readr xml2]; };
   datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
@@ -6301,7 +6391,7 @@ in with self; {
   datapackage_r = derive2 { name="datapackage.r"; version="0.1.1"; sha256="1f5mm3cb2yz3dzxj26pp7w1rb8jccyj7zjl602d3mcfxc9d99643"; 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]; };
   datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; };
-  datarobot = derive2 { name="datarobot"; version="2.13.0"; sha256="0q3nj0sffphi8zhlxpsjx08b377cgnq7xgkrmcjq6zbjdf2j0m77"; depends=[curl httr jsonlite yaml]; };
+  datarobot = derive2 { name="datarobot"; version="2.14.1"; sha256="1k5rrwhbxa7x8j6mr35f7245ljxnvs219f2zhi5di4iljzy4phvy"; 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]; };
@@ -6317,20 +6407,20 @@ in with self; {
   datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; };
   datos = derive2 { name="datos"; version="0.1.0"; sha256="01pfvdz9vy4dqjb90j8bz39nvnk5ql6yags1nip4049999w1lswk"; depends=[tibble yaml]; };
   datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; };
+  datrProfile = derive2 { name="datrProfile"; version="0.1.0"; sha256="1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil"; depends=[dplyr odbc RSQLite]; };
   dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; };
   dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; };
   daymetr = derive2 { name="daymetr"; version="1.4"; sha256="1xrkdjarkkikjbsxcjvhfba1dzrxh2nq7c04rvl0rkxh513sfqn1"; depends=[httr raster sp tibble tidyr]; };
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
-  dbarts = derive2 { name="dbarts"; version="0.9-12"; sha256="0jc2gp42hyd0bqkvcdps7kh78wkyxx2g5i989ns6riw8n2pn1xxf"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
   dbhydroR = derive2 { name="dbhydroR"; version="0.2-7"; sha256="1yp3n8hw2dc1ar3nz5k5zvj7s8f1bjckxrd0jnbxv73il75gx4k0"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
   dbmss = derive2 { name="dbmss"; version="2.7-0"; sha256="0fhvbn5v4b5n447hwljdzwfb68bpmrskwd7ni1vpqwcbix903rm4"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils]; };
-  dbparser = derive2 { name="dbparser"; version="1.0.1"; sha256="1g79qayw24bwdccwbsskp8grsb5zj8gi9svwa6c03m86c5j1v19q"; depends=[DBI dplyr ggplot2 odbc purrr tibble tidyr XML]; };
-  dbplot = derive2 { name="dbplot"; version="0.3.1"; sha256="1mx87cr08xliqz09qmrx8pcxxj2jm9aml5wp9p41ns210wc9mjdy"; depends=[dplyr ggplot2 purrr rlang]; };
+  dbparser = derive2 { name="dbparser"; version="1.0.3"; sha256="1yv4nbaigc9x0p8s68i4nkmvrp23qpd2awraks4d3pnmwc2jy94b"; depends=[DBI odbc purrr 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]; };
   dbscan = derive2 { name="dbscan"; version="1.1-3"; sha256="1q0vlrp0abzci2zsjgh7jp3sk1wflcvwjmy9fp0gsay8sgdcixgk"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; };
@@ -6347,15 +6437,16 @@ in with self; {
   ddalpha = derive2 { name="ddalpha"; version="1.3.9"; sha256="1vzs0cvl6xw3h9i00rg3hs02xwgxcnh8326y10kxmhs3qq4m7nb2"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
   dde = derive2 { name="dde"; version="1.0.0"; sha256="0fsj7n66j0dhp65c6f9k0dsrkklj1hy4w376j150f91jc7m3wliv"; depends=[ring]; };
   ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; };
+  ddpca = derive2 { name="ddpca"; version="1.0"; sha256="02dfpx696canbdyiz6fn9qk5qrn53ghv2asa6737l59xs92rzdm2"; 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]; };
   ddsPLS = derive2 { name="ddsPLS"; version="1.0.61"; sha256="18q2mzpn0h93bxx1igms379nfs1d28jdngd8y5gcsjyway5yi392"; depends=[doParallel foreach MASS RColorBrewer Rdpack]; };
   ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
   deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
   deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; };
-  deSolve = derive2 { name="deSolve"; version="1.23"; sha256="0wv11az0gx0r8n0pyxrvh8i5gz795dfdai73ggmskks5h2bvn6cg"; depends=[]; };
+  deSolve = derive2 { name="deSolve"; version="1.24"; sha256="0hkvspq0fp8j64l9zayab2l2nazazhwfgfym0jllh0xv5a12r99s"; depends=[]; };
   deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; };
   deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
-  deaR = derive2 { name="deaR"; version="1.0"; sha256="0wmkqcv4cwlfrwzr4j4g8myhq0lj0p742p2w6h5w6y0bjxzkf9aj"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; };
+  deaR = derive2 { name="deaR"; version="1.1.0"; sha256="0q36cfjb1vypn2d581rpfilzspvxmfb97phcnvp2w6l98kx8gcvj"; 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=[]; };
@@ -6385,7 +6476,7 @@ in with self; {
   deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; };
   degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; };
   deisotoper = derive2 { name="deisotoper"; version="0.0.7"; sha256="0lpmx3qy44xjlil4nsbvcbczxq22vr8xn6v9a5bdx7cd31qwm2l3"; depends=[rJava]; };
-  deldir = derive2 { name="deldir"; version="0.1-21"; sha256="03392pl6j8rm3n32xrfkyfx866k1vm5sj87pva70yyiwh70vrnmr"; depends=[]; };
+  deldir = derive2 { name="deldir"; version="0.1-23"; sha256="0790dwxb2mz1ffz8gd5vwdr0if2q76dzy3vab5rsykf9kz72n4g0"; depends=[]; };
   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]; };
@@ -6397,7 +6488,7 @@ in with self; {
   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]; };
   dendextend = derive2 { name="dendextend"; version="1.12.0"; sha256="0mgsc9qkr5p6hss3wychdjvk263ay48yx543wawj72l7q7cgx1xl"; depends=[ggplot2 magrittr viridis]; };
-  dendroTools = derive2 { name="dendroTools"; version="1.0.5"; sha256="060zrhwgsqd2z0jvdrprjhv7pp6jp3gjmfhbmvfsmmdsbn1rspbi"; depends=[brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales]; };
+  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]; };
   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=[]; };
@@ -6409,9 +6500,10 @@ in with self; {
   densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; };
   densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; };
   denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; };
+  denvax = derive2 { name="denvax"; version="0.1.0"; sha256="0r8w5b80abrbf0qyvlhl0byv3d8lic9jydlisk5yyccfv8wrh1xf"; 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.3-5"; sha256="155bxfyhkmwz3asx1q8myvn3qjb3i2aq7pnw0r7kxygxzn071hkq"; depends=[MASS nnet Rsolnp]; };
+  depmixS4 = derive2 { name="depmixS4"; version="1.4-0"; sha256="0v8hvkg7ia7c6a0x7rw5fddm06vv1n0kwjk7g0kj3g18chvpnvw2"; depends=[MASS nlme nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; depends=[abind circular rgl]; };
   depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
@@ -6420,6 +6512,7 @@ in with self; {
   desc = derive2 { name="desc"; version="1.2.0"; sha256="1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6"; depends=[assertthat crayon R6 rprojroot]; };
   descomponer = derive2 { name="descomponer"; version="1.5"; sha256="1dxnvignd3hwagkghvdiqfrkxlhyvxndprcyh8n9pmq8zgask5qk"; depends=[]; };
   descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; };
+  describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
   descriptr = derive2 { name="descriptr"; version="0.5.0"; sha256="0bbd3h07s4mfhryh6yyvgs4xs0nshxngyapz89jsc1drl3dn6plh"; depends=[cli dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; };
   descstatsr = derive2 { name="descstatsr"; version="0.1.0"; sha256="1pz5lww1dkkqvsq6h0vkch39bj76qffmmag3zlag5in75s4wj0wl"; depends=[moments zoo]; };
@@ -6435,15 +6528,15 @@ in with self; {
   detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
-  detpack = derive2 { name="detpack"; version="1.1.2"; sha256="0vrzg4h80jkkghgm86jfqxshfb4pwqv66d7sndkxh3ji9gfd7d84"; depends=[]; };
+  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.3"; sha256="1ww6ipj314890q0ca0zmwyfq6qs073gwx5vq19n46zpbdd0g6xf1"; 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.5"; sha256="0pv8m9p3j2n1myn2y7mfcv4j59cj4d84gl42fwmyha7hmi0fs8m0"; depends=[ggplot2 MASS shiny]; };
+  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]; };
   devEMF = derive2 { name="devEMF"; version="3.6-3"; sha256="1zyap005md3ylg0d84fkjj3m024j8gmaz310dymgv9zw7hwfb7x7"; 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.0.2"; sha256="028pppj39ng7q17k27531s8k00lmw982vz5krn74n9b8f2azm8lr"; depends=[callr cli digest git2r httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rstudioapi sessioninfo usethis withr]; };
+  devtools = derive2 { name="devtools"; version="2.1.0"; sha256="0393v7nr22gr5g9afgrhq4ab3lwbqy6fd3shnmlhdpqam5357xy1"; depends=[callr cli digest git2r httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes roxygen2 rstudioapi sessioninfo testthat usethis withr]; };
   dexter = derive2 { name="dexter"; version="0.8.5"; sha256="0q7b6ffmz5hfyr0m4b942rxn4xvmdmi84w92d6r8k6m85cgxdy1b"; depends=[colorspace DBI dbplyr dplyr DT fastmatch RColorBrewer rlang rprintf RSQLite shiny shinyBS shinydashboard tibble tidyr]; };
   dexterMST = derive2 { name="dexterMST"; version="0.1.1"; sha256="0i9y5qngg85x6h9zm4rf8p7fydl3s72rmc2bh3qpb9vc8js99m35"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; };
   dextergui = derive2 { name="dextergui"; version="0.1.6"; sha256="1brkkq140z3dv0xflw0dinww2nja9c6iajqv0a0l0m13r1c5caja"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets igraph jsonlite networkD3 RColorBrewer RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; };
@@ -6480,7 +6573,7 @@ in with self; {
   dials = derive2 { name="dials"; version="0.0.2"; sha256="1ip8hdv293lcj0jiycinc66fib1q1vsnb3px26zsmlw49nb32q5h"; depends=[dplyr glue purrr rlang scales tibble withr]; };
   diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; };
   dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
-  diceR = derive2 { name="diceR"; version="0.5.2"; sha256="10bpm5bbfgnm3qnqhrwra0c8bdym3xham7dhsrikwwr18wsi5rqw"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
+  diceR = derive2 { name="diceR"; version="0.6.0"; sha256="1jwgngvajnm80g079z4jks5f3y2hy7hz3h9cf7c6wlb8spmaffxr"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF poLCA progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
   did = derive2 { name="did"; version="1.2.2"; sha256="0slc0rdajwri1zrlxaw251b2xlkc002f67bq5v68iirys3hlm37n"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; };
@@ -6499,7 +6592,7 @@ in with self; {
   diffdf = derive2 { name="diffdf"; version="1.0.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; depends=[tibble]; };
   diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; };
   diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; };
-  diffeqr = derive2 { name="diffeqr"; version="0.1.1"; sha256="1zvjl2i38nyhk63bncqc5cva1m40sm692w7a36qc455s2jnskfh8"; depends=[JuliaCall stringr]; };
+  diffeqr = derive2 { name="diffeqr"; version="0.1.2"; sha256="17h76myfzl4xxd5wrhyd6b0h78dz42j5zac7fb5j0xq2qj6k7l7d"; depends=[JuliaCall stringr]; };
   diffobj = derive2 { name="diffobj"; version="0.2.3"; sha256="17wq3haj2i8x5cy1xx2c8hj2p65hasrjyiqxcq61kzvxd0zyjxzw"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
@@ -6508,7 +6601,7 @@ in with self; {
   diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; };
   diffusionMap = derive2 { name="diffusionMap"; version="1.1-0.1"; sha256="11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j"; depends=[igraph Matrix scatterplot3d]; };
   diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; };
-  digest = derive2 { name="digest"; version="0.6.19"; sha256="1x6cbj9qvkk7pxv9xdqibazw3x8psjp6x0m0ildx1jwyb2ymkl98"; depends=[]; };
+  digest = derive2 { name="digest"; version="0.6.20"; sha256="1irhk2jaj9cg57cxprgyn1if06x121xwcxh1fzzn3148bl5lnrq5"; depends=[]; };
   digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; };
   digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; };
   dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
@@ -6548,8 +6641,10 @@ in with self; {
   disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; };
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
   dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; };
+  distTails = derive2 { name="distTails"; version="0.1.1"; sha256="0i0xajdsbd03jrf0y2vx3hm830n5xy1g0md1bl576g6rdxsvln2l"; depends=[ercv gsl MASS]; };
   distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; };
   distances = derive2 { name="distances"; version="0.1.7"; sha256="1xhv7mf5753d6jnbrmmy6k670li5h2gd8c789mm5w9hxb40rwald"; depends=[]; };
+  distantia = derive2 { name="distantia"; version="1.0.0"; sha256="13klrjqw4xfn4qh1xs2wlcccdrjcihz0zc9mxnf7q5dd1ffwpryw"; depends=[doParallel fields foreach plyr RColorBrewer viridis viridisLite]; };
   distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
   distcrete = derive2 { name="distcrete"; version="1.0.3"; sha256="0sa6z2mpmk51ig1r7bmpbyv2jd8z6z7mixki2vlq1kybg8cx3wmi"; depends=[]; };
   distdichoR = derive2 { name="distdichoR"; version="0.1-1"; sha256="0v19m3n1jgipg65yrv75rm4v27b5aq58cbsmbp7lxvfxmj5ra328"; depends=[boot emmeans nlme sn]; };
@@ -6560,6 +6655,7 @@ 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.0.1"; sha256="142kqbnnl8d80vggmbpg363sqdkhni6rbk25dqkwhryl1y712pib"; depends=[checkmate crayon data_table expint extraDistr GoFKernel 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]; };
@@ -6598,18 +6694,17 @@ in with self; {
   dmm = derive2 { name="dmm"; version="2.1-5"; sha256="1i94bsgc12ysivpy9mdmzcdfki1f84x036danki7ynrbym2b3c7a"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
   dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; };
-  dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
   dnet = derive2 { name="dnet"; version="1.1.4"; sha256="0xccb50a85d9fcxfg0shxf430hzgjyh4qgb3js4sgzi02iagim58"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; };
   dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; };
   doBy = derive2 { name="doBy"; version="4.6-2"; sha256="02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb"; depends=[dplyr magrittr MASS Matrix plyr]; };
-  doFuture = derive2 { name="doFuture"; version="0.8.0"; sha256="17xxykxcn7z11xd401a3z93vj6z08469x9lpib4vjhlskdfjcwsh"; depends=[foreach future globals iterators]; };
-  doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; };
+  doFuture = derive2 { name="doFuture"; version="0.8.1"; sha256="1akjzzqsa768y6d4ligr4mrcb107g5jwcl0rm34hbnqm81qms0bz"; 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.14"; sha256="01qjs4iw9f1kgymcypj0m2s4pvgqhxaycpli0fb8lq3dc0vpzfyb"; depends=[foreach iterators]; };
+  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.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; };
+  doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; };
   dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; };
   dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; };
   docopt = derive2 { name="docopt"; version="0.6.1"; sha256="06zknnd0c5s2y0hbddzdlr3m63ib783izpck6pgz7sjbab5pd068"; depends=[]; };
@@ -6643,9 +6738,9 @@ in with self; {
   dpcR = derive2 { name="dpcR"; version="0.5"; sha256="17l9g11qqs2fkskg331889m8nkkrwzrq0n684rdn62pnd5j2n5pi"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; };
   dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; };
   dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
-  dplR = derive2 { name="dplR"; version="1.6.9"; sha256="0pb2f0f09qwi6az7c0pp28jhv5cgdfy4wqwfsqgkq5nlzlbkbnri"; depends=[animation digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; };
+  dplR = derive2 { name="dplR"; version="1.7.0"; sha256="1ylzki6wvsbcxlz4k532a8yh0kwc6817vkbks7l060acssbycipr"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-  dplyr = derive2 { name="dplyr"; version="0.8.2"; sha256="12z1z2mn4y6dnv56yi6f6f7fw72l4sj3sqkl0cknzn041nrxbdp2"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; };
+  dplyr = derive2 { name="dplyr"; version="0.8.3"; sha256="032c89wa04g9rih9shyvwl3il0bsrv3xk489x6867sk9bb3amd38"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; };
   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]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-9"; sha256="064i122j8vkpjxzfrhp25kb6nv5j3a7s8qk0202x7vnvj9caqjvx"; depends=[cluster oro_nifti]; };
@@ -6659,7 +6754,7 @@ in with self; {
   dragon = derive2 { name="dragon"; version="0.1.0"; sha256="0vnhp901xnvj7w8si8s2nd880c5b1zc30qq61zv7zkxd7bhzxp7g"; depends=[colorspace colourpicker DT igraph magrittr RColorBrewer shiny 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.4.0"; sha256="142wlnwrskjmqk941dqi2vy7q745m007b6yl4pv1lmh68hnfd9is"; depends=[base64url digest igraph rlang storr]; };
+  drake = derive2 { name="drake"; version="7.5.2"; sha256="18ch0wkjv3lc3fhw8msljlqpxlwb9a13m47majgipfm6ylq7nx30"; depends=[base64url digest igraph rlang storr txtq]; };
   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]; };
@@ -6673,11 +6768,11 @@ in with self; {
   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]; };
   drugCombo = derive2 { name="drugCombo"; version="1.1.0"; sha256="0y8zjcbaympczrvr4dfbd1n83iliv5qv4xz9za4zm412c1dkdd24"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; };
-  ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
+  ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; };
   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]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
-  dslabs = derive2 { name="dslabs"; version="0.6.0"; sha256="0s4jqyi654blzjg7ysvwn1adjdnmnrlv4vhpfwy29f4vb7lla9z2"; depends=[ggplot2]; };
+  dslabs = derive2 { name="dslabs"; version="0.7.1"; sha256="1paagq2wxikf1kxplh88iwscfgqsqjyj9c1hh5j843n9vkr4dv3j"; 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]; };
@@ -6687,7 +6782,7 @@ in with self; {
   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="0.3.1"; sha256="0kvds49gx850rmrcja0xr3j9nja5zqnsg1q2zjb07qp425jc3j46"; depends=[]; };
-  dti = derive2 { name="dti"; version="1.4"; sha256="1159qmmjxnnnp5x0z5219ds0jwkhqlaj4x6c5n5fmv505fnlx8cz"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
+  dti = derive2 { name="dti"; version="1.4.1"; sha256="0dwrs6bkrznwybpr5g5hsl6si107l3xwzi4g3wqyx0hr03447p9i"; 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.0"; sha256="1zrgg4pz2zr001bl1rvkqxqpyqch4xp97wwfrn9wkf8ylbl08iqv"; depends=[dfcrm diagram]; };
   dtplyr = derive2 { name="dtplyr"; version="0.0.3"; sha256="04yawjzyij0hlarifb9w4bnxybf73crwidvd5nwclscbis22a29r"; depends=[data_table dplyr lazyeval rlang]; };
@@ -6696,7 +6791,7 @@ in with self; {
   dttr2 = derive2 { name="dttr2"; version="0.0.1"; sha256="042zll9hw4ljwr85x4dmkv8nz6r0mpawaa5s58ngxypshss8sbg0"; depends=[checkr hms]; };
   dtw = derive2 { name="dtw"; version="1.20-1"; sha256="1w301xwizncy5r8v9rwwdxfshydgp3l1pnjla1fjn6n8lx3imjj3"; 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.3"; sha256="0y6841wxkbqvf7878cw8wx0knnizkw1z2n9sk8b1lf7nw8qprj0a"; 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.4"; sha256="0vjgi2j0p1jbbd3dqcrgi9mm6nwyzgjbifyidgdpdshwlxiardvd"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; };
   duawranglr = derive2 { name="duawranglr"; version="0.6.3"; sha256="0swvrdwnbyigsvds3s32nw79b245q3cgv7xskjx7qjcpnvzr7x7q"; depends=[digest dplyr haven readr readxl]; };
   dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
@@ -6704,7 +6799,7 @@ in with self; {
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
   dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; };
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
-  durmod = derive2 { name="durmod"; version="1.0-2"; sha256="0a2q7hza9khfqgi26vaipz71g4yna9a8vhd5yzjkdwx94b3b8dr1"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; };
+  durmod = derive2 { name="durmod"; version="1.1-1"; sha256="0v8ww13d71nlhxz6512hc1cdakvn9mb54npvy3zyc2i73avqgisl"; 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]; };
   dyads = derive2 { name="dyads"; version="1.1.2"; sha256="014gphxkn0wkdq5zgd71vv9dmzyswgpari59w5mf2070c0rr56n5"; depends=[MASS mvtnorm]; };
@@ -6741,11 +6836,13 @@ in with self; {
   eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; };
   eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; };
   eDMA = derive2 { name="eDMA"; version="1.5-3"; sha256="0wyp81si6lcispqng4c7lii22qbyblvijgnlxvcsnkcxj5hpm76j"; depends=[Rcpp RcppArmadillo xts zoo]; };
+  eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; };
   eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; };
   eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; };
   eNetXplorer = derive2 { name="eNetXplorer"; version="1.0.2"; sha256="1rcqy5r3hzra57rdjl477w2khv74s4zk0vcbnp6ypnym0c8k6vzz"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer]; };
   ePCR = derive2 { name="ePCR"; version="0.9.9-9"; sha256="0ix7rvh9w4zcp7k0m5bm16wdjs6yr7wvnsc9mssfrwcjx0p57nlx"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; };
   eRm = derive2 { name="eRm"; version="1.0-0"; sha256="11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly"; depends=[lattice MASS Matrix]; };
+  eSDM = derive2 { name="eSDM"; version="0.2.1"; sha256="0s1njyc5xg8wwq1lhajzqx19i5201i92rvavkghkzd0c13kj8dhz"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis]; };
   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]; };
@@ -6757,17 +6854,18 @@ in with self; {
   easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; };
   easyDes = derive2 { name="easyDes"; version="5.0"; sha256="1msybgv4b7xlvp93lk64mdrqprr5qqc9ma1bz7glchhlkyyl8c21"; depends=[multcomp PMCMRplus]; };
   easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; };
+  easyPSID = derive2 { name="easyPSID"; version="0.1.0"; sha256="10373pbgkgc2aizff54qx95yixlcdbp3xbwlml0lm2rm449bjd6x"; depends=[foreign LaF stringr]; };
   easyPubMed = derive2 { name="easyPubMed"; version="2.13"; sha256="1wd8idyqz7kgygp34mjp2abx82775ry8l07vsqdlqnc6fdnvg55d"; depends=[]; };
   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.0"; sha256="1bbygr512zzlyjzmf5lh9bks2f10k1mja5scrrrgf0ls3gnyw8ln"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; };
-  easyanova = derive2 { name="easyanova"; version="6.0"; sha256="16cypapzrsf70wrpd0rq00kks96rx3kiqnxswd410l6ss2gnni7h"; depends=[car emmeans lme4 lmerTest]; };
+  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]; };
-  easyreg = derive2 { name="easyreg"; version="2.0"; sha256="0qxcrgcc306g4i2wnph94wa7sj06mqxi96cvbpnk9mi46ps0l1kw"; depends=[car nlme]; };
+  easyreg = derive2 { name="easyreg"; version="3.0"; sha256="09gjxwhwdkz2xfrhllf9g6ylvd7xw6sm5m9zn1983d12xld7kfvm"; depends=[nlme]; };
   ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; };
   ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
   eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; };
@@ -6780,7 +6878,7 @@ in with self; {
   ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva Rmpfr RSQLite stabledist xtable xts yaml zoo]; };
   ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
   ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; };
-  echarts4r = derive2 { name="echarts4r"; version="0.2.2"; sha256="1yza82pjix6jfzak64v48801alzdpw7wy0kq5bn9bb5076nml30w"; depends=[broom countrycode d3r dplyr htmlwidgets magrittr purrr scales shiny]; };
+  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]; };
   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]; };
   echor = derive2 { name="echor"; version="0.1.2"; sha256="1b2d8xbjnj3daqini1i3hccnpng0ilz9m6rk6ns8qvz7kpaxkjmn"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang tibble tidyr]; };
@@ -6794,7 +6892,8 @@ in with self; {
   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.1"; sha256="0zzfqzi1nqczxkdqzqa5hblxysjfbn5ad1wrynaziq7b3qgyivwa"; depends=[igraph Matrix_utils rdiversity]; };
+  econetwork = derive2 { name="econetwork"; version="0.2"; sha256="0ilqxyvpkiwhhgml19f1rf08bn061nf76d7fby3084ypgc4iwi1b"; depends=[igraph Matrix_utils rdiversity]; };
+  economiccomplexity = derive2 { name="economiccomplexity"; version="0.1.2"; sha256="1g8f9l5p1jzqf1w81n88idq2kwrvq56ss6mgcm4lcirblcrf2jk2"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; };
   econullnetr = derive2 { name="econullnetr"; version="0.1.0.1"; sha256="1ssgvz17a2cpwag786rc6azi3cz74cc4bxz5jjrn1bfq8ch8xqd3"; 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]; };
@@ -6842,12 +6941,12 @@ in with self; {
   effects = derive2 { name="effects"; version="4.1-1"; sha256="1j3arsysyxssq5rhz779h8ffryxvashxhf5j0z08p2p7xhv7s3ns"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
   effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
-  effsize = derive2 { name="effsize"; version="0.7.4"; sha256="0m9qbcvisrf1d95b9rjj7f63s37wmmzldl05l9l77jws7vxql1hf"; depends=[]; };
+  effsize = derive2 { name="effsize"; version="0.7.6"; sha256="129vs8kp10h6yhrrmn77518120bmfr55l6nkpbxkvylnr641b5a2"; depends=[]; };
   efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; };
   efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; };
   ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; };
   egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; };
-  egg = derive2 { name="egg"; version="0.4.2"; sha256="0ihq8r2hfxj59mswrxb296shz9981wwmywhbnpxrpkmbia701nny"; depends=[ggplot2 gridExtra gtable]; };
+  egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; };
   eggCounts = derive2 { name="eggCounts"; version="2.2"; sha256="0y1335m8cmayaprgkzs7ws959mxlr3l71p203s3n732dz51smmbz"; 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.1"; sha256="0sfms7yvdhqk5qn9dh4j1fp8b2md6l04hdv2psjdzhqyxl29bxfw"; depends=[dplyr igraph network plyr purrr shiny survey tibble tidyr]; };
@@ -6856,6 +6955,7 @@ in with self; {
   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]; };
   eiPartialID = derive2 { name="eiPartialID"; version="0.1.2"; sha256="0721p89llzjznz2b6zlf54v7fy9lb9c5qb7w8q0l582iy5cwaw35"; depends=[eco MASS sandwich]; };
+  eia = derive2 { name="eia"; version="0.3.2"; sha256="1p994salk4rn86fjcwm3m9y5lfalmx0wac3xnrfm48w9qx7ms15z"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr tibble]; };
   eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
   eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; };
   eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
@@ -6868,26 +6968,27 @@ in with self; {
   elastic = derive2 { name="elastic"; version="1.0.0"; sha256="1mq2ayq4dwb1y0dkp3v30qs6vh2d5q4brcifjrvq7wifh4r6gnpk"; 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.0"; sha256="0h3r2vdxn0hygf65cq4p9ff4zh1ndsd7nl7cbwzsnkcnra4grsb9"; depends=[httr jsonlite]; };
+  elasticsearchr = derive2 { name="elasticsearchr"; version="0.3.1"; sha256="0v79kb0w33n7l64ipkq0bd7kp5hmj6cvxf5rflqjd412lnf669q8"; depends=[dplyr httr jsonlite]; };
   elec = derive2 { name="elec"; version="0.1.2.1"; sha256="1gk75y83n6hvv36fp1n6kncln35j6f3ahasnzhc4fp71aq6q6vjf"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
   elect = derive2 { name="elect"; version="1.2"; sha256="1hjqhmdklspssa75x8xdhv2narqgw80qh259hyfwfgnvva97w2ja"; depends=[msm nnet]; };
   elections = derive2 { name="elections"; version="1.0"; sha256="0ig3pd1dw978g2sg4ynzd3p15nk6hx17pxvbxfi5rm131mjdmjdm"; depends=[]; };
-  electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; };
+  electionsBR = derive2 { name="electionsBR"; version="0.3.1"; sha256="0yxaxd84d13mb6xbixgm9rd56alrh5qnrmh54n1h94mna89jb103"; depends=[data_table dplyr haven magrittr readr]; };
   electoral = derive2 { name="electoral"; version="0.1.1"; sha256="0lmw9kwr189dzfxzlns9fmhrdy93ja8jl2s4jir07lichyiavs03"; depends=[dplyr ineq tibble]; };
   elementR = derive2 { name="elementR"; version="1.3.6"; sha256="12gg2x6xzms2ni80qdm04bfajg55ff6zkki0y2cz47kq70wzfkmg"; depends=[abind colourpicker devtools EnvStats gdata gnumeric httpuv lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; };
   elevatr = derive2 { name="elevatr"; version="0.2.0"; sha256="0721w28pb07ndw24k4zssh5r90fd4mf33yxigricnz23z29ql120"; depends=[httr jsonlite progress raster sf sp]; };
   elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; };
   elhmc = derive2 { name="elhmc"; version="1.1.0"; sha256="0ngva7rnfj75fq93ycsv929m9ykijp48r7cvd6sfmi0sqsjinax5"; depends=[emplik MASS plyr]; };
+  elitism = derive2 { name="elitism"; version="1.0.4"; sha256="0n5g1nd1dd5wc76qa2va1lyxahg9p062l8wdqzq43ah6943pjzgr"; depends=[MASS]; };
   elliplot = derive2 { name="elliplot"; version="1.2.0"; sha256="186i4gr8k9bifzssblln8z6wxfmnplls3kc4m2liiz86mzsnim9r"; depends=[]; };
   ellipse = derive2 { name="ellipse"; version="0.4.1"; sha256="0g82vc51m3c1k0hnpp2zla6amxxgk2mmkl8ssnsc49jv3599r6hs"; depends=[]; };
-  ellipsis = derive2 { name="ellipsis"; version="0.2.0"; sha256="0hdk79q4wn5nq52p8qd65kqz81l0b8gfzsbzyvmfais0p24qclib"; depends=[rlang]; };
+  ellipsis = derive2 { name="ellipsis"; version="0.2.0.1"; sha256="0hx9l043433bwm1np9sypph77c7y9dddpz0wrhbkcv01x32jhr8f"; 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="1.1.0"; sha256="0xcbzhmqz5n80ybzhydz3ndzxd72gwadj8g5y4bxxfvf5il1f5yv"; depends=[pROC Rcpp]; };
-  elrm = derive2 { name="elrm"; version="1.2.3"; sha256="0n05x9chr3c8cz38ccbf0vzbazbmwhxmdijn24rb8wl8d8d05kb8"; depends=[coda]; };
+  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]; };
-  embed = derive2 { name="embed"; version="0.0.2"; sha256="0d53cv2c9rpmvvflbdf099r378yvrlvrfpczlmygc7jcd5ijja3v"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr]; };
+  emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; };
+  embed = derive2 { name="embed"; version="0.0.3"; sha256="1kjrnjh683ly3mi4rshyw8hz2sci38n8zmin4llkhgcs249z99hz"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; };
   embryogrowth = derive2 { name="embryogrowth"; version="7.4.1"; sha256="1qha6l7q0565fn9yfvp04dmlpf21hr754gh6fpzhqnrh58h371v1"; 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.5"; sha256="06v982rw8sz22w624hr68vdgxmfmi5na11ywsg6qr77jvgbprgz4"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; };
@@ -6897,7 +6998,7 @@ in with self; {
   emld = derive2 { name="emld"; version="0.2.0"; sha256="08kncxrc4yj32wcl6h1sszrajfi41m87sivc94py40c9bxpmnmmf"; 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.3.5.1"; sha256="0rgzjvmp3yqhwgfg96v17wi8gbafzbrmz134shj2jsf5bsmw6vbj"; depends=[estimability mvtnorm numDeriv plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.4"; sha256="1ynf9hhbch83k63lwps69ijfch30fk5v0sc418ck264c5vih26dh"; 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]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
@@ -6908,7 +7009,7 @@ in with self; {
   emplik2 = derive2 { name="emplik2"; version="1.21"; sha256="1980bwc4fc4rwzlwya030n5rv8rq0s82hnw955mvaxrbmicnqlla"; depends=[]; };
   ems = derive2 { name="ems"; version="1.2.7"; sha256="1l4javnfhlb6y40dpdvri2795yj0s9zqf8bi02s5llx5lcq3bxbd"; depends=[]; };
   emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; };
-  emuR = derive2 { name="emuR"; version="1.1.2"; sha256="1z4xyrqylrmni34bq234c8c9dcxqlww0ylyzgql6qan1hma8bw8d"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS purrr RCurl readr rlang RSQLite servr shiny stringr tibble tidyr uuid wrassp]; };
+  emuR = derive2 { name="emuR"; version="2.0.2"; sha256="1a5ylfw9x6bbycamj5dj4hj3ssx701nkn11rngcysy50ppdwr2ll"; 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=[]; };
@@ -6917,14 +7018,14 @@ in with self; {
   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="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; };
-  energy = derive2 { name="energy"; version="1.7-5"; sha256="15k9dg0a82cs9ypm0wpcsff3il1hzhnnv86dv5ngby1r144czhi4"; depends=[boot Rcpp]; };
+  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]; };
   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=[]; };
   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="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; };
+  enrichR = derive2 { name="enrichR"; version="2.0"; sha256="056m6hksfss29fj7zvlk7pbh8g3gq84kjh3240isrsnhp9m1h9iz"; depends=[httr rjson]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
   enrichwith = derive2 { name="enrichwith"; version="0.2"; sha256="063q4jbs6054djk6qf3105p7na4kndvr549w5c4fiz8264r8bnvv"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; };
@@ -6968,11 +7069,12 @@ 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.2"; sha256="1lspyqqcq745p1p54bds9v4cqw0gn7hqs7dsvwhnlkilkx05h5vw"; depends=[callr cli crayon data_table later lubridate processx progress R6 RSQLite stringi units]; };
+  eplusr = derive2 { name="eplusr"; version="0.10.3"; sha256="1mmzqbn1zhc742cqblmwpc4k94r0zqmzwyxi5sv5d11dfj5mszzd"; depends=[callr cli crayon data_table later 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"; sha256="0q17sf2q3yj9sia9m1d23q6li6fkvgmj2a73kl1im8aiaxwcq2m1"; depends=[elasticnet irr lassoshooting Matrix survival]; };
   epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
+  epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; };
   epubr = derive2 { name="epubr"; version="0.6.0"; sha256="0zzra5vpfsw62c19yah7fwm8xlrwnrlsb34d46wd1ssays6arf01"; depends=[dplyr magrittr tidyr xml2 xslt]; };
   epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; };
   eq5d = derive2 { name="eq5d"; version="0.2.0"; sha256="1h2mpj3l6wcwfkj1yzc4w17yzr2ir21zvz7qpv1h1b7qjdkbcrw4"; depends=[]; };
@@ -6991,6 +7093,7 @@ in with self; {
   erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; };
   ercv = derive2 { name="ercv"; version="1.0.0"; sha256="1h0v0gscf1ks1shkdvkn1g8r8x5jsb66a4m7rnpdfwbp2ijh41gp"; depends=[]; };
   erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; };
+  ergMargins = derive2 { name="ergMargins"; version="0.1.0"; sha256="0f65150ahlxx75k72f2shmlryq5qbszl9p0qxxpl87sfpclsaa0x"; depends=[btergm ergm Matrix network numDeriv statnet xergm_common]; };
   ergm = derive2 { name="ergm"; version="3.10.4"; sha256="08hzhc06sfchbq8kq5yvs7gxz0v6nvx0qdb2g6ac38n54cd0npw8"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; };
   ergm_count = derive2 { name="ergm.count"; version="3.4.0"; sha256="1bvbqckssqj91q56nz17mrvadk1i2mm301z9rj8qkh8116fwf93w"; depends=[ergm network statnet_common]; };
   ergm_ego = derive2 { name="ergm.ego"; version="0.5"; sha256="1vvyfjvkddc1qr189wqbp8sbqmd317y71ml9jjjjns3znahriqv3"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; };
@@ -7004,7 +7107,7 @@ in with self; {
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
   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.1.3"; sha256="0hfm0nad1bfh7a37zpn4aljrf69yc6dddz9iq46c1mzyrw116a9f"; depends=[lpSolveAPI validate]; };
+  errorlocate = derive2 { name="errorlocate"; version="0.2.0"; sha256="0lm0fp7b4ggx744b7kymman813rqw18qr7pd8r3j52spy3kq90lk"; depends=[lpSolveAPI validate]; };
   errors = derive2 { name="errors"; version="0.3.2"; sha256="1079jiv323r19paycwmnr9qirh4z0hv22qqmciy2afqpyw5diqh2"; 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=[]; };
@@ -7015,8 +7118,8 @@ in with self; {
   eseis = derive2 { name="eseis"; version="0.4.0"; sha256="023j91j5s5b84gcgi6i9gs7ky1f8ncimlx2c5s6w37kh13nfhcby"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp rgdal rmarkdown 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.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; };
-  esquisse = derive2 { name="esquisse"; version="0.2.0"; sha256="16w8jw83lykxh39p7pb5nal3wqlb6q4xjjn4x2lwjv6qlms6axri"; depends=[ggplot2 ggthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; };
+  esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; };
+  esquisse = derive2 { name="esquisse"; version="0.2.1"; sha256="0639b0hd83hx1qbp5rymqif5bcziv883xawx8fs89pwp4484lnkz"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI RColorBrewer rlang rstudioapi scales shiny shinyWidgets stringi]; };
   esreg = derive2 { name="esreg"; version="0.4.0"; sha256="1qfidbmdrm4vy72yjnpaadhm993xv6qqy44a8hk0l4isvmg51a5i"; depends=[Formula quantreg Rcpp RcppArmadillo]; };
   essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; };
   essurvey = derive2 { name="essurvey"; version="1.0.2"; sha256="0r1hkdksidx974pi08hg25qlzfxazqmzamwqg2njks2r9xk299p8"; depends=[haven httr rvest stringr xml2]; };
@@ -7045,7 +7148,7 @@ in with self; {
   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.0"; sha256="0f2l79jbqy98hy1waiwm4kji6wfx22si8a8g0y4wq5r6brk48vid"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; };
+  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]; };
   evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; };
@@ -7072,11 +7175,14 @@ in with self; {
   exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-30"; sha256="02lqs5pw9vii398jz8yr55jk8158xxxqrk1bf55b08xcccxdwrff"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; };
+  exactextractr = derive2 { name="exactextractr"; version="0.1.0"; sha256="01pyzgyb7my8b3fcyg907x6m15lg9ma53i4nyp62x2iz5g120ijn"; depends=[raster Rcpp sf]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exampletestr = derive2 { name="exampletestr"; version="1.4.2"; sha256="17x5bs00dzlmvqwfjxvcf71laqkrhxrmd77mh1cba0dx9payp7yv"; depends=[checkmate clisymbols crayon filesstrings fs glue magrittr ore purrr readr rlang roxygen2 rprojroot stringr styler usethis]; };
-  exams = derive2 { name="exams"; version="2.3-2"; sha256="1x69vnzfipibfpflp22m3win8017abmmlikykb6kpc71bfwdq0jn"; depends=[]; };
+  exampletestr = derive2 { name="exampletestr"; version="1.5.1"; sha256="1rk92ld5s812a2njs4fwidz7s2yjwbs7gf8chp7hcjw7pw81nbm4"; 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=[]; };
+  excelR = derive2 { name="excelR"; version="0.2.0"; sha256="1cp8hkpj54nwi1jh3ywn17lkjjs4l88b3x50a31636xs12x01nnh"; depends=[htmlwidgets jsonlite]; };
   excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; };
   excursions = derive2 { name="excursions"; version="2.4.4"; sha256="140p0vks40vsj1bi89rhdqih5jh7795pxzzqm9140vfiv8b0aya5"; depends=[Matrix sp]; };
+  exdex = derive2 { name="exdex"; version="1.0.0"; sha256="0yl7m70k1lrs14v6v98p0m0cqmzyi0gn475wsiiy6z49kbwd7ys4"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; };
   exiftoolr = derive2 { name="exiftoolr"; version="0.1.2"; sha256="18q23lmazqw5vjvpz9kbd8i8ljchm8nakh726ic3qqzsckl98psp"; depends=[curl jsonlite]; };
@@ -7091,14 +7197,14 @@ in with self; {
   explore = derive2 { name="explore"; version="0.4.3"; sha256="16m8xqzgnndrlw24n3bx6xvqdgbpi6zv8hwpbr47nd83zl77yvhw"; depends=[broom DBI dplyr DT ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny]; };
   exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; };
   expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; };
-  expoRkit = derive2 { name="expoRkit"; version="0.9.2"; sha256="0qlzz86cyfz2yyynz8bj28086d1pc93gvjy1idip80m7z6vsrsxq"; depends=[Matrix SparseM]; };
+  expoRkit = derive2 { name="expoRkit"; version="0.9.4"; sha256="186wnnx0gygnzrhhnsjysvwqccpxrcgy4pnvkyz6v3kcgg0n2x6j"; depends=[Matrix SparseM]; };
   export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; };
   expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; };
   expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; };
   expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; };
   exprso = derive2 { name="exprso"; version="0.5.1"; sha256="02fz2awxxgf5avnnvv10kr20zvzdmal7z9jbmjxzw5kjqrcv7jci"; depends=[cluster e1071 frbs glmnet kernlab lattice MASS nnet plyr randomForest ROCR rpart sampling]; };
   expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
-  expss = derive2 { name="expss"; version="0.8.11"; sha256="12vgymdjw4j2xz3bx4kz7r8v2b61v8ihcna32v89ihx5qyiy041c"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
+  expss = derive2 { name="expss"; version="0.9.0"; sha256="0kbbz8h2cy69d0jw7mxc673i64pns6nj3kc594k4r2b4jp867igg"; depends=[data_table foreign htmlTable magrittr matrixStats]; };
   expstudies = derive2 { name="expstudies"; version="0.0.5"; sha256="07li3lf7gnziws452arv38dayc30dym30qkw5d3ifp6za1aih5pv"; depends=[dplyr lubridate magrittr Rcpp]; };
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; };
@@ -7119,7 +7225,7 @@ in with self; {
   extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; };
   extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; };
   extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; };
-  exuber = derive2 { name="exuber"; version="0.2.1"; sha256="1sz3i6fqhdcmin4213xhxyz4ikb9565m2kp2gryb9is2wq5nk1h5"; depends=[doSNOW dplyr foreach ggplot2 glue gridExtra lubridate magrittr purrr Rcpp RcppArmadillo rlang tibble zoo]; };
+  exuber = derive2 { name="exuber"; version="0.3.0"; sha256="1g0cr7lgj8j5qdvrm7zmafhqafi1iwln590pcmfrfs37cynd5fkx"; depends=[cli doSNOW dplyr foreach generics ggplot2 glue gridExtra lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr zoo]; };
   eyelinker = derive2 { name="eyelinker"; version="0.1"; sha256="1lwpm247czqm26zvv5c6lkhdxpp4svszfw74g9ys9vwvwhry9c15"; depends=[intervals magrittr plyr readr stringi stringr]; };
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; };
@@ -7128,7 +7234,7 @@ in with self; {
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
   ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; };
   ezpickr = derive2 { name="ezpickr"; version="1.0.5"; sha256="1x45ccma78cx9blxr0zsnmvrpja8mb1p89gk4mpip299f6bza869"; depends=[haven jsonlite magrittr mboxr purrr readr readxl stringr textreadr tibble writexl]; };
-  ezplot = derive2 { name="ezplot"; version="0.2.2"; sha256="07ls5pfaykn7l9lygfqn9vvi821xqgwyzdc6zpyphj9nyran0480"; depends=[dplyr forcats ggplot2 magrittr rlang]; };
+  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]; };
   fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
   fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; };
@@ -7163,7 +7269,7 @@ in with self; {
   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]; };
   factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; };
-  factorMerger = derive2 { name="factorMerger"; version="0.3.6"; sha256="04l52w2lfihmwqk4xbv2i37jgkanhvmzcw2x7dmj3hmjymlr4yl0"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
+  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]; };
   factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
   factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
@@ -7193,10 +7299,10 @@ in with self; {
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
   fastDummies = derive2 { name="fastDummies"; version="1.4.0"; sha256="1sakgfzgdf1mcaqqpbb808xsdalz8jxpyfb6ilal2rcy9s11ds0q"; depends=[data_table tibble]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; };
-  fastGraph = derive2 { name="fastGraph"; version="1.3"; sha256="1qvzq6ncrv97vgnqgk58dkqhjdqg0svbzv4g3gr2slgnj8kh19gp"; depends=[]; };
+  fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
-  fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; };
-  fastJT = derive2 { name="fastJT"; version="1.0.4"; sha256="1pa4qpcf4qmzk6s8qgk60n5ialz8gcj5m8d7xr10cmn4jfwghc7b"; depends=[Rcpp]; };
+  fastICA = derive2 { name="fastICA"; version="1.2-2"; sha256="1zpijqcipm0aa3rxj0mys06lskqy4dbppjpxr1aby0j16y9ka8ij"; depends=[]; };
+  fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; depends=[Rcpp]; };
   fastLink = derive2 { name="fastLink"; version="0.5.0"; sha256="1hgz4c26qlsdlp7gx0rsvkwn6xv86d7yk186sp7j6nfh2p9b1ccz"; depends=[adagio data_table doParallel dplyr FactoClass foreach gtools Matrix plotrix Rcpp RcppArmadillo RcppEigen stringdist stringi stringr]; };
   fastM = derive2 { name="fastM"; version="0.0-4"; sha256="1n9a431w0hl4kr3pa32kcyd1d73acz4vb9vhfkckk3099mg46d9m"; depends=[Rcpp RcppArmadillo]; };
   fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="1.1.2"; sha256="0l50lyqwn0qxpnfp5aksw7ib5asigj43fbhmk2fza6a8ljgg4alg"; depends=[Matrix]; };
@@ -7215,6 +7321,7 @@ in with self; {
   fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; };
   fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; };
   fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; };
+  fastmap = derive2 { name="fastmap"; version="1.0.0"; sha256="1mmqxzcdb64mj5i9fgcxlp1d547fgamja743y40b8v85pw9yz5gz"; depends=[]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
   fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
@@ -7244,7 +7351,7 @@ in with self; {
   fdadensity = derive2 { name="fdadensity"; version="0.1.1"; sha256="0jj5gprv3ihdjic261czqnv7c13mxsmjmv7gn2gv4483kgijlkz9"; depends=[fdapace Rcpp]; };
   fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
   fdapace = derive2 { name="fdapace"; version="0.4.1"; sha256="1k10j6nlsidyms1a0nnki46ddyyywpz8gnnnjm3k17wxyi69bmg1"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; };
-  fdasrvf = derive2 { name="fdasrvf"; version="1.8.3"; sha256="1lqyadg17ddd3vksbaxc7bpwvk0afsd59rfg0n5wrgvhbd473s0y"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat viridisLite]; };
+  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]; };
   fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; };
@@ -7289,7 +7396,7 @@ in with self; {
   fhidata = derive2 { name="fhidata"; version="2019.6.24"; sha256="1lzv49nzf5j0gn88g8ilgp1vxwq2k7rji2vzzcxhmcdc1wir2nhk"; depends=[data_table]; };
   fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; };
   fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; };
-  fieldRS = derive2 { name="fieldRS"; version="0.2.1"; sha256="04h6jwlpar5s0rv35379qr0f64ca3hg510qh62k896rn38z2265d"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; };
+  fieldRS = derive2 { name="fieldRS"; version="0.2.2"; sha256="0jrcdsv46zx7six9ll5sha32wx36wqajaladj6z8xym2n9ay8d5b"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; };
   fields = derive2 { name="fields"; version="9.8-3"; sha256="1q9x68dczjym56v7x90x4x5br59vj3dww6w8v42zd3yl17h7c1h1"; depends=[maps spam]; };
   fiery = derive2 { name="fiery"; version="1.1.1"; sha256="07cfrzajr5knmz5ngczkdd2kzjfdnn1y4b0z73daxwhk4dq8j6ji"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; };
   filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; };
@@ -7301,15 +7408,16 @@ in with self; {
   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]; };
-  finalfit = derive2 { name="finalfit"; version="0.9.3"; sha256="1hwnk3rvvkh70k62x538j7jkfq03v3gw1r5r7sq45jjsic62k79j"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tibble tidyr]; };
+  fillr = derive2 { name="fillr"; version="0.1.1"; sha256="01z4841hxnpf8s9s327fqprb4gl9k8pkyv2mgc5vfl86r1pd7m1b"; depends=[]; };
+  finalfit = derive2 { name="finalfit"; version="0.9.4"; sha256="01qyigr29pxk89bn9qkmbjzxsks06an15r8apbh1ks5ykj442a70"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr readr scales stringr survival survminer tibble tidyr]; };
   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.6"; sha256="1i84q4yir2cwz96q5khdssia11nl3s12cp6rpaijfdyllqzivxh1"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
-  fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.6"; sha256="0dazy49mzw5y2nj2ag3h9bncj5cma60885j37lkjij01swil0mkk"; depends=[curl dplyr fingertipsR geojsonio ggplot2 leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; };
+  fingertipsR = derive2 { name="fingertipsR"; version="0.2.7"; sha256="0yriyw3qzxs9g0cfl9mk80mfpmfdx8l554gk03ps8ji497w94rql"; depends=[curl dplyr DT httr jsonlite miniUI purrr readr shiny shinycssloaders]; };
+  fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.8"; sha256="0hcbmzkzh3mnh6mk2yg21midkjgj5w03xw18qhq6mgpz8rcv7jm7"; depends=[curl dplyr fingertipsR geojsonio ggplot2 leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; };
   finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; };
   finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; };
   firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; };
@@ -7323,7 +7431,7 @@ in with self; {
   fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; };
   fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
   fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; };
-  fitODBOD = derive2 { name="fitODBOD"; version="1.4.0"; sha256="0ziljws5dya9w1ak16yx5y3x1l6r3kv0bw98n9pbgqrqh36bis5y"; depends=[hypergeo]; };
+  fitODBOD = derive2 { name="fitODBOD"; version="1.4.1"; sha256="06yqp95k13d5zy4md12aqlk8yjk9g7hnnizjzksx46sh6rsn82aw"; 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]; };
@@ -7332,7 +7440,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]; };
-  fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; };
+  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]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
@@ -7340,17 +7448,17 @@ in with self; {
   flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; };
   flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; };
   flan = derive2 { name="flan"; version="0.7"; sha256="1r1vkf207k0il7r314gq1lxz0ndhdbbvx338mn8zhrkrd2ln9hpq"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; };
-  flare = derive2 { name="flare"; version="1.6.0"; sha256="0ygif9a7a99qwv0b488wymmmncp6f5ww9yz13s4qs6p8yf37x1r1"; depends=[igraph lattice MASS Matrix]; };
+  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=[]; };
   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]; };
-  flexCWM = derive2 { name="flexCWM"; version="1.9"; sha256="02afmg7d008mfgja7pqxk0fdgmgqk9vq7xy13ijancg6fm3x8prk"; depends=[ContaminatedMixt mclust numDeriv statmod]; };
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
   flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; };
   flexdashboard = derive2 { name="flexdashboard"; version="0.5.1.1"; sha256="0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
   flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; };
   flexmix = derive2 { name="flexmix"; version="2.3-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]; };
   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="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; };
@@ -7360,7 +7468,7 @@ in with self; {
   flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; };
   flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; };
   float = derive2 { name="float"; version="0.2-3"; sha256="1sf0pj5543alh25b96fw8jjsmiaky3r4nw9xhn349gv50rf0nhrj"; depends=[]; };
-  flobr = derive2 { name="flobr"; version="0.1.0"; sha256="0i4n5mqpg0i0ysncm8b99a8lnqph01yfiwiw1nar7qpxszai0399"; depends=[blob checkr err]; };
+  flobr = derive2 { name="flobr"; version="0.2.0"; sha256="1pwk190bj1f8312bg95hj5y19ripm2jf6l1cbbsmfh2xw5x0xz0z"; depends=[blob checkr]; };
   flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; };
   flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; };
   flora = derive2 { name="flora"; version="0.3.0"; sha256="1nsc2q6y02shpk70p44rr7nl7pnj6as7jgdyakxqs64imwais8x2"; depends=[dplyr httr jsonlite stringdist]; };
@@ -7378,7 +7486,6 @@ in with self; {
   fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
-  fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.2"; sha256="0slmwzcmsl5cfgif6d47xfjknmap0x45cql339dyamwmhqm968rk"; depends=[geometry MASS mclust mvtnorm]; };
   fmri = derive2 { name="fmri"; version="1.9"; sha256="1v7aicpds7zbh7p0vizrg5730f98ikqzrp6gmjw9psjwfxv0kmf6"; 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]; };
@@ -7386,7 +7493,7 @@ in with self; {
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
   foghorn = derive2 { name="foghorn"; version="1.1.0"; sha256="161smkvx1pzn8sskr137iiqhcm0jp5rrrmc1valamh0zz5glcdk8"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
-  foieGras = derive2 { name="foieGras"; version="0.2.1"; sha256="1l2aajf1wvr17nk0vzn9a6sp5ihgcxq3jxk8yiy0lwrj24qqm4a0"; depends=[argosfilter dplyr ggplot2 gridExtra lubridate magrittr RcppEigen sf stringr tibble TMB]; };
+  foieGras = derive2 { name="foieGras"; version="0.2.2"; sha256="0nllvq81py74hgjci0n0lbi0flr3rrc1ki39xnidpcqkdp9n8ddx"; depends=[argosfilter dplyr ggplot2 gridExtra lubridate magrittr RcppEigen sf stringr tibble TMB]; };
   folderfun = derive2 { name="folderfun"; version="0.1.2"; sha256="08kfw7i5xqbk07ssp4j79p3x0gf0jq2fbcq99lb10r6ndcgp5rxp"; depends=[]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
   fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
@@ -7398,19 +7505,20 @@ 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.6"; sha256="0vz80p227fvw18rrar5d1ikz42j47jsly0h1wmiy9gww14rcnncd"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
-  foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; };
+  foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.8"; sha256="1kpk8p50xq3jrmapqyf56a5lnxkdvlafp5709wvqxq9rnsslpv2g"; 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.7"; sha256="0f9sdvh9b7wvd6ycflgmsjzqv12b7jfn7w4m2sbbfp7020nyqfhd"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; };
+  forecast = derive2 { name="forecast"; version="8.8"; sha256="079c3h4dxpnznadqbrpidahl3j58i4v8p0jw47lh1snkfx6hfxyh"; 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]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; };
-  foreign = derive2 { name="foreign"; version="0.8-71"; sha256="1mv04w3ycz0ymsszn8aa87k6k5sb8mg8lhf1b8w4zpfrphpkkliv"; depends=[]; };
+  foreign = derive2 { name="foreign"; version="0.8-72"; sha256="124c9229is44p2rv7xyh2q86nsfi7vzyyh5n3c5ihziqrp4ig723"; 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.0"; sha256="1w1x7i57dqlrm6zzgx4k0p1zs83nrg2w2jhhvjjk9s6y1ba3whyg"; depends=[dplyr magrittr purrr Rcpp tibble]; };
   forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; };
   forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; };
+  forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; };
   forestSAS = derive2 { name="forestSAS"; version="1.0.1"; sha256="1jva2nivvcrczvqfhxa6vv1hsazp5m7djgfp7mfp1kpr136lyf2d"; depends=[spatstat]; };
   forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; };
   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]; };
@@ -7425,7 +7533,7 @@ in with self; {
   formulize = derive2 { name="formulize"; version="0.1.0"; sha256="1fz8q48z4zvfglxzmmjznb7lcfrrfqmnws85jfkihs3ff43h7ccc"; depends=[recipes rlang]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.4"; sha256="0qhssp8mymy5wgzfkp1xa8s81j803g0ckg647ind6ms26320hq0x"; depends=[MASS]; };
-  forwards = derive2 { name="forwards"; version="0.1.1"; sha256="1ldyyma1ppjlnqahw6wpvwmcv7v2k9if8mfkx49j7kb866bvlhgk"; depends=[]; };
+  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]; };
   fourPNO = derive2 { name="fourPNO"; version="1.0.5"; sha256="0nx6rl34jklsn48wphh16rxm57hfxndc1zfddgl9yw5nfmfll7gs"; depends=[Rcpp RcppArmadillo]; };
@@ -7448,7 +7556,7 @@ in with self; {
   fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
   fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; };
   fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; };
-  frailtyEM = derive2 { name="frailtyEM"; version="0.8.8"; sha256="0mfhhb025wzwvch5bcvvfsljki34xahdkqli7lvqbhhihba00r1p"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
+  frailtyEM = derive2 { name="frailtyEM"; version="1.0.0"; sha256="19rsn07knc4ifj4v4v37s7k1dh0a4sdsxgbk5w7slzwh816spmjl"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; };
   frailtyHL = derive2 { name="frailtyHL"; version="2.2"; sha256="0i6r889i4f07w6992nfsfr439psz6k3q79nkkk3zwf5fv5r6bcky"; depends=[cmprsk Matrix survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.3.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]; };
@@ -7461,7 +7569,7 @@ in with self; {
   freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; };
   freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; };
   freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
-  freesurfer = derive2 { name="freesurfer"; version="1.6.1"; sha256="1ibhl5sbz85skkawmfdr9df6wdq6b3bl6cdvykx0gcszmd3fiabh"; depends=[neurobase R_utils reshape2]; };
+  freesurfer = derive2 { name="freesurfer"; version="1.6.5"; sha256="0g5rpskwgxx37b60vxn89kf2d6b2y66v508xyrsx3h47q973kjia"; depends=[neurobase R_utils reshape2]; };
   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]; };
@@ -7484,7 +7592,7 @@ in with self; {
   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]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
-  fslr = derive2 { name="fslr"; version="2.22.0"; sha256="1a3sclwhmalp4g05yr8gw80zgcbqvgpbppj1pyw4x846ahk1wikd"; depends=[neurobase oro_nifti R_utils]; };
+  fslr = derive2 { name="fslr"; version="2.23.0"; sha256="1sx4mw9cknbn7q7qc5rqqzzzly7wsq09dsdlmhb98ycqq631hx8c"; 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.5"; sha256="1pxyl8b6nfaxdc86zlfjgyjvmx8ifh46d1lbwc2dknhp7sxc95q5"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; };
   fst = derive2 { name="fst"; version="0.9.0"; sha256="0ya5lh8p0qy5pcr6wxsrn43wj1r9gb9qycyn8gvl26ic3hxwk2rf"; depends=[Rcpp]; };
@@ -7504,7 +7612,7 @@ in with self; {
   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]; };
-  funModeling = derive2 { name="funModeling"; version="1.7"; sha256="031rsqd2dr3zpzcnd34mkbq4wkvr34h64yszvjm8sx2f4d4p95x1"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.8"; sha256="1vcbrskl3kmiz6p75083gfk8r058w1ynjvk9qa1fm4x62ab3i9bk"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander pROC RColorBrewer reshape2 ROCR scales]; };
   funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; };
   funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
@@ -7527,7 +7635,7 @@ 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.13.0"; sha256="0h8ng2a6vg4axd5f75xcb3ip9d95zi22fa048dq2bzlnncwlznjz"; depends=[digest globals listenv]; };
+  future = derive2 { name="future"; version="1.14.0"; sha256="1jyv2wlmpfqbk3hw269h4xg36na3wh1kd1lxmwdb40bsv4850lqa"; depends=[digest globals listenv]; };
   future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.1"; sha256="0isisl38gy59ws6w2qvz5ljp7j88lr6kqnq9g6pdw7njph1p6ayn"; depends=[BatchJobs future R_utils]; };
   future_apply = derive2 { name="future.apply"; version="1.3.0"; sha256="0wd3bh114zkvrqlpn8gqz4ix1igr9hr8x72h2g00a7mqkfjfqx33"; depends=[future globals]; };
   future_batchtools = derive2 { name="future.batchtools"; version="0.8.0"; sha256="1ga29dhbfgjv5gxih8phad4y1yysdfljn0q218r0gdbnqw3gmzwb"; depends=[batchtools future]; };
@@ -7545,7 +7653,7 @@ in with self; {
   fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; };
   fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; };
   fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; };
-  fxtract = derive2 { name="fxtract"; version="0.9.1"; sha256="1b6ijxda969m7b74zyyd6rm1g706z2691awjlx23xwfirfkc2jka"; depends=[checkmate data_table dplyr future future_apply magrittr R6]; };
+  fxtract = derive2 { name="fxtract"; version="0.9.2"; sha256="0v65gdbc6xhqy1dwb6s8gp5dlz4nbsl7yr17g3pyw43znx7s5l1j"; depends=[checkmate data_table dplyr fs future_apply magrittr R6]; };
   fy = derive2 { name="fy"; version="0.1.0"; sha256="1620b2qsrryxdg49xfisf0gf0j380vkbg2nizanki2wh0rw9x7r3"; depends=[data_table fastmatch hutils]; };
   g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
   g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; };
@@ -7582,7 +7690,7 @@ in with self; {
   gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; };
   galgo = derive2 { name="galgo"; version="1.4"; sha256="1v150flk1x0rixpgvi8crd5iq28w4jk8h2iyv48hz5qmm2pvz1li"; depends=[e1071 MASS nnet R_oo randomForest rpart]; };
   galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; };
-  gam = derive2 { name="gam"; version="1.16"; sha256="0blg4gghw5068z180c4bf0s77ky0wspgsi6xpcfnkf2rkvj34182"; depends=[foreach]; };
+  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]; };
   gamRR = derive2 { name="gamRR"; version="0.6.0"; sha256="0l7ql1qp3xgky82d88l143nl7l11zsj4mnkdsx10f3nmf7kykj3d"; depends=[boot mgcv]; };
   gama = derive2 { name="gama"; version="1.0.3"; sha256="1k79m01r3y9am62414947zfwb1w1gh0nn48najivbjyk9i2avn9r"; depends=[ArgumentCheck cluster clusterCrit GA ggplot2 NbClust Rfast]; };
@@ -7620,7 +7728,7 @@ in with self; {
   gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
   gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; };
   gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; };
-  gargle = derive2 { name="gargle"; version="0.3.0"; sha256="1r0vyz48469dzznlryx0wdb9vz2zi60pncpm31sfikxx6pdxmbpv"; depends=[fs glue httr jsonlite rlang withr]; };
+  gargle = derive2 { name="gargle"; version="0.3.1"; sha256="0vqgp4w03sdyj0q96gxkybqflzzbaw84zifsbi7pxk5y08fimj2v"; depends=[fs glue httr jsonlite rlang withr]; };
   garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; };
   gaselect = derive2 { name="gaselect"; version="1.0.7"; sha256="0bivbvs8yyspqskvka1s1sr6w3k0m5kk4b66wfz9bfdygnywd6wz"; depends=[Rcpp RcppArmadillo]; };
   gasfluxes = derive2 { name="gasfluxes"; version="0.4-3"; sha256="017y3d67f22r6pxpjxab634kpdcxjd5mq53h3g45cxic1jz3znym"; depends=[AICcmodavg data_table MASS sfsmisc]; };
@@ -7651,6 +7759,7 @@ in with self; {
   gcmr = derive2 { name="gcmr"; version="1.0.1"; sha256="093j1cmfw83rck00lx2ns7sfaya7kfc8k7af0q80az7w2g9hmmpv"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
   gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
   gcookbook = derive2 { name="gcookbook"; version="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]; };
   gdalcubes = derive2 { name="gdalcubes"; version="0.1.0"; sha256="1w8ll08icdddr07zazkkj6gdnxsdlzq1wpsbbd8kbs8rgfnq6zjg"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; };
   gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; };
@@ -7677,10 +7786,8 @@ in with self; {
   gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; };
   gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; };
   gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; };
-  genBaRcode = derive2 { name="genBaRcode"; version="1.1.0"; sha256="1x7hf80bqfl6ghd9vk878a86dacphp15wdw9zb198ax083q3jydm"; depends=[ape Biostrings doParallel dplyr foreach futile_logger ggnetwork ggplot2 ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; };
+  genBaRcode = derive2 { name="genBaRcode"; version="1.2.0"; sha256="1h4yyjjx7cpinbh716ha79hsmjlj5waxvrv67dz8lij0ingycdzh"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; };
   genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; };
-  genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
-  genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
   genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; };
   genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; };
   genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; };
@@ -7688,7 +7795,7 @@ in with self; {
   gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
   gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; };
   genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; };
-  genderizeR = derive2 { name="genderizeR"; version="2.1.0"; sha256="00qx2va1sm4d7v2z8kyq59rnm451v131wm1f2klk6blv4pi6x6db"; depends=[data_table httr magrittr stringr tm]; };
+  genderizeR = derive2 { name="genderizeR"; version="2.1.1"; sha256="17lngcn0plyf7cjh5yizkp05w87jpr7rf1py4v5nw96f18wr4gjg"; depends=[data_table httr magrittr stringr tm]; };
   gendist = derive2 { name="gendist"; version="2.0"; sha256="0rs0sn1sb6j3pk2xncix04a093awlm2nw70g0rjhr7dlzmigspgb"; depends=[]; };
   geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; };
   geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
@@ -7707,6 +7814,7 @@ in with self; {
   genio = derive2 { name="genio"; version="1.0.10"; sha256="0l29rz9nap2rglansv8sbldhgngv04v1kdgy0zzxjzwwmsdcjrqp"; 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]; };
   genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; };
   geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; };
   genoPlotR = derive2 { name="genoPlotR"; version="0.8.9"; sha256="07901qv2lzzflda0p8qxmla6syvq2c9y230xipvn1i0p4izdqk5s"; depends=[ade4]; };
@@ -7744,14 +7852,14 @@ in with self; {
   geomedb = derive2 { name="geomedb"; version="1.0.0"; sha256="1bmprzm0xm78vixifl5sx6ig31l8pmbscjb382yyhh1i0qdd7bim"; depends=[ape data_table httr jsonlite]; };
   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.5-0"; sha256="1p2yr1xlxyslichy39krqhm0ag93mlc4vmvzn3frk5ay9by0prx6"; depends=[httr R6 XML]; };
-  geometry = derive2 { name="geometry"; version="0.4.1"; sha256="0v3ivaw8vbjyxg08dd573qk3kqfyknj5hli9503dza6p6xz0dzmm"; depends=[lpSolve magic Rcpp RcppProgress]; };
+  geometry = derive2 { name="geometry"; version="0.4.2"; sha256="0vq334115qi039vy198ggv1dsp6n1s6jwcm9ivipf5r8lbm287zz"; 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.2"; sha256="1wd8pnpcb5zkqg39hvsw1jyw9yx66w0w5nyg114b8v3m9x41rkr9"; depends=[ape jpeg rgl RRPP]; };
   geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; };
   geonapi = derive2 { name="geonapi"; version="0.2-1"; sha256="1fypk4cc0q9jvn6zicc3jnxkh6f8yh1zcycy2sblvv175lbjlfzx"; 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.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; };
+  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]; };
   geosample = derive2 { name="geosample"; version="0.2.1"; sha256="1gpzrsza8ys2jdazb2ixc70y1w5lrkahlmvws1i071zby1la01iy"; depends=[pdist sf sp splancs]; };
@@ -7772,7 +7880,7 @@ in with self; {
   gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; };
   germanpolls = derive2 { name="germanpolls"; version="0.2"; sha256="13ss7286sraiq6rgbbmlv3j94av26pv9016hz8hrlzvghmnkfwvh"; depends=[dplyr magrittr purrr RCurl xml2]; };
   germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.3"; sha256="1hfhwprs4b582n81ardh7mah52989shq2cphci9vskwb4jbkyzwx"; depends=[broom data_table ggplot2 ggrepel minpack_lm plyr Rdpack]; };
-  gert = derive2 { name="gert"; version="0.1"; sha256="1bsmyf7r74l544xiq2vnm1jvnl887vkw5d2rcabh2i29mjjjy0p7"; depends=[askpass credentials openssl]; };
+  gert = derive2 { name="gert"; version="0.2"; sha256="1qs404afcxpm3gxra2lpqb27l4746ga1pz0n29ig0qg3kala5yrj"; depends=[askpass credentials openssl]; };
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; };
   gestate = derive2 { name="gestate"; version="1.3.2"; sha256="1fr811f4d7zc75wxdrasd91wsa5ngzzb0p73ycy6lfwpm839i28q"; depends=[doParallel foreach shiny shinythemes survival survRM2]; };
@@ -7785,7 +7893,7 @@ in with self; {
   getlandsat = derive2 { name="getlandsat"; version="0.2.0"; sha256="15450v93lc4i2qda0zlb5vplwbarkmf3f6sb4rlrdpv9vlj85hff"; depends=[crul data_table rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.2.0"; sha256="0rxj1dyfqy3fw2jhv05sw9x70p67rxmq3aqffymzal61rz6cnr3y"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; };
-  gets = derive2 { name="gets"; version="0.18"; sha256="0sg51xkiw3w3lzgmbkvv6zfr41fc4krs4dxajj2m64hv4zfl2cj6"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.19"; sha256="18qd0rnl8w307laykyv93ahrblxz2nsvrcn0qfwar23g3n9vnzx5"; depends=[zoo]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gexp = derive2 { name="gexp"; version="1.0-0"; sha256="0jasxyr9rwdj1lmsc5zr77kkzm4nci3pxgc4npr7j0wcim7k8lby"; depends=[jpeg mvtnorm png]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.5.0"; sha256="1cg34c4hr8kwc23qlv2m6qw2k7ah4w8s70q0hf4hnvp66rw4kaqh"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
@@ -7818,11 +7926,11 @@ 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.10.0"; sha256="0gmqzjk8k8q6j4q6asv9f3b1fv4qrw5w8xa48ha3y98shzm5np9k"; depends=[dplyr insight magrittr MASS purrr rlang scales sjlabelled sjmisc]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.11.0"; sha256="1b0lxa8bljdh6h4lk7pql1lrhjlvh7p5c8qlgb8ac6ay8hb79vmi"; depends=[dplyr insight magrittr MASS purrr rlang scales 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]; };
-  ggfittext = derive2 { name="ggfittext"; version="0.8.0"; sha256="0k6bm8g4n71044y88l8vi6nda1lgxzv1jiinw7hcxxgif48z1mw8"; depends=[ggplot2 shades stringi]; };
+  ggfittext = derive2 { name="ggfittext"; version="0.8.1"; sha256="1a5k8fba2qjxnpd14vqkakpzcwkzqbpvs8h6fb9zh62y91n6p26v"; depends=[ggplot2 shades stringi]; };
   ggfocus = derive2 { name="ggfocus"; version="0.9"; sha256="03adq3pdhlgckqc20aw6r70kdcrw0v4rmm848ivv6wkck4qyla3m"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; };
   ggforce = derive2 { name="ggforce"; version="0.2.2"; sha256="0snxx9zhcccxa7pz9pf3bjqmcmv9mz4m47v81hklnhm25jj40xg2"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tweenr]; };
   ggformula = derive2 { name="ggformula"; version="0.9.1"; sha256="01ngx8qh9lhmagng6abx2ky54zi3iyj5bpxlnw59slagwv7l6icx"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; };
@@ -7844,15 +7952,16 @@ in with self; {
   gglorenz = derive2 { name="gglorenz"; version="0.0.1"; sha256="0ar9ih6yvxb5pyba8y8jjsbwaq808baysjhpd15psjzhfbimjqfm"; depends=[ggplot2 ineq]; };
   ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
   ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; };
-  ggmcmc = derive2 { name="ggmcmc"; version="1.2"; sha256="1g36zcypv587h7zig6slwkmd3b21cdhlfv2spxwg7061qslvw019"; depends=[dplyr GGally ggplot2 tidyr]; };
+  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]; };
   ggmuller = derive2 { name="ggmuller"; version="0.5.3"; sha256="0qcphgal4c28lcwa1qdbryk40rkqpd4hz6phvcp6jy0n75lqi9f3"; 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.2.0"; sha256="0n6isxw85lr0k9nzq5vnjjhpf53ldc1q4lg9n0np0yv9lkxwxyp1"; depends=[ggplot2 stringi]; };
+  ggnewscale = derive2 { name="ggnewscale"; version="0.3.0"; sha256="0nh5577if0qiqlksg028j4bkz058bm3qqwxm4nlqsssi4spja22f"; depends=[ggplot2 stringi]; };
   ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; };
   ggpage = derive2 { name="ggpage"; version="0.2.3"; sha256="1qi8ydq3fxb1smk0jg9z1cv2xjq8c1lsnmz8l7c61rvdbjm3710v"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; };
   ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; };
   ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; };
+  ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; };
   ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; };
   ggplot2 = derive2 { name="ggplot2"; version="3.2.0"; sha256="1cvk9pw59kxx19kamqwa15h26rbznp0vvqpn7y8kgjssnrzqkdii"; depends=[digest gtable lazyeval MASS mgcv reshape2 rlang scales tibble viridisLite withr]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
@@ -7863,7 +7972,7 @@ in with self; {
   ggpol = derive2 { name="ggpol"; version="0.0.5"; sha256="0n54mmk9alc3bd9q3jb64xvxnszqndfwpi6h6n09gpvlrbj8mkdx"; depends=[dplyr ggplot2 gtable plyr rlang]; };
   ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; };
   ggpubr = derive2 { name="ggpubr"; version="0.2.1"; sha256="0a4dv6a752hwvc7l31xs7bgqhfzfdy94xp6wgwaxf5dxm46na7k1"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr scales tidyr]; };
-  ggpval = derive2 { name="ggpval"; version="0.2.1"; sha256="1akhndl08nq97nvz2gzblfqsrjpxx1m632f3469mab9z1jcvaz57"; depends=[data_table ggplot2]; };
+  ggpval = derive2 { name="ggpval"; version="0.2.2"; sha256="1l5m925ajbqffn7yccx3kg6hsgwbqalqgid04133p8m1vwm6dvyf"; depends=[data_table ggplot2]; };
   ggquickeda = derive2 { name="ggquickeda"; version="0.1.3"; sha256="09b074rqyr93n3j60sm81qh3bdhrkwlkv4mxmcjcj3hivd6b2vck"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; };
   ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; };
   ggraph = derive2 { name="ggraph"; version="1.0.2"; sha256="0fpmp326mryd1k1qvacjadksrnhbla8h960i18lmrimzrag7692c"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
@@ -7883,7 +7992,7 @@ in with self; {
   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.3.1"; sha256="0mwpa4my9z377h5z9skaw4dy82cci6mkcyrw64c14kjv3rmx6xb7"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3.2"; sha256="078ih9s5b0xzf582qg0vjnxvg5qad5ms1v2vdd062ckahi8zz1r8"; depends=[ggplot2 plyr rlang withr]; };
-  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.11"; sha256="0rb7y3brs84zpmhhk5mlv4wm23m1wz2k5cjyxvk7yy9q2jr8kd74"; depends=[BayesFactor boot broomExtra cowplot crayon DescTools dplyr ellipsis ez forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr metaBMA metafor paletteer psych purrr purrrlyr rcompanion rlang scales sjstats stringr tibble tidyr WRS2]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.12"; sha256="0fmf5619yzq9qv4x73bai6qi2lrmldk0n354dznk5ywpqw9xsnp4"; depends=[BayesFactor boot broomExtra cowplot crayon DescTools dplyr ellipsis ez forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif glue groupedstats jmv magrittr MCMCpack metaBMA metafor paletteer psych purrr purrrlyr rcompanion rlang scales sjstats stringr 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]; };
@@ -7909,8 +8018,9 @@ in with self; {
   git2rdata = derive2 { name="git2rdata"; version="0.1"; sha256="1nq9pxvxk05xqsknwyfx30r7gzidl0whqiix56mbgy6zi3ma2pvj"; depends=[assertthat git2r yaml]; };
   gitgadget = derive2 { name="gitgadget"; version="0.4.0"; sha256="0v6a205x493zycw4ky6ji8zd81jyw0ia47bxyklmiapxrzx8mpbd"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; };
   githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; };
-  gitignore = derive2 { name="gitignore"; version="0.1.2"; sha256="1lghdsv3z14m88wr6hlzdr2c0630w539hj900yc3fv1i4qjznf28"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; };
+  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]; };
@@ -7925,9 +8035,9 @@ 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.4.2"; sha256="0yxly8vzplq5f6by28sa6727315fmy9i6jvmjm9lm75vyihbzxli"; depends=[e1071 lmom]; };
+  gld = derive2 { name="gld"; version="2.5"; sha256="00bqyr22llsnxm2pjj8bzf9h64gx1vlrzdgagfsskwixccbhhsax"; depends=[e1071 lmom]; };
   gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
-  glinternet = derive2 { name="glinternet"; version="1.0.9"; sha256="1158vza27svv43frc1xdcpa0a2pmjm507ikk80wrmb4754l8dv2j"; 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.3"; sha256="06kz66bbc29a11xp09nza6gvpgbxih4bzps5n8228sgk561vvw3w"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; };
   glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
@@ -7982,7 +8092,7 @@ in with self; {
   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.0.3"; sha256="1497n11a7m5mbb8d3hcr89yhfh64vqsxi2w6kvlrxmmx95q2cp70"; depends=[Brobdingnag mvnfast pbapply]; };
+  gmvarkit = derive2 { name="gmvarkit"; version="1.1.0"; sha256="1zzv050j1kxdz84dwrpvnnbxr5qxdgd3lvrdg8dy3a2kzclmywmh"; 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]; };
@@ -8002,8 +8112,8 @@ in with self; {
   gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; };
   goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; };
   googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.6.0"; sha256="0amhhp7h7f6a2qmmbxjg5rqhj6jdvmjv9rsvcx83ql3b6vbaxrpz"; depends=[assertthat dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tidyr]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.8.0"; sha256="0r3w5x9fy3sf9a1h9qansrks6fibz4x6j51r95an3zskklad338d"; depends=[assertthat digest httr jsonlite memoise R6]; };
-  googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.4.0"; sha256="1iwn0qjyxyg1xr1s492h7z2g5yzcfw8kasd4ghxmghnqvhzzf7vn"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="0.8.1"; sha256="0mgw9k6hmgd0yyan6d73kczya012caypy71ablhqdzvvykbsa8wi"; depends=[assertthat digest httr jsonlite memoise R6]; };
+  googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.0"; sha256="1wkmg7jrvzb9a2avdmvw5h4nqnf0745hqvjkfn82inaf6pyzb3b4"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; };
   googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.1.0"; sha256="1n7lbqx7qiahmirydli9nvq4w4i26qnyk3s2kxy4aj413619ym67"; depends=[caTools data_table googleAuthR jsonlite purrr]; };
   googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; };
   googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; };
@@ -8029,7 +8139,7 @@ in with self; {
   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.4"; sha256="0plllcbidfg0wjyw5q48bc1jy8xingz7dl66xbskljp2fm8gi8jk"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; };
+  gprofiler2 = derive2 { name="gprofiler2"; version="0.1.5"; sha256="07w6bihz6rbd4ldgdyvx1xabvhhnif2wdc3251a7bpdm9381m0xa"; 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.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; };
@@ -8038,7 +8148,7 @@ in with self; {
   grImport2 = derive2 { name="grImport2"; version="0.1-5"; sha256="0dyb3nrrvxnkk9q5b136bdivcz1jj3ajx1kscm3k0kkpqjif0pls"; depends=[base64enc jpeg png XML]; };
   gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
-  gradeR = derive2 { name="gradeR"; version="1.0.0"; sha256="1sx5bijp0ckkwr2zjs5mr5dk73wpbw6rk5rvni71w2w2zxm35fhb"; depends=[testthat]; };
+  gradeR = derive2 { name="gradeR"; version="1.0.1"; sha256="15vjzc3y8gs433y47kp5cyrqrn3wphj1xb4q4wryn2bbhgf2m13y"; depends=[testthat]; };
   gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; };
   grainchanger = derive2 { name="grainchanger"; version="0.2.0"; sha256="00gxzzl47kpghwzz22z5b1m1gcpsfg5pay3hcdwdqr00mz2albg2"; depends=[checkmate furrr raster sf usethis]; };
   gramEvol = derive2 { name="gramEvol"; version="2.1-3"; sha256="0z2511zhs2gcdkwp29n6fpafhn49h69yi56nmrhh9zc8jqj1rwpa"; depends=[]; };
@@ -8046,13 +8156,14 @@ in with self; {
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
   granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
-  graphTweets = derive2 { name="graphTweets"; version="0.5.1"; sha256="1279d5ysfq8338b35y35373z1k2gphcr9ynckg3q0pnvx9cqihlk"; depends=[combinat dplyr igraph magrittr purrr rlang rtweet tidyr zeallot]; };
+  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]; };
   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]; };
   graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
   graphkernels = derive2 { name="graphkernels"; version="1.6"; sha256="1gn3ihqz7m0rdvvc2fp7hsgq583wh5cnz7200a2ff89xc04zs3dc"; depends=[igraph Rcpp RcppEigen]; };
-  graphlayouts = derive2 { name="graphlayouts"; version="0.1.0"; sha256="121fsp8bmvahxckrh8b042w2f3xrfp3yp65453scxhckc9amzc7l"; depends=[gbp igraph oaqc Rcpp scales]; };
+  graphlayouts = derive2 { name="graphlayouts"; version="0.2.0"; sha256="009hy3byr5giysmylkjrkskzhb40zcmpw445a5yqyifjqpfvfm8g"; depends=[gbp igraph oaqc Rcpp scales]; };
   graphon = derive2 { name="graphon"; version="0.3.2"; sha256="0bh542ffxklydb826srnacmw3cncd8cxnkj76r40mbkaxq7vxxlp"; 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]; };
@@ -8060,13 +8171,14 @@ in with self; {
   graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; };
   grattan = derive2 { name="grattan"; version="1.7.1.2"; sha256="1dmy6shigybp3g7kjqc9f2c28niw9if7igi1xmc8qnf0azlnlrlz"; depends=[assertthat data_table fastmatch forecast hutils ineq magrittr Rcpp rsdmx zoo]; };
   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.2.2"; sha256="0xr17xq4hvl6zaajj04cwymmpzfnbwb86z0ziarj5bc5wjfw0yb2"; depends=[imagine raster]; };
+  grec = derive2 { name="grec"; version="1.3.0"; sha256="0fksxzjnm843wbcwjf06gcbbw4lfz7zk361bj6qdpnkcfcl22c1w"; depends=[imagine raster]; };
+  greenclust = derive2 { name="greenclust"; version="1.0.0"; sha256="1qqlg40bzi088vn4yx33izf12jsviyqj63a24xw2426lg4lif3kv"; 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.0"; sha256="03yjf8cs4z2y1pjl7qvv2icp16f5xykd725mf1vs4zk04asq4xna"; depends=[coda future progress R6 reticulate tensorflow]; };
   grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; };
-  greybox = derive2 { name="greybox"; version="0.5.2"; sha256="05ymcxk51y3w36fmrd7vzvxfnl2yd4xiki8c93wsnpcz3lz4zsr9"; depends=[forecast lamW nloptr numDeriv Rcpp]; };
+  greybox = derive2 { name="greybox"; version="0.5.3"; sha256="0q57vyl5cz3xyl4ybij85nvnqqnmnfh7r4gw6gr9q1ynjsxam25h"; depends=[forecast lamW nloptr numDeriv Rcpp]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
   grf = derive2 { name="grf"; version="0.10.3"; sha256="10fp79w533b6ffrdy9ch94xq1xqzmlz8dsly5h3rznhcbidk8s46"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
@@ -8079,21 +8191,21 @@ in with self; {
   gridSVG = derive2 { name="gridSVG"; version="1.7-0"; sha256="0wdjj6jyk1zflglhimjzhws51ifwz3yb044j5nfsynn6kjdgfn32"; depends=[jsonlite XML]; };
   gridsample = derive2 { name="gridsample"; version="0.2.1"; sha256="062aryy26x07m31r6m0fj1zgnjhivlh1fikx9lv2rdgk0rh4yzz0"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
   gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; };
+  gripp = derive2 { name="gripp"; version="0.2.19"; sha256="096mz1czp2mx4ny5q4frbqnx99ymw39p7lp5qfna7ydnwiiajkd2"; depends=[GA GenSA usethis]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
   groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; };
   gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; };
   groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; };
   groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
-  groupdata2 = derive2 { name="groupdata2"; version="1.1.0"; sha256="0xy112g8b9v1rqsan113qcm1hbv34nzvvn1jf1mmnv6ybv9y8nri"; depends=[dplyr numbers plyr rlang tibble]; };
+  groupdata2 = derive2 { name="groupdata2"; version="1.1.1"; sha256="1hnr5gd9gqh8wf1vign6wa95n4jw2xn0vmwlxdgczy7b77xqbs24"; 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.3"; sha256="15ah8v1mfyq9xi27kkl0vwwbhf16vd4hy9h809jlw1i7b1zwg4pm"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; };
   groupedstats = derive2 { name="groupedstats"; version="0.0.7"; sha256="087y0pb3hsk4djhf2pcfkflgia3pngjx1c6i9d79dm5wcrhhk4q4"; depends=[broomExtra crayon dplyr glue lme4 magrittr purrr rlang robust rstudioapi sjstats skimr tibble tidyr]; };
   groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; };
-  growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; };
   growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
   growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; };
-  growthPheno = derive2 { name="growthPheno"; version="1.0-13"; sha256="04xd3ys25j8wv9gr7rr63gdq1i60dr0i43qzxx62d0xi6cgm4xka"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
+  growthPheno = derive2 { name="growthPheno"; version="1.0-15"; sha256="1wxjff9ylaxksn9w5wjhwka7bgc5z2qv29n10162wryr2ak6lps9"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; };
   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]; };
@@ -8158,7 +8270,7 @@ in with self; {
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
   gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; };
-  h2o = derive2 { name="h2o"; version="3.24.0.5"; sha256="0dwl7zj3f4qwycrghazd2g02qnx5bs6xz1qlgxmy3i05y5pl1pi0"; depends=[jsonlite RCurl]; };
+  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="0.7.2"; sha256="0k1gcnjmblk8ign6fzv7cl9qv964mi6jaams5z22x82jnw1sx47c"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; };
@@ -8184,7 +8296,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]; };
-  harmonicmeanp = derive2 { name="harmonicmeanp"; version="1.1"; sha256="1lfnxknj4hm7m64i3v4bwhv84w1r4b7bd45rhsyfhg3ag9lg93ka"; depends=[ape FMStable knitr]; };
+  harmonicmeanp = derive2 { name="harmonicmeanp"; version="2.0"; sha256="08f3p2ig3lm1n70qr05chldp04ycv420fa8hvd4nmadas12gfb5m"; 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]; };
   hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; };
@@ -8193,7 +8305,7 @@ in with self; {
   hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
   hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; };
-  haven = derive2 { name="haven"; version="2.1.0"; sha256="0x5fwc4q2gdxwwp5sxdd6q17jhpisd769y9kv0xgnjcm0cdwz8f0"; depends=[forcats hms Rcpp readr tibble]; };
+  haven = derive2 { name="haven"; version="2.1.1"; sha256="12h64r2v2451igyl7v4w2kg0hzw9rnanph0m7smffq29ybkv9g4h"; depends=[forcats hms Rcpp readr tibble]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
   hazer = derive2 { name="hazer"; version="1.1.1"; sha256="1d1qj6mamgxlvxq2hjik69zfzackjz5819iss98jf5gdbdngw41x"; depends=[]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
@@ -8211,6 +8323,7 @@ in with self; {
   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.2.0"; sha256="10gynjwaaxks8y9c2fl8k040j0nbwn372nil70009yfk9wrkx0aq"; depends=[bit64 R6]; };
+  hdfqlr = derive2 { name="hdfqlr"; version="0.6-0"; sha256="0hvg23fcx5basy8fnqbnrrkqaddmj0lkqldqgxkj5gdnwshrhkl3"; 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]; };
   hdm = derive2 { name="hdm"; version="0.3.1"; sha256="1kibfc1fc94y1vk06nn0yfvpdzcm30a1jn89lqqfma70x5jpa25s"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
@@ -8225,10 +8338,10 @@ in with self; {
   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]; };
-  heatwaveR = derive2 { name="heatwaveR"; version="0.3.6"; sha256="0bm6q4wgyvzs83hnkyhj21h422hpq5wnxajlp2bcrbmcr7r8nfwg"; depends=[data_table dplyr ggplot2 lubridate Rcpp RcppArmadillo RcppRoll tibble zoo]; };
+  heatwaveR = derive2 { name="heatwaveR"; version="0.4.0"; sha256="184rm4jiw3s0xi0jsadbs7pzbwdcvgkqwcs2c7fl9aaayf4m7v1h"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; };
   heavy = derive2 { name="heavy"; version="0.38.19"; sha256="15bg2qqkslkqfnsq3ixbgmq72xagh8laji0265l06xgf2l6045kx"; depends=[]; };
   hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; };
-  heemod = derive2 { name="heemod"; version="0.9.4"; sha256="1is1a7pibx898srpmq2zc44c81a0adhmyjgahab8w27x5hda08vk"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; };
+  heemod = derive2 { name="heemod"; version="0.10.0"; sha256="0vkmjsi8dya6zyhh6bxisvwaydk6w2q9k31gkbkvwjcjrv09dnnv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble]; };
   heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; };
   helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; };
   hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
@@ -8241,7 +8354,7 @@ in with self; {
   heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; };
   hero = derive2 { name="hero"; version="0.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; };
-  hesim = derive2 { name="hesim"; version="0.2.0"; sha256="1pb6xlxp69jmzqmv2gxgn2wq5mz7xp4smhvqgmb3n4zhrwhzpk25"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; };
+  hesim = derive2 { name="hesim"; version="0.2.1"; sha256="1b8hsdyk88kpf6d1dkxg8zmp7qkfdbm2w6rkspkjam0034d2ni6q"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; };
   het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
   hetGP = derive2 { name="hetGP"; version="1.1.1"; sha256="1f0lb91hb6lp9cfil1qpbqf032xv697jazcqyc1y694hdbx0jwqj"; depends=[DiceDesign MASS Rcpp]; };
   hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; };
@@ -8267,7 +8380,7 @@ in with self; {
   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=[]; };
-  hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; };
+  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=[]; };
   hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; };
@@ -8285,10 +8398,11 @@ in with self; {
   higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
   hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
+  hindex = derive2 { name="hindex"; version="0.1.0"; sha256="12w1zz467grihjvan1db7c30psm0j85k82p01fzqgwdam3cd8as3"; depends=[foreach ggplot2]; };
   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.4"; sha256="1myv9m1pyfbszwsrf3dj6vzjrh0fzdd9apda42x97pivbb80i06h"; depends=[ape data_table deSolve diversitree GenSA nloptr phytools plotrix subplex]; };
+  hisse = derive2 { name="hisse"; version="1.9.5"; sha256="05063gprbn7i2hpg8hx2ryfrd3rpmb66c2h5i60830v7s7x4fyb9"; 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=[]; };
@@ -8301,10 +8415,11 @@ in with self; {
   hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0-2"; sha256="0l4nlny532kddiaa1nmgd37971whhwzb54mb1pvbwax7fsg6hmhw"; depends=[]; };
   hmi = derive2 { name="hmi"; version="0.9.16"; sha256="128rwbflxy9j49xpgmwjsw35jhsz586r5b0hn80jkjmpfshnffx3"; 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-5"; sha256="1nawdj5rxh54gxyrr9xw1zw1k1b20ds397mz07x6n7nyjmj4lak2"; depends=[nnet]; };
   hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; };
-  hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; };
-  hmstimer = derive2 { name="hmstimer"; version="0.0.1"; sha256="0wjd6n21ac94dq5zgwjvfhrgr30khc70ql5602dnd7m7md1b31xf"; depends=[]; };
+  hms = derive2 { name="hms"; version="0.5.0"; sha256="06snfqdczr0x0nbp7qnvwhlp2pw0wx9c2y3xb4gr1wrvbik74y58"; 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]; };
@@ -8318,12 +8433,12 @@ in with self; {
   homologene = derive2 { name="homologene"; version="1.4.68.19.3.27"; sha256="0d7wxisk0vqk1n165v1i19bc02zv78h5r5d3jqai5y6nkmwn01sh"; depends=[dplyr magrittr purrr R_utils readr]; };
   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="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; };
+  hopbyhop = derive2 { name="hopbyhop"; version="3.41"; sha256="1dh502mjrk9dlqikn0ak4gh2dw9nrnp3zrz8j1xwa9cjn37al2wh"; depends=[ggplot2 pastecs]; };
   hopit = derive2 { name="hopit"; version="0.9.0"; sha256="177kg6gqf76qhjlm259g8if0n4345mv0xxk6vi4qy5c64zx29arg"; 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]; };
-  horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; };
+  horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; };
   hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; };
   hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; };
   hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; };
@@ -8350,7 +8465,7 @@ in with self; {
   htmlwidgets = derive2 { name="htmlwidgets"; version="1.3"; sha256="04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i"; depends=[htmltools jsonlite yaml]; };
   htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; };
   hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
-  httk = derive2 { name="httk"; version="1.9.2"; sha256="1x5knzspkh1hb0g5mnz3883bkqx0b460dfj4bnywi3sk0638mlpj"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; };
+  httk = derive2 { name="httk"; version="1.10.0"; sha256="0bczjhykq03wcgjymzyhbk4i8vsd4sr0g6plx8lrfsjqirxf3k72"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
@@ -8406,7 +8521,9 @@ in with self; {
   iBreakDown = derive2 { name="iBreakDown"; version="0.9.6"; sha256="00vlm149ryak7xk059lnv2cic4h4fzlrp9c6jls2dffrpsn0ii02"; 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="1.0.0"; sha256="1803xdsjwy9n6fd66xhg96ccvggdnxk2dp1fvnb79kcpcvjys50a"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; };
+  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.0.0"; sha256="13hfzvi4lqpcngkp757nl7mixbq8bscpxp91wz0rd3gndrgiccv1"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny umap]; };
+  iCiteR = derive2 { name="iCiteR"; version="0.1.0"; sha256="1h38m3blnpivrdz1hdgakl502zxb92gjkczra0a7izbq9fn19mfw"; depends=[httr jsonlite]; };
   iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
   iDINGO = derive2 { name="iDINGO"; version="1.0.2"; sha256="041yvp3nzk3ipjlx17xcn9yiwr1hlns0pd3vzqrck5v9glnp4sbr"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; };
@@ -8431,6 +8548,7 @@ in with self; {
   iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; };
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; };
+  iai = derive2 { name="iai"; version="1.0.0"; sha256="12alm0vhzaszacwpgzcbds00hj7xjfjq06zy337y81zqjgl8balp"; depends=[JuliaCall rlang stringr]; };
   iarm = derive2 { name="iarm"; version="0.2.0"; sha256="0lg1q5z40hjm8wicniimv4wlb210qj7d5lmmknilzkpz4shwr44k"; depends=[eRm mRm 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=[]; };
@@ -8454,6 +8572,7 @@ in with self; {
   icd = derive2 { name="icd"; version="4.0.6"; sha256="0zi56c6x2jy1yihrar6whhyb5csyhzwdxw0nr8c05xm28w1j6xwb"; depends=[rappdirs Rcpp RcppEigen]; };
   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.10"; sha256="184cl83rwr0h1b3dia1vd81zvfr0yqqmfszkzah3cqljkcirz8di"; 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]; };
@@ -8470,9 +8589,9 @@ in with self; {
   idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; };
-  idealstan = derive2 { name="idealstan"; version="0.7.1"; sha256="0mqwmky04bdkjsam132pkgg8avbp6c1njzxfx70xnnxm9954vvys"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; };
+  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]; };
   ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; };
-  idefix = derive2 { name="idefix"; version="0.3.3"; sha256="0apgz4c0377y5w88pgv3x4mck1fjkq7xy577w925iish0hqpvni7"; depends=[dplyr gtools MASS maxLik mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; };
+  idefix = derive2 { name="idefix"; version="0.4.0"; sha256="03gmhmpdkiy0721k14ig6aaqj304kjgi3g9l9v5s59h716r1cfyv"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; };
   idem = derive2 { name="idem"; version="4.0"; sha256="0zgc6b5gzgm5dhjqk1vkm94khizc8sngn3igv23z1v18g73vdxhi"; depends=[BH Rcpp RcppEigen rstan rstantools sqldf StanHeaders survival]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
@@ -8480,6 +8599,7 @@ in with self; {
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
   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.0"; sha256="0rnfv7jwl5x3a67nbj2k2cs15b7xqzdcs9v8nlx2zxfsnf95s68s"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; };
   idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; };
@@ -8501,24 +8621,26 @@ in with self; {
   iheatmapr = derive2 { name="iheatmapr"; version="0.4.8"; sha256="0rypfhr05x3yqaywpkkd2mjn1vwbj6hw7v8nkwm2mbff9z87aam7"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; };
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
   iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; };
-  ijtiff = derive2 { name="ijtiff"; version="2.0.1"; sha256="0yv68pnvz9ggf9nylkpa0sjzidic833fivijjqxi17267mdc7m6d"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; };
+  ijtiff = derive2 { name="ijtiff"; version="2.0.2"; sha256="0i1bs5pns83r1f97ypr0xbq4z7kwgldkaff2iwvqrnalj0rgfm8b"; 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]; };
   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.4.0"; sha256="1v0rds64i0f3xgg7ca14ncw4nrcc80gvjf1fbp498idq38z79qzc"; depends=[Rcpp]; };
+  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]; };
   imdbapi = derive2 { name="imdbapi"; version="0.1.0"; sha256="11v7c0s7qqf02b186md5lhgkgmywkn8lmmanlz3gfcxca26g047y"; depends=[dplyr httr stringr]; };
   imfr = derive2 { name="imfr"; version="0.1.6"; sha256="0dvhz16wfmrrs21pcys8hjlwa9xkwc78pn76zj2aq1vyj9qby0wj"; depends=[dplyr httr jsonlite]; };
+  imgpalr = derive2 { name="imgpalr"; version="0.2.1"; sha256="0ppzk0rza1rbaz69i8rxjmj7j1q26q75cn2yim8ji31j5hknqj23"; depends=[downloader dplyr jpeg magrittr tibble]; };
+  imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
   imgw = derive2 { name="imgw"; version="0.1.0"; sha256="1x9di7imfk5mrwx19j3xjsanykdng5w9w2dpk3xfkwzvvqyrlpg1"; depends=[RCurl XML]; };
   iml = derive2 { name="iml"; version="0.9.0"; sha256="15rv943q1kqilsr1h0pkm2gci1cl7775xma4swjfmbqmdc6acjq0"; depends=[checkmate data_table foreach Formula ggplot2 glmnet gridExtra Metrics partykit prediction R6 yaImpute]; };
   immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; };
   imp4p = derive2 { name="imp4p"; version="0.7"; sha256="1hpxx1jpwd4v19xnpjjbwcvfzvb63jfd0jq3vcq000w7am9pwwba"; depends=[Iso norm Rcpp truncnorm]; };
   impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; };
-  implyr = derive2 { name="implyr"; version="0.2.4"; sha256="1xc5c8wpq1bdvfm4rkqmvykgkil9fm9n1q9ndjv701jbdr4rnisd"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
+  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=[]; };
   imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
@@ -8529,8 +8651,8 @@ in with self; {
   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]; };
-  imputeTS = derive2 { name="imputeTS"; version="2.7"; sha256="12y6qzy00kb7jap4h92f3zpgdazlw3y4zydhv7gzfsmx1ka7nsfm"; depends=[forecast magrittr Rcpp stinepack]; };
-  imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.2"; sha256="138rkkxkghch6c80j15z77qs6rc62c37aqnv9aq766fkzk2fffwf"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; };
+  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]; };
   imsig = derive2 { name="imsig"; version="1.0.0"; sha256="01ww48x9a189dvr81bangfhchr70l0sg26jdpcxf41nh2fmslfxx"; depends=[ggplot2 gridExtra HiClimR igraph RColorBrewer survival]; };
   in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; };
@@ -8547,7 +8669,7 @@ in with self; {
   indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; };
   indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; };
-  inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; };
+  inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
   infer = derive2 { name="infer"; version="0.4.0.1"; sha256="0klb1zvmr8fplby8799yca1k6bs3dmacxm1sa0jja9ar23kcq09n"; depends=[dplyr ggplot2 glue magrittr rlang tibble]; };
   inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
@@ -8575,9 +8697,9 @@ in with self; {
   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.3.0"; sha256="1r288hc01cpyrk3nias30fw783z2vw20qr1k67vr65anh7mwm7vb"; depends=[]; };
+  insight = derive2 { name="insight"; version="0.4.1"; sha256="1lw1r3mb97z5p9z25jfzlhs0sbnwp6v8kzysf0am01x4m7l3iz82"; depends=[]; };
   insol = derive2 { name="insol"; version="1.2"; sha256="14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"; depends=[raster rgdal]; };
-  inspectdf = derive2 { name="inspectdf"; version="0.0.3"; sha256="14a639y5l160lrx73xr3m91da2qhza1p2r5wdf9fkd80xlf4qgxm"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; };
+  inspectdf = derive2 { name="inspectdf"; version="0.0.4"; sha256="0ydhh4nilmvf1gfba9cv7sgpvw60krqy2xk1p76d2vh0rzx8sacd"; 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=[]; };
@@ -8594,7 +8716,7 @@ in with self; {
   intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
   interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; };
-  interactions = derive2 { name="interactions"; version="1.1.0"; sha256="1k3rz5r5f5by2v9qqhk4hnilj1qcm4pyryhz21s0qzhpsv818717"; depends=[cli crayon ggplot2 jtools rlang tibble]; };
+  interactions = derive2 { name="interactions"; version="1.1.1"; sha256="0xsqsylfgqgdy7bh32v8x0yn5naf1jclv05dvpyvhladgd0q1c0m"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; };
   intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; };
   interep = derive2 { name="interep"; version="0.2.0"; sha256="18f5qkfq3rcr4n2vpdp4xp56cbg5z30cpk6wdchh64gly6g28bi0"; depends=[Rcpp RcppArmadillo]; };
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
@@ -8609,11 +8731,14 @@ in with self; {
   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=[]; };
+  intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; };
   interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
+  intkrige = derive2 { name="intkrige"; version="1.0.0"; sha256="1x0jg4vdbf3ipns1slw2pb1myiswnpka9lyxma69lgk2nmwmz9p2"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; };
   intoo = derive2 { name="intoo"; version="0.3.1"; sha256="0i1141r95zv8sv6l047avsgyq1kbxilczrhsn6gkvjg5vkmqn9rr"; depends=[]; };
   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]; };
   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=[]; };
   inum = derive2 { name="inum"; version="1.0-1"; sha256="16d09391l65w557dkzhhx1aqn1ljamcmjj3yh42pwq037k0r8brw"; depends=[libcoin]; };
@@ -8644,7 +8769,7 @@ in with self; {
   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-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
+  ips = derive2 { name="ips"; version="0.0.11"; sha256="02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"; depends=[ape phangorn plyr seqinr XML]; };
   iptmnetr = derive2 { name="iptmnetr"; version="0.1.5"; sha256="02lljbbr2sm90sgyjv6a17mbh758n93qqxfr900g0m557nsv35i8"; 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]; };
@@ -8670,7 +8795,7 @@ in with self; {
   island = derive2 { name="island"; version="0.2.4"; sha256="1jwqyrkxljhrxnd4jnfzm2bdgg192865nm1pxizbr7ws0b4z9fyi"; depends=[]; };
   islasso = derive2 { name="islasso"; version="1.1.0"; sha256="1kp94lscl738wlw0hn1xakcgi10zbxpnvkpvzj5ybwvpbjy3qb9a"; depends=[glmnet Matrix]; };
   ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; };
-  isni = derive2 { name="isni"; version="1.0"; sha256="04s8v4ncg8hc2m1kbb0xv01qwwh10k3ibjrrgy34f6zl8535zv80"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; };
+  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]; };
@@ -8680,6 +8805,7 @@ in with self; {
   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]; };
+  ispd = derive2 { name="ispd"; version="0.1"; sha256="0dq7dkb2bvrw0yxh2i19ncjim641rqyph9kq9np00wsb3aiz1559"; 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]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
@@ -8689,12 +8815,12 @@ in with self; {
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
   itemanalysis = derive2 { name="itemanalysis"; version="1.0"; sha256="1ksbd69mca45jlr2gpars87cf4jfm5rx6sz009sv6a83x831x5rq"; depends=[car ggplot2 polycor]; };
   iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
-  iterators = derive2 { name="iterators"; version="1.0.10"; sha256="1s3iykfvccpnzs73z90rx18qvbvgw2dgl4nfcrvm5m1850qb5qd9"; depends=[]; };
+  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]; };
   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.0"; sha256="0pfvkhpyqjjpj1i2jf32pj9i86a31qwwwm41i6vj25j68krlyz8q"; depends=[boot car forecast ggplot2 plyr]; };
+  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=[]; };
   itunesr = derive2 { name="itunesr"; version="0.1.3"; sha256="1czwkrqy3jqw1x0z5zj2kvp4p11s5zdiswwhx9jfxdcsg86zhr45"; depends=[curl jsonlite lubridate xml2]; };
@@ -8708,13 +8834,16 @@ in with self; {
   ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; };
   ivtools = derive2 { name="ivtools"; version="2.2.0"; sha256="183lfv18r763jki8i37b8hk1k1kiglmhvjnfzigqzkzqc4cwibm1"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; };
   ivx = derive2 { name="ivx"; version="1.0.0"; sha256="0gxq0w9cmgg17y7kdjxfzaq8nr4knashfav0vjpq6ba9jh5grk9l"; depends=[magrittr Rcpp RcppArmadillo tibble]; };
+  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.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; };
+  jaatha = derive2 { name="jaatha"; version="3.2.1"; sha256="0zqvylknvymggw5jl40cfyahfjy64wb25f0qymh78xbamv1hc85w"; depends=[assertthat R6]; };
   jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; };
+  jackalope = derive2 { name="jackalope"; version="0.1.2"; sha256="0mjlilsjh8y3rwskqa1xqhdz4f2za1a25jvhl4d3j54rc6ldkj0k"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
   jackstraw = derive2 { name="jackstraw"; version="1.3"; sha256="02qcaf2p0fyni6n2zhd7vp65kniz74di0pf5jzz79jwj15cfd1b0"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; };
   jacpop = derive2 { name="jacpop"; version="0.6"; sha256="0kq6rn33civ2g6i5nwfqvcgmnn5k2dwmw60lkmz4ywm0y4xxlkai"; depends=[]; };
-  jagsUI = derive2 { name="jagsUI"; version="1.5.0"; sha256="0cfixhv4fabka13xvnglwacgpadhdr12w6lk563zfz83192r7h8g"; depends=[coda lattice rjags]; };
+  jaggR = derive2 { name="jaggR"; version="0.1.1"; sha256="0qd4kwcc8zcvg2p1njcv7z4y5ssg77zsylph5bcaqdjxq996q7rv"; depends=[formatR glue]; };
+  jagsUI = derive2 { name="jagsUI"; version="1.5.1"; sha256="1samj54hyarx9j6k652jl988y3fhxsqg50hfzxdwairg0m2mlgmq"; depends=[coda lattice rjags]; };
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; };
   janitor = derive2 { name="janitor"; version="1.2.0"; sha256="131bld44bkjahpby0aqscl9sh1abc31dx2822vbdvib55hls45ay"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; };
@@ -8726,7 +8855,7 @@ in with self; {
   jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; };
   jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; };
   jenkins = derive2 { name="jenkins"; version="1.0"; sha256="02yqadbwnpbscnyjf6xqdfz9j7dqyz3741nrwz4cn9d4j4c3sjdi"; depends=[curl jsonlite]; };
-  jetpack = derive2 { name="jetpack"; version="0.4.2"; sha256="1mzd26hlnjf2q2yq38z4c2jf5wfn8nm8y9qqlk2dmp0lc2xxxdpg"; depends=[crayon desc docopt packrat remotes]; };
+  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]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
@@ -8738,7 +8867,7 @@ in with self; {
   jmdl = derive2 { name="jmdl"; version="0.3.0"; sha256="0167yj368lh1n79jwbqs4g2asb67hfmgh97519linmfpx0n6xdpa"; depends=[boot Formula MASS minqa mnormt mvtnorm]; };
   jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; };
-  jmuOutlier = derive2 { name="jmuOutlier"; version="1.5"; sha256="0iqfg0vyd4l1sz74wbb8n607y4r4bsj9iymh750w7ajfpqmf5dyv"; depends=[]; };
+  jmuOutlier = derive2 { name="jmuOutlier"; version="2.1"; sha256="0nmaxmqx0h7qmv0cl0j51945glxvchlvvbj58i90gds61fngi5wh"; depends=[]; };
   jmv = derive2 { name="jmv"; version="0.9.6.1"; sha256="10b59415wb48k2wv2n74v89acgj843qk4pp0jkpns6nhymw41m0q"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
   jmvconnect = derive2 { name="jmvconnect"; version="1.0.8"; sha256="0r2idgvhhz2dqh3svc4l8is29h4zwl0qicv8961v646c8k1pdl0i"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; };
   jmvcore = derive2 { name="jmvcore"; version="1.0.0"; sha256="1agwzmd24b22x303dpmb5qjbzsrxp287n52c7iavzx42sfishayi"; depends=[base64enc R6 rjson rlang stringi]; };
@@ -8747,13 +8876,14 @@ in with self; {
   joineR = derive2 { name="joineR"; version="1.2.4"; sha256="05wr7gr3mnsfj8a1m5v1b71gh3fc4pyhj6rqapls7iwrkywbf1b6"; depends=[lattice MASS nlme statmod survival]; };
   joineRML = derive2 { name="joineRML"; version="0.4.2"; sha256="06a7iicq3fngsmmi8qcz2fdzdzvym5s70s3aaqlzxnl4sj9km3g2"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; };
   joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="3.3"; sha256="1h2ql3pzpi5ci5xiigsh7rdzlmsw0k4fjp6yvs8b71lvf4gbssyw"; depends=[survival]; };
+  joinet = derive2 { name="joinet"; version="0.0.1"; sha256="0yljnyfba49pzayhlq7ksfbkyx30r6ychky79041g57bdil85ywj"; depends=[cornet glmnet palasso]; };
+  joint_Cox = derive2 { name="joint.Cox"; version="3.4"; sha256="0xq7rvqbc6mrxpn90a7wid4kx5fhq42mynsxnhdnppwshb9zr46y"; depends=[survival]; };
   jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; };
   jointMeanCov = derive2 { name="jointMeanCov"; version="0.1.0"; sha256="1cai5g63n11dirn9fldzkqxcnkxc20ndr9ygrr9rk0s1qz8x63pb"; depends=[glasso]; };
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
   jointseg = derive2 { name="jointseg"; version="1.0.2"; sha256="0zilkxk30w3l9mwikmsgvpy5misjggs98c3bjrjy1pfc4b0is943"; depends=[acnr DNAcopy matrixStats]; };
-  jomo = derive2 { name="jomo"; version="2.6-8"; sha256="097zfdcqc3a45ay8xxbraqh8xsfyivskkdmc2b4ca4n979lx8vyb"; depends=[lme4 MASS ordinal survival]; };
+  jomo = derive2 { name="jomo"; version="2.6-9"; sha256="16ychdhhv8cii8zrdfdf5gzgnvmfaq573bmi00xqdf323q3lf3xr"; depends=[lme4 MASS ordinal survival]; };
   josaplay = derive2 { name="josaplay"; version="0.1.3"; sha256="0q6kjk3mjxwbqvq3zz0ylpi1viznp9pxzngqpjzv5sibv0ndh0lf"; depends=[magrittr utf8]; };
   jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
@@ -8767,7 +8897,7 @@ in with self; {
   js = derive2 { name="js"; version="1.1"; sha256="1xsdr14k4djcd1nqybvfzhviics4igsj8yz3r0j2nqhin2wjynlf"; depends=[V8]; };
   jsTree = derive2 { name="jsTree"; version="1.0.1"; sha256="0n754illyw29bprll676k9qm5vk5h8qss6gb8lls57kdzj51x2jz"; depends=[data_table htmlwidgets jsonlite]; };
   jskm = derive2 { name="jskm"; version="0.3.5"; sha256="19r1517ismcm5393gi1vwjd32zhgwk65zr3ghaxrn1br6sgdy57s"; depends=[ggplot2 gridExtra plyr scales survey survival]; };
-  jsmodule = derive2 { name="jsmodule"; version="0.9.2"; sha256="0r760dn37xcvjrnjj3l2phrgdljdw6hb7qgd8d1khmgs4dw3mi53"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; };
+  jsmodule = derive2 { name="jsmodule"; version="0.9.9"; sha256="1hzw7ib59l4dckmwqf8xv5h34y7xiglg9jll6qv459nqj3nwjyw7"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; };
   json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; };
   jsonify = derive2 { name="jsonify"; version="0.2.1"; sha256="1jrc7w9i0riy6ls18d127i5ac6wlpc03n01bw74kkrwl4f6f17fn"; depends=[BH rapidjsonr Rcpp]; };
   jsonld = derive2 { name="jsonld"; version="2.1"; sha256="0lp0lp9nbk31dia2nq6xba29ymak9h5wl4zbq4pdqw6qm9iwz6ww"; depends=[curl jsonlite V8]; };
@@ -8775,12 +8905,12 @@ 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.8.3"; sha256="15mym9pqvd7arqflii091r7mx45pxnbcvjj5yd0vcl451a8hilfd"; depends=[coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
+  jstable = derive2 { name="jstable"; version="0.8.5"; sha256="00l88jxrrxkp1ijvfswr32xy5sqzqaa8q783layc0jf9b8fgf59z"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; };
   jstor = derive2 { name="jstor"; version="0.3.6"; sha256="00sd4mq21al8f8ixgy8f65xbgp90if1jpp7mcm50jrbajdwwflmk"; 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]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
-  jubilee = derive2 { name="jubilee"; version="0.2.5"; sha256="0j16325vxlr797gr39g6mdrgfas1qvxhajfsrmzr4hflqibw03gk"; depends=[data_table readxl xts yaml zoo]; };
+  jubilee = derive2 { name="jubilee"; version="0.3.1"; sha256="1wdm5k9hy3v3kahjyhifqqivqn13c8h3bcxg2z2qam7hcafvdc1l"; depends=[data_table readxl xts yaml zoo]; };
   junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; };
   junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; };
   justifier = derive2 { name="justifier"; version="0.1.0"; sha256="14795pf94bzcnnaf5w0xqzy06vqvs76gdvr1rn4ihqh2az00l6n7"; depends=[data_tree DiagrammeR purrr ufs yum]; };
@@ -8805,7 +8935,7 @@ in with self; {
   kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; };
   kde1d = derive2 { name="kde1d"; version="0.4.0"; sha256="0sgq85fn5zfdczazq6wb8rgiv7bab6j3zh8gl2bsm1925h8k4x0p"; depends=[BH cctools qrng Rcpp RcppEigen]; };
   kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
-  kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; };
+  kdensity = derive2 { name="kdensity"; version="1.0.1"; sha256="1iinwbyn3d10gsh7i43sm9hf93baqla3gd5s10kiik76r7d97pdc"; depends=[assertthat]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kdevine = derive2 { name="kdevine"; version="0.4.2"; sha256="15hw27y4rlifz3kyirm7yacca38xqdwr42k21gg67dhmbdplbnz0"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; };
   kdist = derive2 { name="kdist"; version="0.2"; sha256="18q7njvsb9sbm412c6ms4b4nxg768z9qahws5rnin06gvb25nfcx"; depends=[]; };
@@ -8825,6 +8955,7 @@ in with self; {
   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.0.0"; sha256="1a5pg8y4p86558d6rkvzzw41vadkpvw0vxnnksc2lrc6xj7nx25y"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo tmg]; };
+  kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; };
   kernelboot = derive2 { name="kernelboot"; version="0.1.5"; sha256="0m31akhya7390lbkw0cjxcrzw28njbz4smd35m93aarb2lgpcj4k"; depends=[future future_apply Rcpp]; };
   kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; };
   kernlab = derive2 { name="kernlab"; version="0.9-27"; sha256="1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn"; depends=[]; };
@@ -8892,6 +9023,7 @@ in with self; {
   komadown = derive2 { name="komadown"; version="0.2.0"; sha256="0mw1bcrg10yy1y844lpik70979420h0nsar48v5p3qk783pymbdp"; depends=[bookdown rmarkdown]; };
   komaletter = derive2 { name="komaletter"; version="0.3.0"; sha256="09yvb8ijm1s5d89mrl8j56n8x8q1lq2siprw8191ys3jidmk6ha7"; 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]; };
   kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; };
   kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; };
@@ -8907,7 +9039,8 @@ in with self; {
   kst = derive2 { name="kst"; version="0.5-2"; sha256="0xkmwr4222h4r5dzmfgr0zk8gx7bplm865p5snw2q6h46rbfsasv"; depends=[proxy relations sets]; };
   kstIO = derive2 { name="kstIO"; version="0.3-0"; sha256="0pmgb7n4gvslzc6qhqga39593k45vimj1y774bfsxhsacsb1ad9l"; depends=[kstMatrix MASS pks relations sets stringr]; };
   kstMatrix = derive2 { name="kstMatrix"; version="0.1-2"; sha256="1z5gs0x80dq549mba2sy1nfhsphrpkrydalj2jiwqb7fmwqknm3r"; depends=[]; };
-  ktsolve = derive2 { name="ktsolve"; version="1.1.1"; sha256="031z0pnx3ghflsz7p9b3xacnz8c7li82bid526zwqc8mvqy6ay4x"; depends=[BB nleqslv]; };
+  ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; };
+  ktsolve = derive2 { name="ktsolve"; version="1.2"; sha256="1606b9anlqjwcbf3jp1rpwzvyx94k79q6zw3p9j0a4nxdvgxlx1j"; depends=[BB nleqslv rootSolve]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
   kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
@@ -8923,8 +9056,8 @@ in with self; {
   l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; };
   l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; };
   laGP = derive2 { name="laGP"; version="1.5-3"; sha256="1bn7mj42kjgqa350ikkk7dlvash3l1fw9wdzrbjb2y41mnv8ipav"; depends=[tgp]; };
-  labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; };
-  label_switching = derive2 { name="label.switching"; version="1.7"; sha256="1p4cgqf79zppvzrhh5gcxnm7f8qj03fzfmjx43mjhsr1vqig4c78"; depends=[combinat lpSolve]; };
+  labdsv = derive2 { name="labdsv"; version="2.0-1"; sha256="099rzl9hy70rmb5fg0vx26mlhr4ra2s0hl3jgv22s8hqpvlmakas"; depends=[cluster MASS mgcv Rtsne]; };
+  label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; };
   labelVector = derive2 { name="labelVector"; version="0.1.0"; sha256="08ydgmvks09hbln10zmqxv9hxgiha0n9w5cgych9bnkqdca74gah"; depends=[]; };
   labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
   labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
@@ -8933,6 +9066,7 @@ in with self; {
   labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; };
   labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
   lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; };
+  lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-8"; sha256="1dya5jbrr76p20k37v07g8wck8vrdr2j3r04pqhmwq6i7h0w2c30"; depends=[RcppRoll spatstat]; };
   laeken = derive2 { name="laeken"; version="0.5.0"; sha256="1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
   lagged = derive2 { name="lagged"; version="0.3-0"; sha256="0bm3d6pgb25rw1njarki60j4d7mx7rni25a21iw1l650slg7sscm"; depends=[]; };
@@ -8948,7 +9082,7 @@ in with self; {
   landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
-  landscapemetrics = derive2 { name="landscapemetrics"; version="1.1"; sha256="0qd72nvx8k1kg47mpqycd90cwzsisv2mgm0hlkgbcbpi0ccvz0q4"; depends=[cli crayon ggplot2 raster Rcpp RcppArmadillo sp tibble]; };
+  landscapemetrics = derive2 { name="landscapemetrics"; version="1.2"; sha256="0k9algml4yj4yp0zsj742vcmjwml1sqfval8759060v0fbn4fj5h"; 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.7"; sha256="00ckjjyq33y362xhwjic8rwz06ml3s5l8wxxf7cgh0xkzv5hwcnr"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
   languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; };
@@ -8972,10 +9106,10 @@ in with self; {
   lattice = derive2 { name="lattice"; version="0.20-38"; sha256="0b8abkz7syscq883mrgv63pkwaqkcpwfx8rgbqy9vgfva0z5xszx"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.1.0"; sha256="0amxkdf240pgqaydkfvmv1mgsl17jv57938sl96clw1bzd4ilnld"; depends=[sp spam spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
-  lava = derive2 { name="lava"; version="1.6.5"; sha256="13rlqdg42ylnz4hc932bl50xismrcr4d9ykcd9zs19cw5mckjx0f"; depends=[numDeriv SQUAREM survival]; };
+  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]; };
-  lavaan = derive2 { name="lavaan"; version="0.6-3"; sha256="0hw856kv11zqn6nd4216rh19i6xbnc1rh044r7jvvxkhzgbqkyxz"; depends=[MASS mnormt numDeriv pbivnorm]; };
+  lavaan = derive2 { name="lavaan"; version="0.6-4"; sha256="1zf0sxpms35rhq2syb7r3sshhc8kjvc3pv97dk9x0gf4xl7pck4g"; depends=[MASS mnormt numDeriv pbivnorm]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
   lavaanPlot = derive2 { name="lavaanPlot"; version="0.5.1"; sha256="01bx1snd3zhc8dmq0f407qhw2d00f6d38qpr791qc1mq5kr3d8qj"; depends=[DiagrammeR lavaan stringr]; };
@@ -8987,6 +9121,7 @@ in with self; {
   lazyeval = derive2 { name="lazyeval"; version="0.2.2"; sha256="1m10i059csrcqkcn59a8wspn784alxsq3symzhn24mhhl894346n"; depends=[]; };
   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.4"; sha256="1j1da1848vjkvvnc6x3svmdy0fjn5pkn24llriy7w3mj8lr4bdpb"; depends=[dplyr h2o lubridate magrittr openssl ReinforcementLearning tidyverse]; };
   lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; };
   lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
   lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; };
@@ -8998,11 +9133,12 @@ in with self; {
   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.3"; sha256="0rs8lzywbajdzxmrbc8xx0vr2zs052rpbi9fcm1mpai2w8zfba2l"; depends=[copula pcaPP Rcpp]; };
+  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]; };
   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]; };
   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]; };
   ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
@@ -9012,7 +9148,7 @@ in with self; {
   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=[]; };
-  leafR = derive2 { name="leafR"; version="0.2"; sha256="0wkniz6m5zar8p5vjn9wjz6whi8xal28kvhk9axbxifb9gykyyzl"; depends=[data_table lazyeval lidR raster sp]; };
+  leafR = derive2 { name="leafR"; version="0.3"; sha256="0bb05y0py2q0qmvapbv3ibrycjb8i4adl25807i8l7g768y3llsr"; depends=[data_table lazyeval lidR raster sp]; };
   leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; };
   leafem = derive2 { name="leafem"; version="0.0.1"; sha256="0yjbwhxjifhf1yw3phc12hlrr080y4331dwgpxdg62x7v0y5xl31"; depends=[htmltools htmlwidgets leaflet raster sf sp]; };
   leaflet = derive2 { name="leaflet"; version="2.0.2"; sha256="051i5qmwa0zbk4jpjrx9kzk4g8qg9c3cavvhw19yj08fjhh8si7s"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
@@ -9020,6 +9156,7 @@ in with self; {
   leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; };
   leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.5.4"; sha256="17lrchpry3in36jdkinsxs9lzqnx65xyk9g939knc8nmjw6z2j2r"; depends=[htmltools leaflet]; };
   leaflet_opacity = derive2 { name="leaflet.opacity"; version="0.1.0"; sha256="19dkl105sf7c9wrpl8kzwsjwwc7r9qb4c1g85w2lavpj0pbyazxw"; depends=[htmltools htmlwidgets]; };
+  leaflet_providers = derive2 { name="leaflet.providers"; version="1.8.0"; sha256="1rbx3n59hrbh3ncfzcv442shdyx64d67nlviisyfixvc1jlmjr2h"; depends=[htmltools]; };
   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]; };
   leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; };
@@ -9030,7 +9167,6 @@ in with self; {
   leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; };
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
   learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; };
-  learningCurve = derive2 { name="learningCurve"; version="1.1.2"; sha256="02dl5rlvwa8dvhknf4kdfg3aial54shnxrq7k2k8yj2dj0qh062c"; depends=[ggplot2 gridExtra scales tibble]; };
   learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
   learnr = derive2 { name="learnr"; version="0.9.2.1"; sha256="0jbk0g6fkw7zs8ykzhsvh9vvz8xmc4v03bqzjsa5mmpxpqan5vx5"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
   learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
@@ -9039,12 +9175,12 @@ 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.2.3"; sha256="0w0wpnhh6qx33da9gnsmnfr9kbvn6b3jkcfaa2h9g5yp67ghh11v"; depends=[reticulate]; };
+  leiden = derive2 { name="leiden"; version="0.3.1"; sha256="19gq27zin4gf4sh7h24gyq3f8jjir20n2l36a7pk1pbzcr4ixyhp"; 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]; };
   lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.8.6"; sha256="1yw9wvhv1vysdd48jl9vy88nv9x7rlic4my2sy30jgr1h33r5f41"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; };
+  lessR = derive2 { name="lessR"; version="3.8.8"; sha256="1izkxy1cwsii0075xby3lkjrbgycpgkn9yk6akq6wgl758qpw5ab"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; };
   lest = derive2 { name="lest"; version="1.0.0"; sha256="06ng0dpj37bhhwc34ilpks2ics97m9yjdpj4q993h3s2fn8kdgxw"; depends=[]; };
   lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
@@ -9053,7 +9189,7 @@ in with self; {
   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.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
+  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]; };
   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]; };
@@ -9073,9 +9209,10 @@ 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.0.3"; sha256="0dpxw2gh55l11kzfnz5miq522zz63cblbgkkxlkbqhxd9a1l04w3"; depends=[BH data_table future gdalUtils geometry glue gstat imager lazyeval raster Rcpp RCSF rgdal rgeos rgl rlas sf sp]; };
+  lidR = derive2 { name="lidR"; version="2.1.0"; sha256="1rpln2ngqy7p5809ip557xila4c4xvmm7skmh4l7q07lmplxc5wl"; depends=[BH data_table future gdalUtils geometry glue gstat imager 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]; };
   lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; };
   lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; };
   liftLRD = derive2 { name="liftLRD"; version="1.0-8"; sha256="1m24f4mc70l808cpkcdm91hzb5b3bkzibvgyfi9zs6cs8apcvmy3"; depends=[adlift nlt]; };
@@ -9127,6 +9264,7 @@ in with self; {
   listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; };
   listviewer = derive2 { name="listviewer"; version="2.1.0"; sha256="09jkrrq4zyzgi66vkpm5n7isxpbckx5hjk39nik766hzarj5i7rs"; 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.4.1"; sha256="1348vljlm546j00bh9x8dfjjrvvclamx5cb7ik9bganj1i9dvjmk"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr yaml]; };
   littler = derive2 { name="littler"; version="0.3.8"; sha256="0g4aw031fsv69i7ah1g308dj0jsb9gpz0pbixji0agqqivhsf63a"; depends=[]; };
   liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; };
   live = derive2 { name="live"; version="1.5.10"; sha256="17wz3cs6pjghc31965wblm3lm3x1pr5bk5j1wi84vyyl0sni3qx4"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; };
@@ -9173,7 +9311,7 @@ in with self; {
   lmviz = derive2 { name="lmviz"; version="0.1.2"; sha256="06pl0gzsbpk6l7l5np2c2rv37d2b3mr7qhxd7z4yiqiaffdrmrpz"; depends=[lmtest mgcv shiny shinyjs]; };
   loa = derive2 { name="loa"; version="0.2.44.2"; sha256="16yrkl8l4wa4i3iizncm58l75l46acfr2lf4vn53crcci9xra333"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
   loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; };
-  lobstr = derive2 { name="lobstr"; version="1.1.0"; sha256="1ii4ah9b0dn5xm6ql6yvm4r88iflh3gymz4d2mxcqfk792yp1pkb"; depends=[crayon Rcpp rlang]; };
+  lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; };
   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]; };
@@ -9185,6 +9323,7 @@ in with self; {
   locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; };
   lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; };
   loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; };
+  lodi = derive2 { name="lodi"; version="0.9.0"; sha256="06ljky3r168navs9dys3dv22cb35lnz47wa3pqkxaiy94h254hvh"; depends=[rlang]; };
   loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; };
   log4r = derive2 { name="log4r"; version="0.3.0"; sha256="14d66xgv1z8v8wqxkycjhpl4r0z14cx9i6lxxs5y844454hh4pcf"; depends=[]; };
   logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; };
@@ -9196,7 +9335,7 @@ in with self; {
   logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
   logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; };
   logger = derive2 { name="logger"; version="0.1"; sha256="00gfy2i58qn5na8cxxrkm1pvsw85xx2gdk0y6dzxhcjfx3wyplaw"; depends=[]; };
-  logging = derive2 { name="logging"; version="0.9-107"; sha256="0qkg4ar0qn6zjqy3ymjpfiq39lxzfdh5pg3khrpyx6z2s5w426dp"; depends=[]; };
+  logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; };
   loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; };
   loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; };
   logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; };
@@ -9208,7 +9347,7 @@ in with self; {
   logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; };
   loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
   logmult = derive2 { name="logmult"; version="0.7.1"; sha256="0y9z5l93hm8p3r1rd6g11miqg1a02b9hy5mgcxv2q0hm1pg2vh0q"; depends=[gnm qvcalc]; };
-  lognorm = derive2 { name="lognorm"; version="0.1.5"; sha256="00l7nx6brhn5z7sk59n4bjw8h2wzf3r273ma6i62zhdc2nglz479"; depends=[Matrix]; };
+  lognorm = derive2 { name="lognorm"; version="0.1.6"; sha256="05a6djz06jblnx51x2r5gwb57l4wq6giz6kknsslzsl64xj275z1"; depends=[Matrix]; };
   logspline = derive2 { name="logspline"; version="2.1.13"; sha256="1mhv23r7whragw2rg8hcwll2mki1z85mrp82zxn5pkljl5yndagh"; depends=[]; };
   lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; };
   lolog = derive2 { name="lolog"; version="1.2"; sha256="1vd80ngq4558ahan1vhsql0wc578imm13fgrrgnzlrd91xncnnjf"; depends=[BH ggplot2 intergraph Matrix network Rcpp reshape2]; };
@@ -9216,7 +9355,7 @@ in with self; {
   longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; };
   longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; };
   longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; };
-  longclust = derive2 { name="longclust"; version="1.2.2"; sha256="1yxxz8apbl1vaqzrsiq7r5ss87j2li595bkvibpkwslgwzv47dcs"; depends=[]; };
+  longclust = derive2 { name="longclust"; version="1.2.3"; sha256="1g45d5pak2vhbjrcmxxrk9jyrdxkqwy45phzpsw6b2bjyrgr4i7g"; depends=[]; };
   longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; };
   longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; };
   longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.1.1"; sha256="1xm2w8qif34sv2f57996pxf1j52lyrmzaswmszpxiy1lvf2h362g"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; };
@@ -9226,6 +9365,7 @@ in with self; {
   loo = derive2 { name="loo"; version="2.1.0"; sha256="0zg8a11qhifg1p3hisxin1q47wlykjig4k3dz5zmflfihpps3x0v"; depends=[checkmate matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
   loon = derive2 { name="loon"; version="1.2.2"; sha256="1mb6jys2pipac31x8a7rm265zvx1l11w1gl2b82afl8as2v7s90j"; depends=[gridExtra]; };
+  loon_data = derive2 { name="loon.data"; version="0.0.5"; sha256="0hvgvsv1vxx7m1fh8kjj7kfpl0c44n8xw9v8vaxlnz30s8rwhplc"; depends=[]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
   loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
   loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; };
@@ -9235,11 +9375,11 @@ in with self; {
   lori = derive2 { name="lori"; version="2.1.3"; sha256="09wk6pfrfazh8s4zc7v1x5gsra9klh7whc3jnpasvhgnna5515ys"; depends=[data_table FactoMineR 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.1"; sha256="1f10ywlaaldgjj84vs108ly0nsbkrdgbn5d6qj7nk93j1x1xrn3a"; depends=[]; };
-  lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.1"; sha256="006dzb1pmyqqdrivhb2mqvn9lp97bv9h9wrmp42r1mh7vqn740ww"; depends=[]; };
+  lpSolve = derive2 { name="lpSolve"; version="5.6.13.2"; sha256="0fc5m259ayc880f5hvnq59ih6nb2rlp394n756n1khmxbjpw1w3m"; depends=[]; };
+  lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.3"; sha256="116adayi5xwg7l049bszz7452avfbyphivnzvy9l3k48awfimfi9"; 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="0.2.3"; sha256="1126kk71vnhwn0vbdmjbx36pi33xd22a71j91d1mqhqkql6mis8y"; depends=[ggplot2]; };
+  lpdensity = derive2 { name="lpdensity"; version="1.0"; sha256="1rmddq8drvwdlqw9ggf3h8dcvx64hh6ha2v9zdxfjmi50zlcirg5"; depends=[ggplot2]; };
   lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
   lpirfs = derive2 { name="lpirfs"; version="0.1.5"; sha256="015009c930jilspmpk8w27lixda3mynqrlv1klss0xaj7ih286yq"; depends=[doParallel dplyr foreach ggplot2 lmtest plm Rcpp RcppArmadillo sandwich]; };
   lplyr = derive2 { name="lplyr"; version="0.1.12"; sha256="1wcab8wwdzpgb61q83gfn2d34vsrd3qa4xyb9sqna6krss1ii1in"; depends=[bazar dplyr lazyeval magrittr]; };
@@ -9259,7 +9399,7 @@ in with self; {
   lsei = derive2 { name="lsei"; version="1.2-0"; sha256="1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7"; depends=[]; };
   lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
   lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; };
-  lslx = derive2 { name="lslx"; version="0.6.6"; sha256="1zian0xagmqz7d9yf2nz87q91pkwy6kgv960n3lsfg4m9v6dnpdz"; depends=[ggplot2 R6 Rcpp RcppEigen]; };
+  lslx = derive2 { name="lslx"; version="0.6.8"; sha256="0x1xfgk0k77k3qvsqqi5cy73v1a2ra5rbfwvhm3wdjk928n1c9dv"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
   lsm = derive2 { name="lsm"; version="0.1.8"; sha256="0h7gyc4wb0y3hvs21h22l57czdd3xfycg400ncz5c9s63r47wzx3"; depends=[]; };
   lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; };
   lspartition = derive2 { name="lspartition"; version="0.3"; sha256="1pz636g60vp01z50kl9qp9yfb9bm83x761s0i901absdsqjs35a8"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; };
@@ -9283,7 +9423,7 @@ in with self; {
   lulcc = derive2 { name="lulcc"; version="1.0.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; };
   lumberjack = derive2 { name="lumberjack"; version="0.3.0"; sha256="00br82x9n6x96ksqqgahc1ydffl9cv8lysm57pk2mxm0fzbcph2p"; depends=[R6]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
-  lutz = derive2 { name="lutz"; version="0.2.0"; sha256="1ypi61b0l5pig2lvvq9lmqkqcsxhnf154lxridp0amv5rcmf2fxy"; depends=[V8]; };
+  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]; };
   lvec = derive2 { name="lvec"; version="0.2.2"; sha256="0n1l26n4khlalqd0b9bi7vc3kr5jh6mr56ca0rmnnl6bl9742nr5"; depends=[BH Rcpp]; };
   lvm4net = derive2 { name="lvm4net"; version="0.3"; sha256="1iq93mrdhymdixnk7y7rkibm3cqljl4y9qkjq4mzkcwcp4960y5q"; depends=[corpcor ellipse ergm glmmML igraph MASS mvtnorm network]; };
@@ -9327,10 +9467,10 @@ in with self; {
   magclass = derive2 { name="magclass"; version="4.107.0"; sha256="0yl2w9dim462dv9nxsqvdv0ydq6njkk9bywmjanzbqqxnxb9fall"; 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.7"; sha256="121z8rgdfp24r8lbhharmb6cdpdkiz3v65qfvns4k9alx2lxb1vj"; depends=[celestial mapproj MASS plotrix sm]; };
+  magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="2.0"; sha256="18y465325mhf48x2jn3jz9khwq1z2aj13wfbdkv8k3hln1sd572m"; depends=[curl magrittr Rcpp]; };
-  magickGUI = derive2 { name="magickGUI"; version="1.0.1"; sha256="06yklhv0r3pa62j6kmrs3pzvjr4whqklmxl83jc972w0bfmw47ck"; depends=[magick]; };
+  magick = derive2 { name="magick"; version="2.1"; sha256="1pz71maz05gx4ds1wfw0alggc8nn2w75lj12dg1zr72s3kybhkzg"; depends=[curl magrittr Rcpp]; };
+  magickGUI = derive2 { name="magickGUI"; version="1.1.0"; sha256="1grwrp7jj0p2h5aafmrbwdi3d49ck6k6bjqv9742apdvlcq8ydj7"; depends=[magick]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
@@ -9339,9 +9479,9 @@ in with self; {
   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.0"; sha256="157nd44jhx5d4dcaa7s6brn75zgsyajz2rmskm70c8hqxyak9f63"; depends=[tibble]; };
+  makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; };
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
-  malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.3"; sha256="1vvralhrh4sk742f4yb05lfchxwmpl7n0yqw7hhfga4fc1qxnd9l"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; };
+  malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.4"; sha256="0hvbzknh4qv1d7by5pgyq85b1accinwx57f9a24jg4cw4307dncg"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
   mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; };
@@ -9352,7 +9492,7 @@ in with self; {
   manifestoR = derive2 { name="manifestoR"; version="1.3.0"; sha256="1bxmlg6fmr4ky9m7b65rrylspwhwc8k9s1cbxnx9dyl33wh39ci6"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; };
   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.1.0"; sha256="00kizk9mjb7fmz2qzw3ja57718skq9vldx1n6f7x2zwbygv51q8z"; depends=[caret dplyr e1071 magrittr Metrics plyr reshape2 tibble tidyr]; };
+  manymodelr = derive2 { name="manymodelr"; version="0.2.2"; sha256="02jswli6k4m9662zf48maix28lr7w93rgwvzgm0nv1zf2mdrh6qb"; depends=[caret dplyr e1071 magrittr Metrics plyr purrr reshape2 tibble]; };
   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]; };
@@ -9384,9 +9524,9 @@ in with self; {
   marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.8.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.6.9.14"; sha256="0szv913zi34yv58kj6cic8fkrfyrl60m1ym11sgsjha0pjlv3hlw"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.6.9.16"; sha256="1mi9wr5s1a422v6fhjxjw2038bmaip1dij90v4ckg8nqp0q9zm14"; 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.2"; sha256="03xmp7jz2jja7m92yczc2nlcyv4qlcy7lnj3nk5wb3alh1vxlyga"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
+  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="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; };
   mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; };
@@ -9407,10 +9547,11 @@ in with self; {
   matlib = derive2 { name="matlib"; version="0.9.2"; sha256="09afscydrn5bk91qb26r8w7f33nhxp1ih4h55y6adcw7p6hjrw27"; depends=[car MASS rgl xtable]; };
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
   matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
-  matrixNormal = derive2 { name="matrixNormal"; version="0.0.0"; sha256="1m3qvvw02fqisjjsvlpz4dpy71cmn0ds6pajdmzj2shfvyyh6q4d"; depends=[mvtnorm]; };
+  matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; };
   matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; };
   matrixStats = derive2 { name="matrixStats"; version="0.54.0"; sha256="0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"; depends=[]; };
-  matrixTests = derive2 { name="matrixTests"; version="0.1.4"; sha256="07k4g2d1yy2g3zppwq6warv8p47y096fvz6b4113nk9ss2p9sand"; depends=[matrixStats]; };
+  matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; };
+  matrixTests = derive2 { name="matrixTests"; version="0.1.5"; sha256="0grgvi4avlf3l4kmpn60ihnyvaxlw1fz14sx3ycgynip7b17kb24"; 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="1.1.0"; sha256="1q0vcail34iwxc0wnwg2nw9n710fsjg5lgil5hib74vwrww1x1h7"; depends=[keep]; };
@@ -9436,7 +9577,7 @@ in with self; {
   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.1.5"; sha256="10rsym78dzyyynyc1c62l178j6llgii0rklj8dirx3dfi9p942dl"; depends=[dplyr lubridate magrittr purrr reticulate tibble]; };
+  mboxr = derive2 { name="mboxr"; version="0.1.6"; sha256="11fakbrhpphjbc4p0src0f3l39dillhbz8030cc79zdann9jfp4p"; depends=[dplyr lubridate magrittr purrr reticulate tibble]; };
   mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; };
   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]; };
@@ -9462,10 +9603,11 @@ in with self; {
   mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
   mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; };
-  mclust = derive2 { name="mclust"; version="5.4.4"; sha256="039ymr57bq5327gypizw0v2qb81j6bkqhjdh8yj23qa5sh51phyc"; depends=[]; };
+  mclust = derive2 { name="mclust"; version="5.4.5"; sha256="0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm"; depends=[]; };
   mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; };
   mcmc = derive2 { name="mcmc"; version="0.9-6"; sha256="1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4"; depends=[]; };
-  mcmcabn = derive2 { name="mcmcabn"; version="0.1"; sha256="0cyqgkz55vc3hihls7krci4d83d48cqc0x355qkzxijwj5xd7bgg"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; };
+  mcmcabn = derive2 { name="mcmcabn"; version="0.2"; sha256="0mn12dkag1wlr0sdzfxxl1hkwkkwl9p2c4imnm4nzhw510zaa4fj"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; };
+  mcmcderive = derive2 { name="mcmcderive"; version="0.0.1"; sha256="12asjw8rnnr7249fb7z7mp5w8y5vb0zig93jzsf77gghhfjmp4dl"; depends=[abind checkr err mcmcr purrr]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; };
   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]; };
@@ -9487,7 +9629,7 @@ in with self; {
   mdir_logrank = derive2 { name="mdir.logrank"; version="0.0.4"; sha256="0bhsr005dq9v85sjm2g9xlpksxwzsmsk14g0q5v3hkjvm5wk6xmv"; depends=[MASS]; };
   mdmb = derive2 { name="mdmb"; version="1.3-18"; sha256="0jvwwdblky080j8cwfjna2d11z7hr672cdw9bkjz7ngd44blyp8x"; depends=[CDM coda miceadds Rcpp RcppArmadillo sirt]; };
   mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; };
-  mds = derive2 { name="mds"; version="0.2.1"; sha256="01md6h3va2pvgx2yx30rmildn529zhqr8ars6k2kjr8q1wq92jar"; depends=[lubridate parsedate]; };
+  mds = derive2 { name="mds"; version="0.3.0"; sha256="098ynvwra7ylli1pklmmfl9xnmiyd13iw5zd7g2xlqmg3rrphysg"; depends=[lubridate parsedate]; };
   mdsOpt = derive2 { name="mdsOpt"; version="0.4-1"; sha256="02na4hrv1id06gv2fwn8nxbddiz4bs4lgf3yzgxsca1k9qbsj99q"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
@@ -9496,14 +9638,16 @@ in with self; {
   mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; };
   meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; };
   meanShiftR = derive2 { name="meanShiftR"; version="0.53"; sha256="1pla9hr9nbbnc3hcmk0ywfh6129zng5lp3dmjqb3cgdrmwkdrx9i"; depends=[]; };
-  meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; };
+  meanr = derive2 { name="meanr"; version="0.1-2"; sha256="0w9jgncbnf82x747pxrpbbbvajmksc1dq79cc4hxr2cpvqsqyfsh"; depends=[]; };
   measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; };
   measurements = derive2 { name="measurements"; version="1.4.0"; sha256="1kihavs9vgxwqjm9z1zjjngkmcwfsv8dg7nn9nrv5r06k5hv8bz6"; depends=[]; };
   measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; };
   meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; };
+  medExtractR = derive2 { name="medExtractR"; version="0.1"; sha256="08hzl5kk3jqs8vc53zrd1qj5g24dkpvwwvswqp57719c4ybi3ia3"; depends=[stringr]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
   medfate = derive2 { name="medfate"; version="0.8.2"; sha256="0f86cpczzkpx8sy6krx970zy1fmsn93mjkm9mq00w2nw91kqjrh6"; depends=[ggplot2 GSIF meteoland Rcpp sp spdep]; };
   medflex = derive2 { name="medflex"; version="0.6-6"; sha256="04cjqhyihxf1imbl9y9s58qpy6lmxsh2gwy4bras03hx52slzl5r"; depends=[boot car Matrix multcomp sandwich]; };
+  mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; };
   mediation = derive2 { name="mediation"; version="4.4.7"; sha256="0nd4nli1qsvhgf404v1y16bc8q7axmpzyhbn38vncranb6lc235l"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
   medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; };
   medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; };
@@ -9529,19 +9673,20 @@ in with self; {
   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-6"; sha256="1wjhzqg3riwf32lb775amm49azl5v1xg2hahigg6jkbg8zq0h92g"; depends=[lme4 Matrix nonnest2 sandwich]; };
+  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]; };
   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.3.0"; sha256="0dkmfrqdkl2f92kp94l10n0y9d29gn7ralgnpiry32w5c7ala1yy"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr RCurl scales sp stringr]; };
+  metR = derive2 { name="metR"; version="0.4.0"; sha256="1j4y2nn2r1i29h2invid8s695nv7b1lfanqspc281gjkrkns77ps"; 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.2"; sha256="07j9y54z039gnrp8w6xi0xj4xzl8x2qjlzgf4nh9frmwqd6cld2i"; depends=[geosphere leaflet matlab plyr RCurl]; };
   meta = derive2 { name="meta"; version="4.9-5"; sha256="1yk8akhxa6nzmj4y6q82jgyhfjdv5bz2x52ppp5jdrw61nmx4qc3"; depends=[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.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; };
+  metaBMA = derive2 { name="metaBMA"; version="0.6.1"; sha256="1m6q027hf3ysdjajv348x3cdwgxmf0x273swfpmg88h7p91xn1j7"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; };
   metaDigitise = derive2 { name="metaDigitise"; version="1.0.0"; sha256="04hycv9dpy39l8fhql69mcn5w97f7sjxrhiz5vbpbawvfbkl0f0l"; depends=[magick purrr]; };
   metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
@@ -9551,10 +9696,11 @@ in with self; {
   metaSEM = derive2 { name="metaSEM"; version="1.2.2"; sha256="09riif6ia0si97zn8kcx23k40iyj38vfvli73y0044npymirz2sx"; 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]; };
-  metacoder = derive2 { name="metacoder"; version="0.3.2"; sha256="1vnrmcwzcbrkd9rp6rbzf5id5fk9hz958a1jz4znmnds35hv2sv6"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phyloseq phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; };
+  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.1"; sha256="18n3mbmjna3db44gscsdgv1j8f11jhikiw7yg3vbw2a9v5w3ypkv"; depends=[vegan]; };
   metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
-  metadynminer = derive2 { name="metadynminer"; version="0.1.4"; sha256="06aricb1cp4sm56fr5skrxrs8ckccgq80rwbap7b0cp9y3sdgpcl"; depends=[Rcpp]; };
+  metadynminer = derive2 { name="metadynminer"; version="0.1.5"; sha256="0lbhw29ymgp23cffn0qq451fngwqqsr9a9azx8qfwfjl40gh86j1"; depends=[Rcpp]; };
+  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]; };
@@ -9590,7 +9736,7 @@ in with self; {
   mev = derive2 { name="mev"; version="1.12"; sha256="1vq2l6znwagxs6h216lzf8x14656x192ylwvc5gr3b0y7ry0rqdf"; 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.7"; sha256="086596dj6xz7by6rwddvyl7ap341q5hmpc6pslcjn0yvbc7j0wkh"; depends=[numDeriv Rcpp zoo]; };
+  mfGARCH = derive2 { name="mfGARCH"; version="0.1.8"; sha256="1pzzn4s98fsyqkrldnpqgxg7ia60dikq73bbfn6xgc63gr6l78r2"; depends=[maxLik numDeriv Rcpp zoo]; };
   mfbvar = derive2 { name="mfbvar"; version="0.4.0"; sha256="1bxfs7081nd7l0lknag2n184rd1d91cr5sgsnjsfwgdbws8sl8d3"; depends=[ggplot2 pbapply Rcpp RcppArmadillo]; };
   mfe = derive2 { name="mfe"; version="0.1.2"; sha256="0vckvabk50zmrspjwc36g8l216rfcyc33ah1f4sg1nsi6g8i03k3"; depends=[cluster e1071 infotheo MASS rpart rrcov]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
@@ -9615,18 +9761,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.0.9"; sha256="183r52ryi5171155ridfsjyznqhmnr0fzrzxvch7ylg4pjzwm0f3"; depends=[coda ggplot2 glm2 Hmisc invgamma rlist Rsolnp survival tidyr truncnorm]; };
+  miWQS = derive2 { name="miWQS"; version="0.1.0"; sha256="03617f85zz09rlh6a8fsqry186d578w6vd1aybdjbpj3zi5y798j"; depends=[coda ggplot2 glm2 Hmisc invgamma MASS 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.5.0"; sha256="0icydc312sbvzbp0r0mhs2r77a2ly2xvz5w5amirz3wdkvgyrk2g"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
+  mice = derive2 { name="mice"; version="3.6.0"; sha256="0pgcxdmp77604h6f4x8hhs6j4xdjgf5b9zvnixyzdj8vcgdjpivv"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; };
   miceFast = derive2 { name="miceFast"; version="0.2.3"; sha256="0ngb2qs71x0i8ffyb1qlbz2wk6c87m1r74l547c5pc9agnc227m0"; depends=[Rcpp RcppArmadillo]; };
   miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
   miceadds = derive2 { name="miceadds"; version="3.4-17"; sha256="1yf6shdgz9hbz37y9hz5zbg17m5cd79ik49nwr6sb6ml8lxxi0s9"; depends=[mice mitools Rcpp RcppArmadillo]; };
-  micemd = derive2 { name="micemd"; version="1.5.0"; sha256="1bzy9lxgdvfrq3mhhx734aykpcr3klnwns70whz54y6afmcz7ghp"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
+  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=[]; };
   microPop = derive2 { name="microPop"; version="1.4.1"; sha256="1xm1yfdbv0kp0dvk4dhjrr2rjydpnh13vm5kfzyj39rwpmrrim3f"; depends=[deSolve]; };
@@ -9640,7 +9786,7 @@ in with self; {
   micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; };
   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.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; };
+  microseq = derive2 { name="microseq"; version="1.2.3"; sha256="1cpgnl3y1v5pwh333lkg7igh3qgga0mhmhc8vdb7gw0k5gzh7gzp"; depends=[Rcpp]; };
   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]; };
@@ -9656,9 +9802,9 @@ in with self; {
   mimsy = derive2 { name="mimsy"; version="0.4.2"; sha256="0f2yy5s9dxl8k12lrnc0w5d8vl0c9by0zc7gv05a2sq5jl7zrr8j"; depends=[dplyr lubridate magrittr openxlsx]; };
   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-1"; sha256="09jcyzirc4f69g4n5490pwrjqbdd40fwn8liy0xarlf7cnqqnzzk"; depends=[Rcpp RcppEigen]; };
+  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]; };
-  miniCRAN = derive2 { name="miniCRAN"; version="0.2.11"; sha256="1ffc367ipcxyk2a8f2y46xa01rbr5254cryf1qzzfflb3xj8n6pa"; depends=[httr igraph XML]; };
+  miniCRAN = derive2 { name="miniCRAN"; version="0.2.12"; sha256="1jyrx86y8qdb3xdfpj812k0v492z3i6dnwy761qslwmn15xx8845"; depends=[assertthat httr igraph XML]; };
   miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; };
   miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; };
   minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; };
@@ -9672,6 +9818,7 @@ in with self; {
   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.30"; sha256="1j4l7hnx2rj6nixs7ylcvc7d24wbj1mfs9fccsyhzrrwadn6drvq"; 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]; };
@@ -9694,7 +9841,7 @@ in with self; {
   missSBM = derive2 { name="missSBM"; version="0.2.0"; sha256="0lszypzz0qdp1jw7l9i3gajzmk54acai32w4xbxqcc6pi4q057r6"; depends=[ape corrplot igraph magrittr nloptr R6 Rcpp RcppArmadillo]; };
   missingHE = derive2 { name="missingHE"; version="1.1.1"; sha256="02k2n5kap5n1zhzjv7y2dd5hrxh979ha5w66hixlhylhc1ar0w20"; depends=[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.1"; sha256="06y01kd11gyysyh57gi6gxamacwxwjpdj83xn63wa9az8ncl3y8s"; depends=[bbmle]; };
+  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]; };
   mitml = derive2 { name="mitml"; version="0.3-7"; sha256="0yqyxkyi1kmv5k63wxj5kkg5g8igk1axk2csb4xhj6wz0p89dxy6"; depends=[haven jomo pan]; };
   mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; };
@@ -9716,6 +9863,7 @@ in with self; {
   mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; };
   mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; };
+  mixmeta = derive2 { name="mixmeta"; version="0.2.2"; sha256="1h52pmybammhhr15sl0jkm5n83rsyy1km4g4rpwry1mxrxc4ql1v"; 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]; };
@@ -9725,10 +9873,10 @@ in with self; {
   mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; };
   mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; };
   mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; };
-  mize = derive2 { name="mize"; version="0.2.1"; sha256="13w5wpszbmzv7ah3rays4j9qj36v5f5mnss1g3g9cqyz7phgsrv8"; depends=[]; };
+  mize = derive2 { name="mize"; version="0.2.2"; sha256="1p728svnj5ckixry6xw70nywqabmgdcygdsa6dvpicr2s4sffn86"; 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.48.1"; sha256="1ic4irspvga4vpqrvsjr6rlkl2rqqlp8w404zaa5ad19va9040vd"; depends=[deSolve FME inline minpack_lm plyr R6 rootSolve]; };
+  mkin = derive2 { name="mkin"; version="0.9.49.5"; sha256="1q4j9krbrvr74pla33vn7piqcpz4bx53hqc6jk26qv9d5q4yh5xw"; depends=[deSolve inline numDeriv plyr 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]; };
@@ -9747,18 +9895,22 @@ in with self; {
   mlergm = derive2 { name="mlergm"; version="0.2"; sha256="1naapdm8lbqsjgdr2whs36w8jk432mhnki3cvi55abj3v16y94sl"; depends=[cowplot ergm GGally ggplot2 Matrix network plyr reshape2 sna stringr]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
   mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; };
-  mlflow = derive2 { name="mlflow"; version="1.0.0"; sha256="1lk549hxywfk6mnp0qcnhyy3kh7q022hydhi648xag11dh04qh4c"; 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.1.0"; sha256="04vr3viipyh6fdv9rg8hzwmynzjc75gyzz81fvkqqgkmlfnc9yrv"; 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.5"; sha256="0px6pc7mkfzbbymv5qj9m6nnppbpgpanpy7y6jf7xl8gv3hwip32"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
-  mlogit = derive2 { name="mlogit"; version="0.4-2"; sha256="1ihamg9fm58nxmvhkhwi5v9ll9jspj5w5ahdsdh5pbdrk1hlzbqf"; depends=[Formula lmtest MASS Rdpack statmod zoo]; };
+  mlogit = derive2 { name="mlogit"; version="1.0-1"; sha256="1cjh0dl0yvzyz5wsplygm4al2zfvs7cgdg5fhbcjnv159qfvflml"; 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.14.0"; sha256="0jlldr44x3a3l1dxy077ila512s45b4w95s2qk3qd0v70121hwhz"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  mlr3 = derive2 { name="mlr3"; version="0.1.1"; sha256="18yqjdg4a3lknic0pzg5xqa5h5nvaz4zh2g27k4fvg2d3v9b90jm"; depends=[backports checkmate data_table digest lgr Metrics mlbench mlr3misc paradox R6]; };
+  mlr3db = derive2 { name="mlr3db"; version="0.1.1"; sha256="0453q5a4a2nzpglim5lmbk2c2a6i95ww5hp2z28iv12xrli5sw72"; depends=[checkmate data_table digest dplyr mlr3 R6]; };
+  mlr3misc = derive2 { name="mlr3misc"; version="0.1.1"; sha256="0q4vr1gh0na02n22n4zijyf6zhg70nck1ly2k6i51hk9dncy815m"; depends=[backports checkmate data_table R6]; };
   mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-3"; sha256="1446xv4qawyhxi76wp6dfq3xjrmh6gzky4nbcs36zr18zis3ipyz"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
   mlrMBO = derive2 { name="mlrMBO"; version="1.1.2"; sha256="1ziyiycgwr4vgilji8dkf1c0kyqjnbmqi3qj35q3si2xbnmcm14f"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
@@ -9778,7 +9930,7 @@ in with self; {
   mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; };
   mmeln = derive2 { name="mmeln"; version="1.3"; sha256="0hx59pizd6sgryca7g26n2wa5rdi3zd059w7yz66981p6mi4a5dk"; depends=[]; };
   mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; };
-  mmetrics = derive2 { name="mmetrics"; version="0.2.0"; sha256="02pnnmymgaaqh07ya6js50lnfcgags6kz3cdqlqlqqjnk1q6v8qi"; depends=[dplyr magrittr purrr rlang stringr]; };
+  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]; };
@@ -9794,8 +9946,8 @@ in with self; {
   mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; };
   mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
   mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; };
-  mnreadR = derive2 { name="mnreadR"; version="2.1.2"; sha256="1kc55rwq1lg6ngmia0hjim5ki7aif71754whvh4nz252qq0j8w3b"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
-  mobForest = derive2 { name="mobForest"; version="1.3.0"; sha256="0gzn3lyi9ph5dcrfbw4xs4rkf5ngf28abf1n8vap96fdhc6nmg88"; depends=[modeltools party sandwich strucchange zoo]; };
+  mnreadR = derive2 { name="mnreadR"; version="2.1.3"; sha256="1vyri8kd5afr1hdy7lxh0bsb6zxkz4hcb0q6a8m4mmrizqav6v1q"; depends=[dplyr ggplot2 nlme tibble tidyr]; };
+  mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; };
   mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; };
   moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; };
   moc_gapbk = derive2 { name="moc.gapbk"; version="0.1.0"; sha256="0gg64srdb17dx712hilnlrii9i5vi9vjrk17acaynaz307akdw08"; depends=[amap doMPI doParallel doSNOW fields foreach matrixStats mco miscTools nsga2R plyr reshape2 Rmisc]; };
@@ -9808,19 +9960,21 @@ in with self; {
   modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
   modTurPoint = derive2 { name="modTurPoint"; version="0.1.0"; sha256="1m24vsi80ln1r7sr40pipaaanyc60yfxmjzf8l7nfy3yvyr8zqpn"; depends=[]; };
   modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; };
+  modeLLtest = derive2 { name="modeLLtest"; version="1.0.0"; sha256="1f80bgw1l6zgwlhz1agdrl5d44jfrk50yi3jgwf14l4zjx8x8rp3"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; };
   modeest = derive2 { name="modeest"; version="2.3.3"; sha256="1y9kzi0hhpm97a38z8c6dkma1wyhx15sfmqmlxcbs8dmlyibbjin"; depends=[bazar fBasics genefilter stable stabledist statip]; };
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
   model4you = derive2 { name="model4you"; version="0.9-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=[]; };
-  modeldb = derive2 { name="modeldb"; version="0.1.2"; sha256="000dpxbsp5phncpcbrj6xg2kqa3s8frvbm1zrfn77j4mfrpjyybl"; depends=[dplyr ggplot2 progress purrr rlang tibble]; };
+  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]; };
   modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; };
   modelr = derive2 { name="modelr"; version="0.1.4"; sha256="1ngxphbjkv7yl1rg30sj36mfwhc76g452drjrq9abgab4k0pgnml"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; };
+  modelsummary = derive2 { name="modelsummary"; version="0.1.0"; sha256="1g6yc89q267zjplqpwiy6wwvdswyhr6lhg2sldm8zhmbm81jcvks"; depends=[broom checkmate dplyr generics magrittr purrr stringr tibble tidyr]; };
   modeltools = derive2 { name="modeltools"; version="0.2-22"; sha256="1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"; depends=[]; };
   modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; };
-  moderndive = derive2 { name="moderndive"; version="0.2.0"; sha256="165dll1bkjmd949mwy165hrz22ajbkn3ap5l8f8pqwksw78rsgqb"; depends=[assertive broom dplyr formula_tools infer janitor knitr magrittr rlang stringr tibble]; };
+  moderndive = derive2 { name="moderndive"; version="0.3.0"; sha256="0ww435flspm4yi25v9nh2cdn9bpnwjxdz4fg3cny1c4djs2bzgz2"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; };
   modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; };
   modest = derive2 { name="modest"; version="0.3-1"; sha256="07rs014hdcabp2n0gg14pz2gmqgbw38vjv7a80vkzzh3601hxqws"; depends=[knitr rhandsontable shiny shinyBS]; };
   modesto = derive2 { name="modesto"; version="0.1.2"; sha256="0vmdj8wcy0vv9jaihxrj0m5sr7favz18ngfqc8pd8rd4ipcnxkjf"; depends=[markovchain]; };
@@ -9858,7 +10012,8 @@ in with self; {
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
   morpheus = derive2 { name="morpheus"; version="0.2-0"; sha256="07gk05qpabbg96svgnp2m9sw3fxsh2mgfwyda423c03yhxn1pnsm"; depends=[jointDiag MASS pracma]; };
   morse = derive2 { name="morse"; version="3.2.4"; sha256="0iar2lj2czdgpvmrdx0y98frh452nr4v2m4zmmrs9jr6by46d6nj"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; };
-  mortAAR = derive2 { name="mortAAR"; version="1.0.1"; sha256="1dgxx5sh0nskzbigr8yq389lsnalp45d6m92q6g07jpqm7nzbazd"; depends=[magrittr Rdpack reshape2]; };
+  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]; };
   mosaic = derive2 { name="mosaic"; version="1.5.0"; sha256="1j3dq8y2zpr3cad5pgbd3qm9ls17z0s6f9qqp5ddh110wf5kz0h4"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra lazyeval leaflet MASS Matrix mosaicCore mosaicData readr tidyr]; };
   mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; };
   mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; };
@@ -9880,7 +10035,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-15"; sha256="1m7yqnjhvf3ia7z5j9mv2zr4xx99rv6yzjpj90ar57m0fwjw6wh1"; depends=[bst doParallel foreach glmnet MASS numDeriv pscl]; };
+  mpath = derive2 { name="mpath"; version="0.3-17"; sha256="1pk8bkp8y8gyydil33p5fwx440zgrmz3svf4zjbxhdqng9gl10xj"; depends=[bst doParallel foreach glmnet 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]; };
@@ -9905,7 +10060,7 @@ in with self; {
   mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
   mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; };
   mrfDepth = derive2 { name="mrfDepth"; version="1.0.11"; sha256="0x4z4agwbzlyzbkf6aj7y9061cm05dvhzpg05wc7k59xbq1ns1sv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; };
-  mrgsolve = derive2 { name="mrgsolve"; version="0.9.1"; sha256="1rpl974q4xswf0mmsm6lpyqmkq70m8b33z1az8qxma8jfdcwvai9"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; };
+  mrgsolve = derive2 { name="mrgsolve"; version="0.9.2"; sha256="1y3dh5myswghals4nz2m4jb8qk3q6dzgnqm0bf4dilzgpbj3gdx6"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; };
   mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; };
   mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; };
   mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; };
@@ -9934,7 +10089,6 @@ in with self; {
   msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; };
-  mssm = derive2 { name="mssm"; version="0.1.1"; sha256="1svfw3h22v97kb7yp81qlzys40b4i4mlmkdjma8xx1pz8w78ka86"; 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]; };
@@ -9967,6 +10121,7 @@ in with self; {
   multiApply = derive2 { name="multiApply"; version="2.0.1"; sha256="0kdbv76kp03cwh1fhgf2llkql8z0zlqqzwb6khywclm6y9dwd7n6"; depends=[doParallel foreach plyr]; };
   multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
   multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; };
+  multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; };
   multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
   multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
   multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; };
@@ -9991,7 +10146,7 @@ in with self; {
   multimark = derive2 { name="multimark"; version="2.1.0"; sha256="1c33m33hi7s3ap310hm9y6b0ji020paislsiixa4qp4608r3cg0j"; depends=[Brobdingnag coda doParallel doRNG foreach Matrix mvtnorm prodlim raster RMark sp statmod]; };
   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.0.2"; sha256="03pnwmhjkhk6hcmfxkv2g587d1clqi43hbl09sfwg7gspm704br4"; depends=[igraph RColorBrewer Rcpp]; };
+  multinet = derive2 { name="multinet"; version="3.0.3"; sha256="1dazqilfn5ws0v55h5v75n27jhgv964gdv1n5rkfjzgzrcp1djxj"; depends=[igraph RColorBrewer Rcpp]; };
   multinets = derive2 { name="multinets"; version="0.2.1"; sha256="00h1nqi49mix5rxp39i46pimmr3rl0c2869g7ss8cy0kl8hl41hz"; depends=[igraph igraphdata Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
   multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; };
@@ -10018,7 +10173,7 @@ in with self; {
   mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; };
   munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; };
   munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; };
-  munsellinterpol = derive2 { name="munsellinterpol"; version="2.4-1"; sha256="068732g828wc9sbazhadam5jdl7dfm2nhry581pvg4p41n31aynf"; depends=[rootSolve spacesRGB spacesXYZ]; };
+  munsellinterpol = derive2 { name="munsellinterpol"; version="2.5-1"; sha256="1x5nh4h35mkajsdgi4vrvs1cd4iagdrp9al2a6lll96jw0y1c65y"; depends=[rootSolve spacesRGB spacesXYZ]; };
   murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; 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]; };
@@ -10034,7 +10189,7 @@ in with self; {
   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.0.6"; sha256="0vd891qb7qln9vlavc5vm9fa3c371chb1xmkzw7pns8bjw1jmx2r"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; };
+  mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.0.7"; sha256="0kcqjzsdpdclfifgbcnqg76kv4dpqsd2zajgrsgfzlhc6vvrqk42"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase]; };
   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=[]; };
@@ -10068,7 +10223,7 @@ in with self; {
   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.6"; sha256="12anv9f1mgb4p6f497zax3hzdc2wfjmi2sjha27qsfp7bfglikjn"; depends=[Rcpp shiny]; };
-  mwshiny = derive2 { name="mwshiny"; version="1.0.0"; sha256="11wpmn7rb2241add5s6g6ia557dzcbvpkdjx4vlglrq1rxnrjm91"; depends=[htmltools 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]; };
   mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
@@ -10088,10 +10243,10 @@ in with self; {
   nadiv = derive2 { name="nadiv"; version="2.16.0.0"; sha256="0pfg9hbhcjgbfmakl1jqqaf9i07i5z5jk7sh2x7x7p4354z30z9y"; depends=[Matrix]; };
   naivebayes = derive2 { name="naivebayes"; version="0.9.6"; sha256="1rmpc7ynnl909m20njdy5nc7siqqlj5xra3ry41b0pgb966ijcdz"; depends=[]; };
   naivereg = derive2 { name="naivereg"; version="1.0.1"; sha256="0wvyv54q3r4jz03jdbsmnxsinzpqcac6xjvzcrjjdzbkqfxicxal"; depends=[gmm grpreg]; };
-  namedCapture = derive2 { name="namedCapture"; version="2019.02.25"; sha256="0frlrbbpg2kvrggjv9z1qkizaw3vih3jwlngvaqaqrm7rwi04sc3"; depends=[]; };
+  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]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-  nandb = derive2 { name="nandb"; version="2.0.3"; sha256="1hv28m4miq3r1dck01b1zvxyz8z0c5clp4jhrqms0pgr9ipqhh1p"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; };
+  nandb = derive2 { name="nandb"; version="2.0.4"; sha256="194lkrigcaa6vamd0060l9cf4ll7g57q2ljk4h4vddkqg31x91cj"; 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]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanostringr = derive2 { name="nanostringr"; version="0.1.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; };
@@ -10141,7 +10296,7 @@ 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.2.2"; sha256="0biik91csn35hpci4jgsgfighqnyyhd1kvr40l6wbw3kgmqwxgw2"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate readr tidyr]; };
+  neonUtilities = derive2 { name="neonUtilities"; version="1.3.1"; sha256="1cqa9ziy1jifsxnbdfd9d5dz5j4w87vzlpngf1aw4h5g1z11sq9l"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate readr 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]; };
@@ -10157,7 +10312,7 @@ in with self; {
   netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve 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.10"; sha256="19gqsilw9i4hinz6qsms7cnlrrrnpriq2ws8l1naivfz94bdi7dx"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; };
-  netjack = derive2 { name="netjack"; version="1.1.1"; sha256="0pb9phfdjfp8yxlv5p0qb6vxhh8vb9iviffzrbj8x8dy3y3c9vp5"; depends=[brainGraph ggplot2 igraph Rdpack]; };
+  netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; };
   netmeta = derive2 { name="netmeta"; version="1.0-1"; sha256="1fsm41xz1dv6gwc354nxx4bj0xfmvamqhnhlbp5pn2g4y66wqm7s"; depends=[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]; };
@@ -10186,7 +10341,7 @@ 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.7"; sha256="0wy9nqr3iljs5pxb3qnqjvk2123d311xv22mrmx2ls28znk6433b"; depends=[Matrix quanteda stringi]; };
+  newsmap = derive2 { name="newsmap"; version="0.6.9"; sha256="1s7ldabclmv2qfkczj17vbj3630ab6xfc1x020szdy9fa08380wp"; 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]; };
@@ -10210,13 +10365,13 @@ 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-140"; sha256="0k9x5j34fx093a023da9ny3b3101lbwpmfm27mkvfj950l22z88x"; depends=[lattice]; };
+  nlme = derive2 { name="nlme"; version="3.1-141"; sha256="0ml00g79bimjcl0sgn6h55l5b4gfmnsnc1vvmivggn0318k4c04i"; 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.0.0-7"; sha256="1ibj2cxf09jnsf08idrd9q0fxg34i2wp56i4f6q4rq21aswh92qd"; depends=[BH brew cli crayon dparser fastGHQuad ggplot2 lattice lbfgs magrittr Matrix memoise minqa n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders tidyr vpc]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
   nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; };
   nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; };
+  nlr = derive2 { name="nlr"; version="0.1-3"; sha256="19zcnigijr3jfy4da945z4fdnrirvlmpqminaf5wwk0bz71f3b61"; depends=[GA MASS nlme quantreg robcor TSA tseries]; };
   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.2.0"; sha256="0ahgw0lmfpfb03fzhvp8a4rhvn0r84s90aiada4slss47g63iclq"; depends=[dplyr furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; };
@@ -10232,6 +10387,7 @@ in with self; {
   nlstimedist = derive2 { name="nlstimedist"; version="1.1.4"; sha256="1c9yxpaxdx03yav4x0vk67f1j6w70jv212sfxrfxkz61ivyqcmlb"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
   nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; };
+  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.0.0"; sha256="051kzr6hva57bsla8qbnkkkw7a3hnr4415gd6qzk9bq79q2bg53p"; depends=[devtools jsonlite RCurl readxl]; };
@@ -10241,7 +10397,7 @@ in with self; {
   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]; };
   nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
-  nnTensor = derive2 { name="nnTensor"; version="0.99.4"; sha256="1z5dafcnj9cnslxljij5ycmzagvvp27z8b7p6i3hz134z4vbx5jb"; depends=[fields plot3D rTensor tagcloud]; };
+  nnTensor = derive2 { name="nnTensor"; version="1.0.0"; sha256="07cdc8givv0mzszq418hgl5ic77mg7dh40q03gnv9iki6k5lc31a"; depends=[fields plot3D rTensor tagcloud]; };
   nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
@@ -10275,7 +10431,7 @@ in with self; {
   nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
   nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; };
   nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
-  nopaco = derive2 { name="nopaco"; version="1.0.4"; sha256="0c5nd5mnabki5jxq00a5dp3x7qvkw5kniym370avl3qfcnsswmg5"; depends=[Matrix]; };
+  nopaco = derive2 { name="nopaco"; version="1.0.6"; sha256="0q705b7bjzq0b6vfp6yargybc8h07adx8al1ip7pxkmfcpilj66v"; depends=[Matrix]; };
   nopp = derive2 { name="nopp"; version="1.1.0"; sha256="1zn3ss89i7fwqps6b8syd9jzm68k95p3fdlf285q819dzlk61ypk"; depends=[MASS mlogit]; };
   nor1mix = derive2 { name="nor1mix"; version="1.3-0"; sha256="1817wcvlmxs70vs4db0jkxd7i037744zz8ay3c2a9949z29fxr4w"; depends=[]; };
   nord = derive2 { name="nord"; version="0.0.1"; sha256="0ajymjn2xw7zik62nhjp11g8bkvsqhhsrzi3bl2k70y544wbl3kn"; depends=[ggplot2]; };
@@ -10291,11 +10447,11 @@ 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=[]; };
-  not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
+  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.3"; sha256="1gp1ai6k5fn5gv78ffs8mzhwd1qhig8rcc52az2f2vxcvaa1bchg"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; };
+  nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   np = derive2 { name="np"; version="0.60-9"; sha256="1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy"; depends=[boot cubature quadprog quantreg]; };
   npExact = derive2 { name="npExact"; version="0.2"; sha256="055wm5lcj98wb71lqp2zdyl8kkwvi6lwmnaylynvr907xqabaqvd"; depends=[]; };
@@ -10325,7 +10481,7 @@ in with self; {
   nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; };
   npsf = derive2 { name="npsf"; version="0.5.1"; sha256="0xpzfskwsc7g7flvfxnzcfjsfdlqdgy4ypxp84xcpaqampgfgd13"; depends=[Formula randtoolbox Rcpp sfsmisc]; };
   npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; };
-  npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; };
+  npsp = derive2 { name="npsp"; version="0.7-5"; sha256="0ci3am6lbmb1raxdqj4ckcm7y1889j0zsk52awl15sjhkx8l2saa"; depends=[quadprog sp spam]; };
   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]; };
@@ -10373,6 +10529,7 @@ in with self; {
   oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; };
   oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; };
   obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; };
+  obfuscatoR = derive2 { name="obfuscatoR"; version="0.2.0"; sha256="01j3bvmnqlajkwqz01f5zfmwgfbnmhcxa41gqnzq7k41xzm7q8vk"; depends=[crayon matrixStats readr Rfast stringr tibble]; };
   objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
   objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
   objectremover = derive2 { name="objectremover"; version="0.7.0"; sha256="0mspnnks04s8w6q2g0nffd0675g07hkaql44kz6zrc5329qx7jpi"; depends=[miniUI shiny shinyalert]; };
@@ -10385,7 +10542,7 @@ in with self; {
   oc = derive2 { name="oc"; version="1.01"; sha256="12idrh4jxxq28lgqzr6jzgrvmmwysh5amzhmmaqn3yz49i17gcaf"; depends=[pscl]; };
   occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; };
   oce = derive2 { name="oce"; version="1.1-1"; sha256="0hwfnpb6q6pmckzgh67ryvqd1jkrzzhn187x1655rnmkmp9zis1c"; depends=[gsw Rcpp testthat]; };
-  oceanis = derive2 { name="oceanis"; version="0.8.5"; sha256="18vilyj06dxl910i4czh9f90550vj54pdyzyqn2j5nwac68ym4qz"; 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="0.8.6"; sha256="1snlad2fdhjvyp2px55qa0rf057fsfidn4sg4hd19jny0jkrsi4s"; 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"; sha256="1kkjc213nn2ks7cqzchbmjvyp9hci8qndv8migpmyf5vjbm7d297"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; };
   ocedata = derive2 { name="ocedata"; version="0.1.5"; sha256="0rs3nzacvg5mbbmbhcj8g9ikjlw26x2mka7lp644l17kgmzzynh6"; depends=[testthat]; };
   ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; };
@@ -10393,15 +10550,17 @@ in with self; {
   ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; };
   odbc = derive2 { name="odbc"; version="1.1.6"; sha256="146phrsks0hfd1bfxx452kkq7ximk3fwjz9lqg9fdykar5sr6vjj"; depends=[BH bit64 blob DBI hms Rcpp]; };
   odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; };
-  odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.0"; sha256="1xq0wfj6plg4aircb2qsxsy3wbwvc7zkkwgywr5n9n5r1r2csyps"; depends=[MASS]; };
+  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]; };
   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]; };
   odpc = derive2 { name="odpc"; version="2.0.1"; sha256="06d574sj7p5qlf7s3lbrwd56mcs4lq3pn9bkzwxhpybibgrfzn5q"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; };
   odr = derive2 { name="odr"; version="1.0.0"; sha256="0niadinljx5pph329dgixivdc9s1l27ik9755fbfhmplhj92ihi2"; depends=[]; };
   oem = derive2 { name="oem"; version="2.0.9"; sha256="1ffv71cwf58wrba3zhyp443kfl0j3z451mgxsxl8ig5fn9y9i9ca"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
   ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; };
   officer = derive2 { name="officer"; version="0.3.5"; sha256="005kaxjhr40shpav2pg7s7gj8f49579r7rbgwlncbwv16nn0rbbg"; depends=[base64enc digest htmltools magrittr R6 Rcpp rlang uuid xml2 zip]; };
+  offlineChange = derive2 { name="offlineChange"; version="0.0.2"; sha256="1d8jm8mm8g1fcbffk697qap58dcw3yyvrm9daviy42jsz59nbsxs"; depends=[Rcpp]; };
   oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; };
   ohtadstats = derive2 { name="ohtadstats"; version="2.1.0"; sha256="17fpfqpvmyh2ykyb56g2zc72f8d8x7d85wmdm63n7b9kr53lscj3"; depends=[lattice]; };
   oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; };
@@ -10417,6 +10576,7 @@ in with self; {
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   oncrawlR = derive2 { name="oncrawlR"; version="0.1.5"; sha256="07zhc76dz0ngvwmj1nq80hqp105wwsx85wcqxcma2vlh5k19j6hf"; depends=[caret DALEX dplyr ggplot2 jsonlite pROC RCurl readr rlang rlist xgboost]; };
   onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; };
+  onelogin = derive2 { name="onelogin"; version="0.1.0"; sha256="1fdh3hn8paasf7zq29k4h4ng26bl63sps0lbv84g60pxhsay2bma"; depends=[glue R6 safer]; };
   onemap = derive2 { name="onemap"; version="2.1.1"; sha256="0j9c0ynwpzyr548n72wzmmk8gi52qvxlxgzqzn8g6n4v5zmzlkhy"; depends=[fields ggplot2 maps Rcpp reshape2 tkrplot]; };
   onewaytests = derive2 { name="onewaytests"; version="2.3"; sha256="0wi623f7jh8msnsfbsc5va4c2qy3h6l68g5rx7wrjz6nxwlqzi8y"; depends=[car ggplot2 moments nortest]; };
   onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; };
@@ -10443,7 +10603,7 @@ in with self; {
   opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; };
   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"; sha256="0mh4xwb9wnn5j2n1zzmjldqjqv2nn4wdidiixxciaqrqsi0l9834"; depends=[askpass]; };
+  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.0.1"; sha256="1lflygpi1z4rlb1c6g6wsmi334maiiy7jhpg6ph4sw8lpvg12w4b"; depends=[Rcpp zip]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
@@ -10462,6 +10622,7 @@ in with self; {
   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]; };
+  opticskxi = derive2 { name="opticskxi"; version="0.1"; sha256="1vdz5sgjgyh2nj034w87d2yxcbbg97f1b0vijlwzwjkrfz5knfhl"; depends=[ggplot2 magrittr]; };
   opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.9.2.1"; sha256="1c3q4kx8rkgpjsy0hy2w2dd9kv51avnw1ab82hzmjgngfnvaig0n"; depends=[magrittr stringi]; };
@@ -10479,7 +10640,7 @@ in with self; {
   optionstrat = derive2 { name="optionstrat"; version="1.3.0"; sha256="0aapgga8a4rnffns0jq1l3gv319i3cq1h49wgprh6cafvb5nm61l"; depends=[]; };
   optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
   optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; };
-  optmatch = derive2 { name="optmatch"; version="0.9-10"; sha256="1jnvk9r7jc8w5rg8xvhbhj0wmy0l1hhjm8iwyf703939p4xc5z71"; depends=[digest Rcpp RItools survival]; };
+  optmatch = derive2 { name="optmatch"; version="0.9-11"; sha256="0lvba8gca1bvf7b46kmjqpkb3ykip07niw1w2qghgqrfxkq0s6yi"; depends=[digest Rcpp RItools survival]; };
   optparse = derive2 { name="optparse"; version="1.6.2"; sha256="0zrp6jakjhawrwfri270ym83vj5a7nvjk0w6b41z41ahw2da99dm"; depends=[getopt]; };
   optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
   optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; };
@@ -10503,7 +10664,7 @@ in with self; {
   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]; };
-  ordinalClust = derive2 { name="ordinalClust"; version="1.3.3"; sha256="1yyn0y873hbdwfq1nxx8lz99bzc7cdc36zlnsqnd5y1g6a1q3l2g"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  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]; };
@@ -10538,7 +10699,7 @@ in with self; {
   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.5.0"; sha256="12gm5mhmnzvfmziiln0lnqs173gan10ihwkcj07dcjii4nvkg4p9"; depends=[Matrix R6 Rcpp]; };
-  osrm = derive2 { name="osrm"; version="3.3.0"; sha256="0gk65pimqifninqzb1q0hc04x24pkbfh49hv3zq2vziy5csc2mib"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; };
+  osrm = derive2 { name="osrm"; version="3.3.1"; sha256="0l672jkw3hr8dncq2al8345bd5v2vgvyqhb4cv753b6fdljxmrhk"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; };
   osrmr = derive2 { name="osrmr"; version="0.1.35"; sha256="1pmsybyqkgpqz0yhfmwrsa2smgmclxzk9mlzcqmm8ph6dcd1x0s8"; depends=[assertthat bitops R_utils rjson stringr]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
   otpr = derive2 { name="otpr"; version="0.1.0"; sha256="1g2wy64fad67yqvq6mj1hy05vp6kjdm9b6nj0ba395c7hfxvkc7f"; depends=[checkmate curl httr jsonlite]; };
@@ -10552,6 +10713,7 @@ in with self; {
   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"; sha256="02niplg9110f6m0g030a35y9jjizrfhi4q9g20phlllw74q2dnap"; depends=[Rcereal Rcpp]; };
   outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; };
   overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; };
   overlapping = derive2 { name="overlapping"; version="1.5.3"; sha256="1hikhgs0s9zwqn29yqmgr29k4a95x0s2sxz1lhvv0xpfjd8fnrmz"; depends=[ggplot2 testthat]; };
@@ -10566,6 +10728,7 @@ in with self; {
   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]; };
   pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; };
+  pCODE = derive2 { name="pCODE"; version="0.9.2"; sha256="02p2kygyqd6c55wdzzhava9qkzck01mnfa5wccbj6plrxvrpfrz1"; depends=[deSolve fda MASS pracma]; };
   pCalibrate = derive2 { name="pCalibrate"; version="0.1-1"; sha256="04a7dmf9sjw44y53i469f8fjm8as2vwr0pgk4s91l63pxdqnjvfl"; depends=[epitools exact2x2 MCMCpack]; };
   pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
   pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; };
@@ -10573,7 +10736,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.0"; sha256="1dxxkwdhxfnj2znq4c5ggrr9m5klh5pmfxg17rz59vr2hfb73m24"; depends=[plyr Rcpp]; };
+  pROC = derive2 { name="pROC"; version="1.15.3"; sha256="1jx8af9p6sxbypqvj1cci7q9sbyaw310inbjxibjcr3acj59h45h"; 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]; };
@@ -10583,7 +10746,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]; };
-  packageRank = derive2 { name="packageRank"; version="0.1.0"; sha256="03jcj76236bzigl9n4hdyqkihvl6kyq611fvx2f5dhhnzaxg28br"; depends=[cranlogs data_table ggplot2 memoise RCurl]; };
+  packageRank = derive2 { name="packageRank"; version="0.2.0"; sha256="13gi0n1bzpy1q1ccxsi82bpx8p25wwna3wmgm3nyi8hfwc8bbnks"; depends=[cranlogs data_table ggplot2 memoise RCurl]; };
   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.4"; sha256="17awdf97fjlncqbglgb2cic4xxa8vpsfpsm6f2wxv7zpg4cdlg2p"; depends=[crayon formattable httr jsonlite lubridate pander stringr tidyr]; };
   packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; };
@@ -10596,7 +10759,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.2"; sha256="0hh1vvdnnj6m0s7va96rdb3qa94zxwwhmsm2vsjhid2ijsjmyrzm"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr xfun]; };
+  pagedown = derive2 { name="pagedown"; version="0.3"; sha256="0r4vybm7in39fbw36jlj27sv0g5rw6wm4gwjnz8nfixxh6cbbpb0"; 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=[]; };
@@ -10634,13 +10797,15 @@ in with self; {
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
-  panelr = derive2 { name="panelr"; version="0.7.0"; sha256="0cbcp41admy072hqvcym384kg9l5vr67mi2w566bwq5a7ihad090"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; };
+  panelr = derive2 { name="panelr"; version="0.7.1"; sha256="0xd3f3acfjvnryhwdf3aqa3vgpagl87sgd7annn29rk3lznv8rv2"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; };
   panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; };
   pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; };
   papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; };
   papeR = derive2 { name="papeR"; version="1.0-4"; sha256="1sc336haqsx6825g7m0z3a4pjklrmnzkq4995dpqwhvdvcikk9jd"; depends=[car gmodels xtable]; };
   paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; };
   parSim = derive2 { name="parSim"; version="0.1.1"; sha256="1iqxv1qspx6b32qdczdzhc4sdjy5a2pb8mvg8jnc18jydi7ljs64"; depends=[dplyr pbapply]; };
+  parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; };
+  paradox = derive2 { name="paradox"; version="0.1.0"; sha256="00rhn8vwlcl4gnvgkqbaqyx9j1ymmgmqjry3smhc5xqnclx2spzs"; depends=[backports checkmate data_table mlr3misc R6]; };
   parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
   parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; };
@@ -10666,8 +10831,8 @@ in with self; {
   parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; };
   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.0"; sha256="19mf92qjhqcdhmf3affwm8zk965xnay848csm9glcb2a6lh0nhqq"; depends=[]; };
-  parsnip = derive2 { name="parsnip"; version="0.0.2"; sha256="0q0ygm0j1wdjlgzzc4cvi43is7jxkzf7vcky3yf2cny923rgbj22"; depends=[dplyr generics globals glue magrittr purrr rlang tibble tidyr]; };
+  parsetools = derive2 { name="parsetools"; version="0.1.1"; sha256="0fl06h4aph0rr55n3c4gw9wkblvjipgyl5drpycmpldj8kix1nz2"; depends=[]; };
+  parsnip = derive2 { name="parsnip"; version="0.0.3"; sha256="1s9nm831q5kjmpym2lalcqx7jb1fh58v0vpljjqj5w1vxfbv83kg"; depends=[dplyr generics globals glue magrittr 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]; };
@@ -10681,7 +10846,7 @@ in with self; {
   partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
   party = derive2 { name="party"; version="1.3-3"; sha256="1sbwpwxdz81ikp64kc0s06vdwy04bccff2kr0phwx9235nhfwwlz"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
-  partykit = derive2 { name="partykit"; version="1.2-4"; sha256="1fkmgr0h8fhigz4fbzw9ggv66yagfx5p9xmdfpp12ysd2l8gibyn"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
+  partykit = derive2 { name="partykit"; version="1.2-5"; sha256="17324y5v65i0va2mvm26gl89s01xwcffg34fwq1mvylk1xwk13pl"; depends=[Formula inum libcoin mvtnorm rpart survival]; };
   parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
   passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
@@ -10705,20 +10870,20 @@ in with self; {
   pavo = derive2 { name="pavo"; version="2.2.0"; sha256="0bbmgjc63i6vx0grs97y6jg9q44vnjhik93zzkagq532mnggjiqv"; depends=[cluster geometry magick pbmcapply plot3D rcdd 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.1"; sha256="13n4nidjqrxbjxy3sljwnaxp6djc5p4xp9ga150cm1pq612gahcp"; 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.0"; sha256="1saxh832i98hvhv9j1p21c4gdqvx4p3k43fk3372s58ydqw2gvff"; depends=[paws_common]; };
-  paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.0"; sha256="1z6brk6f6hjmyvjiy7znjm6w6p8aqmxkij3rg918b010zsbm5829"; depends=[paws_common]; };
+  paws = derive2 { name="paws"; version="0.1.3"; sha256="0958g52pvs17kqxv849ycr3zw3vhk509yazqw03aahp0aqm64jhf"; 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.3"; sha256="0bhmhlbads3ycsz018jv5xfznv71gg8whskf0qlfq7kdq61z05mh"; depends=[paws_common]; };
+  paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.3"; sha256="1vk4mif4mk5zjwmpfvh8sywp706ibwf3hv1bw0miih7rn8z44bl2"; depends=[paws_common]; };
   paws_common = derive2 { name="paws.common"; version="0.1.1"; sha256="02cxcgpjla9cfnkfh1pllr9x58whsnnl81rwqq9xj7mficrbl2vj"; depends=[base64enc digest httr ini jsonlite xml2]; };
-  paws_compute = derive2 { name="paws.compute"; version="0.1.0"; sha256="1bc84lks6dc1fqlhlbqwv9c4yrqbcsmbahzvqpy1zwxq4p768sma"; depends=[paws_common]; };
-  paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.0"; sha256="1bl1fw31bp5r1fkxk7sx2a4nn7ql2l73wjrv54akm79iq1ycifp9"; depends=[paws_common]; };
-  paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.0"; sha256="083ny77f3xbv6pgpaz83maddk81fpd94z4gh10wm151swc7mrj9j"; depends=[paws_common]; };
-  paws_database = derive2 { name="paws.database"; version="0.1.0"; sha256="0zc9d15j5f758pbyqvfw0in9hgijbz0cm7nb22nkgl1kc6vnfq1w"; depends=[paws_common]; };
-  paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.0"; sha256="0p1lvkxpgr3qggrqg05bqv95xvsrq669x9bqc1wqa06xsbyr3j7i"; depends=[paws_common]; };
-  paws_management = derive2 { name="paws.management"; version="0.1.0"; sha256="0903cx9c9xxcx2gb625zca8kajwyxv1h3yywdj2ybgabxvkhwcyn"; depends=[paws_common]; };
-  paws_networking = derive2 { name="paws.networking"; version="0.1.0"; sha256="1r3npikm9xvl9v8x6xqmg6gv5c6zp12a98zyy4y68spiksmspza4"; depends=[paws_common]; };
-  paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.0"; sha256="0s4lgsjr8p4gi03dwnss4fiz6yrdgaqiz48d03960yqhflccshka"; depends=[paws_common]; };
-  paws_storage = derive2 { name="paws.storage"; version="0.1.0"; sha256="18nk4vj79hp94wq2xlg8w8i0vl27gy915ik5rp8fdny7568rg79p"; depends=[paws_common]; };
-  pbapply = derive2 { name="pbapply"; version="1.4-0"; sha256="0bn7a9ni36xy5acnrl9ky3gd1k8jr5kxgazzh3pzd1q6bri1nx7k"; depends=[]; };
+  paws_compute = derive2 { name="paws.compute"; version="0.1.3"; sha256="0wf516y5xla3bgj1m84qx760xk4v10zpb9wkn4wyh94jx1pb9vl1"; depends=[paws_common]; };
+  paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.3"; sha256="0axk4lwhq56q6sg5lcycp5y5isd6gwymiim65swkb1n28qxdcymq"; depends=[paws_common]; };
+  paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.3"; sha256="1qchc8sn7prd9612fw7h63r1xl0hdrygwfs488kxbl5h3blikl58"; depends=[paws_common]; };
+  paws_database = derive2 { name="paws.database"; version="0.1.3"; sha256="0p1ykkmk3j8szz76ga84rph7zm56c5h5bkwig3wbdaj8y5p5wdf1"; depends=[paws_common]; };
+  paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.3"; sha256="17b9nih71d5agcqg9g2w59qfqcggp3krw7l1wfga5vrgdq1zgbdq"; depends=[paws_common]; };
+  paws_management = derive2 { name="paws.management"; version="0.1.3"; sha256="1qyi0zpqgjkh1sfqqxaj5yjk8sml2p27gvm5hpbam33crldcbf7h"; depends=[paws_common]; };
+  paws_networking = derive2 { name="paws.networking"; version="0.1.3"; sha256="08whzrwgk1aj2g3j968v56y3bavxvgalm6wxw3ay5dbcwinj15nl"; depends=[paws_common]; };
+  paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.3"; sha256="0mq3p1j0fa8clmja4q1i4m8w5qc1icyq39zl0q003h46128biywm"; depends=[paws_common]; };
+  paws_storage = derive2 { name="paws.storage"; version="0.1.3"; sha256="1c02nazvp4dcnpb4yf75lg7ppk885qv7r1v0yq86i17rb37rg60f"; depends=[paws_common]; };
+  pbapply = derive2 { name="pbapply"; version="1.4-1"; sha256="1bbws9n90cqnnp5k58hp852jwmm6513jnhn4vzhl9f8x314k6qxk"; 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]; };
@@ -10732,12 +10897,12 @@ in with self; {
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
   pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; };
-  pbmcapply = derive2 { name="pbmcapply"; version="1.4.1"; sha256="063kgrdj2lmcgfdhplk8b05lpqay2qfgfmw7r3flq87mb2sfw6da"; depends=[]; };
+  pbmcapply = derive2 { name="pbmcapply"; version="1.5.0"; sha256="0i58gcqpnbyvc448qfgm45b7rpbmrnagsvk1h1hsqchbbicfslnz"; depends=[]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pbv = derive2 { name="pbv"; version="0.2-16"; sha256="1jr0xvk56d7qqpj7azw64lidwc3604iw87k7cccswv4yvbihvzzk"; depends=[Rcpp RcppArmadillo]; };
-  pcFactorStan = derive2 { name="pcFactorStan"; version="0.11"; sha256="0z49mxwhx2rblq21z5kylqwzw107abwqv5zni3a5vqs7f0nw9v5i"; depends=[BH igraph mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; };
-  pcIRT = derive2 { name="pcIRT"; version="0.2.3"; sha256="1gr4rij7anvfzbs4pvzhvfl0msbm83qs5n588l4jbraxqynvmkaw"; depends=[combinat Rcpp]; };
+  pcFactorStan = derive2 { name="pcFactorStan"; version="1.0.2"; sha256="190hvyl957hffy8s65iaxyirgja04b2l37hmd9sg1aldmixz0cym"; 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]; };
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
@@ -10759,13 +10924,13 @@ in with self; {
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
   pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
   pcse = derive2 { name="pcse"; version="1.9.1.1"; sha256="1rb9146vjkf36vc5v3frykmsff7kp6qp1hhmj8pak583in4rz8f8"; depends=[]; };
-  pct = derive2 { name="pct"; version="0.2.2"; sha256="12rbyvmcqxd73mc6n1w40p7n3z7aj8l94kc66p6sqknmw9wd4426"; depends=[boot readr sf stplanr]; };
-  pdR = derive2 { name="pdR"; version="1.6"; sha256="0rdsffbi9fnrrm0vf5mms19rsfxfv177mp1fql0nmmcqjpjn39z8"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
+  pct = derive2 { name="pct"; version="0.2.4"; sha256="02nskkrl6qasbzhvwijs9q7sk4j7ylkam9wfmhrqa6m8bkhxqg7s"; depends=[boot readr sf stplanr]; };
+  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]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
   pder = derive2 { name="pder"; version="1.0-0"; sha256="097klk334bjhlss8x73f27l7jcp7d7vh10jr5sazm5kcvi95619i"; depends=[]; };
   pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; };
-  pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
+  pdfetch = derive2 { name="pdfetch"; version="0.2.4"; sha256="0qskxak1mb8h038ly4hlsjvkz8nyinaraqh5f91d8nyzjzhj7x3c"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.3.0"; sha256="0mk1s8b7cdz025xn9kg5xnw388sndhjm80ckf71daxviknrzcscf"; depends=[pdftools stringi tibble tokenizers]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
   pdftools = derive2 { name="pdftools"; version="2.2"; sha256="1cvmr33jx09r7d76q0g8bd0ik4xa304n42b7psw1lj8a3a4wrk0l"; depends=[qpdf Rcpp]; };
@@ -10807,10 +10972,11 @@ in with self; {
   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.2.0"; sha256="1pzd6z7i1jxr2xi1shg3d0bxlbpmjl7kpmwgjnfys6syv57znd1z"; 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.2"; sha256="1i4i0gnsgcayvbrkxwglcvis4y0v41lmbb0axwdc60ylw31rv1q8"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; };
+  periscope = derive2 { name="periscope"; version="0.4.3"; sha256="1mnqav4f5m2jj17853xwy0fmndm6ywk3q6qq4m5j60f2cb866mbl"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard]; };
   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]; };
@@ -10820,7 +10986,7 @@ in with self; {
   permuco = derive2 { name="permuco"; version="1.0.2"; sha256="0mms11j2x3rw7c9pq2pb2wvcvx0a14p20clysa2b081xgmzx3971"; depends=[Matrix permute]; };
   permutations = derive2 { name="permutations"; version="1.0-4"; sha256="1i40impzc6vd3zbrhw8jflsafp8brc60hl2vswn6a8qan4k8p2jn"; depends=[magic numbers partitions]; };
   permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; };
-  permutes = derive2 { name="permutes"; version="0.1.1"; sha256="1khkpalnx5rm5vz3nz3arwzryl2r5r8jfm7s0drl3sadym48cxfk"; depends=[ggplot2 lmPerm plyr viridis]; };
+  permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
   personalized = derive2 { name="personalized"; version="0.2.4"; sha256="0yn07mxngyx0vnxn47h6pnfn1g9rp5kd30yd4hcsrw03hvbdsb35"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
@@ -10855,7 +11021,9 @@ in with self; {
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
   phaseR = derive2 { name="phaseR"; version="2.0"; sha256="14shpsyrcz1j0bl60vh37cpcvmry48s76xlf4f9lmq4l5vynhrcn"; depends=[deSolve]; };
   phateR = derive2 { name="phateR"; version="0.4.1"; sha256="13vqrxbshk62wk4myhwyp4a7k6i9synknvmfah3l1pg2b3b3dqmj"; 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]; };
   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]; };
@@ -10899,13 +11067,13 @@ in with self; {
   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.1.2"; sha256="1x5ygzd4rkgxk0pczpjp2g7n98jl48rx560jqyjv0bdvlafy3l83"; depends=[sys tibble]; };
+  phylocomr = derive2 { name="phylocomr"; version="0.1.4"; sha256="1jaznba7mmizkx7xipxr9l89j6cmpq7rrsg9jjl4wi8sdv2s7fcc"; depends=[sys tibble]; };
   phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
   phylogram = derive2 { name="phylogram"; version="2.1.0"; sha256="1p4h5pirc0m5pzc18q0jk3mcmb5n48gdf9abz03vml3a209xxl2v"; depends=[ape]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
-  phylopath = derive2 { name="phylopath"; version="1.0.2"; sha256="0ngfqi3fx646r5szbzbsh5g7zkrs29swpx7csr3nwzj8n12bqbfp"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; };
+  phylopath = derive2 { name="phylopath"; version="1.1.0"; sha256="14waw2kw624vlnk786hdyq06vmvrmnl24a05hwwycn7bbmhbr2cx"; 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.4"; sha256="08ajpb3gjglgx2s4jqbpgpcm01hz4p9c3wacfmq0wl1l7sjgsnrs"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
@@ -10987,11 +11155,11 @@ in with self; {
   pliable = derive2 { name="pliable"; version="1.1"; sha256="0z1hm4k0q3dgwgd1dy6wl0ydsqzygmn85m6yimffzqvnlmrq3vjg"; depends=[class glmnet]; };
   plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; };
   plinkQC = derive2 { name="plinkQC"; version="0.2.2"; sha256="16kjzfp1prqhai16kvh5sp7wqk54pidydkwn717q6dij1sh0jlaf"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel optparse R_utils sys UpSetR]; };
-  plm = derive2 { name="plm"; version="2.0-2"; sha256="0349cgyhgcphlzbgnp7avmd3x3wyprvq0kx340wcigay3r8nff92"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; };
+  plm = derive2 { name="plm"; version="2.1-0"; sha256="0dw6nmjc8acmlbpwvsjdwbf3cxgrjf5sli92rbd3j6snxnsg4qps"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
   plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
-  plot_matrix = derive2 { name="plot.matrix"; version="1.1"; sha256="14zi9b7f2hbxx1x6bakamnsx4jxsnkqmqvz481cn1h16h7n63f61"; 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]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
   plot3logit = derive2 { name="plot3logit"; version="1.0.1"; sha256="14abmxx2fgngximvgrrj8pjy4nyvliydhkp1h7p9xicdfj74pwl5"; depends=[ggplot2 ggtern magrittr reshape2 Ternary]; };
@@ -11002,9 +11170,9 @@ in with self; {
   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.2"; sha256="08h6vd9fcy0yp3c3ihpxp07nngkwfan54s97hp44lay5r3bh5apw"; depends=[dplyr gganimate ggplot2 lazyeval lubridate magrittr mapdata maps maptools plot3D raster rerddap rgdal rgeos scales sf tidyr]; };
+  plotdap = derive2 { name="plotdap"; version="0.0.3"; sha256="0ymgbg24k1v853jfd621swhh4g8i77sywbxjzm7pjqcg7wrb1z44"; depends=[dplyr gganimate ggplot2 lazyeval lubridate magrittr maps maptools raster rerddap rgdal rgeos scales sf tidyr]; };
   plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; };
-  plothelper = derive2 { name="plothelper"; version="0.1.3"; sha256="0n6pgnpmg9p2c1qczv95pqmh20dqisl27yakbdqkcqqg23252fsw"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; };
+  plothelper = derive2 { name="plothelper"; version="0.1.4"; sha256="0qmzbks70rjhkih0g2xvwd4zsfykxh0i18l61phz77zz71w4nbr1"; 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.0"; sha256="1kz2hm7vnkn4clxr6yyxxnmdmkz9zwjq6bzysw7j27r3721i8qgp"; 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=[]; };
@@ -11023,6 +11191,7 @@ in with self; {
   plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
   plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; };
   plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; };
+  plsmselect = derive2 { name="plsmselect"; version="0.1.3"; sha256="0j5g0hlm2zk02ygp0692b3721xdhdy7lf8pmwbfq5dkrxq805jhj"; depends=[dplyr glmnet mgcv survival]; };
   plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; };
   plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; };
   plsr = derive2 { name="plsr"; version="0.0.1"; sha256="0l413m49zjpb35v0zw8dlxn53nh7fghinbmwfmldl3jgdvay2s7x"; depends=[boot ggplot2 reshape2 shiny]; };
@@ -11044,7 +11213,7 @@ in with self; {
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; };
   pmpp = derive2 { name="pmpp"; version="0.1.0"; sha256="1vmv7aav0rvp7kd5f16ym422ygw1wpnwrhmmp2w1c2fl8i263zh9"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
-  pmsampsize = derive2 { name="pmsampsize"; version="1.0.0"; sha256="10qps352524k0xkmssv3qxf1jvkvm7zf4pshki7xywcgp1318n57"; depends=[]; };
+  pmsampsize = derive2 { name="pmsampsize"; version="1.0.1"; sha256="1463pw28f09f9yvn4lhlsiz1cv017i693i73rvlq94qb3fzar5yw"; depends=[]; };
   pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; };
   pmxTools = derive2 { name="pmxTools"; version="0.1.1"; sha256="0ryvbrk0f5x6b8rx479ifhk651wzg32zb4kn75dbjgh9q2qnsqhl"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
@@ -11063,6 +11232,7 @@ in with self; {
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
   poisFErobust = derive2 { name="poisFErobust"; version="1.0.1"; sha256="0qgwl5gb2rw043zb0h1rrv038ymsd72r8h9gqdr2xkfbi3mnr24r"; depends=[data_table glmmML]; };
   poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; };
+  poismf = derive2 { name="poismf"; version="0.1.1"; sha256="0pwf8wazqmg7lw36ypzzx4ygv4by1kbl0614i5g180qpzmw2jg1j"; depends=[Matrix nonneg_cg Rcpp SparseM]; };
   poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; };
   poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
   poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; };
@@ -11070,7 +11240,7 @@ in with self; {
   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]; };
   poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
-  politeness = derive2 { name="politeness"; version="0.3.1"; sha256="1szxljbgavxsjpc1gr88x7gcxgxf9q8zq7fw7skwszz4hl5pqd2j"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
+  politeness = derive2 { name="politeness"; version="0.3.2"; sha256="0c0ag3g8kwiy835mfc0nacxybk1lc210k26ngc546qzi9kpljx34"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
   politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; };
   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]; };
@@ -11120,11 +11290,11 @@ in with self; {
   poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; };
   population = derive2 { name="population"; version="0.2"; sha256="1k0hwh17dyfbbyw8gprsz1klx6l2ncq5mxkmnjmknlnrkpah0bbl"; depends=[abind]; };
   populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; };
-  portalr = derive2 { name="portalr"; version="0.2.5"; sha256="0vyrxc39j4fhz1yvi0a8hgz386k1lsnck70cizbdny6iik7jm2x6"; depends=[clisymbols crayon dplyr forecast httr jsonlite lubridate lunar magrittr rlang tibble tidyr usethis]; };
+  portalr = derive2 { name="portalr"; version="0.2.6"; sha256="08d29xg377vrrxzdzbsivm2zvh795fwhhz8aw53gbg4xxz23ydkj"; depends=[clisymbols crayon dplyr forecast httr jsonlite 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]; };
-  portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.1.0"; sha256="1hbdx31fdb86zv0zhnshsfz0a2d5qkkr49prj4hiqvhggingblfv"; depends=[doSNOW evaluate foreach PerformanceAnalytics quantmod R_utils snow xts zoo]; };
+  portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.1.1"; sha256="1g1iwla5ldan94vs4dhpggfj9q9hgs9nxjimrcnjg2i3x7cj1kmg"; depends=[doSNOW evaluate foreach PerformanceAnalytics quantmod R_utils snow xts zoo]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
   portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; };
   postGIStools = derive2 { name="postGIStools"; version="0.2.3"; sha256="1ig404p1ym4v1cw0a7jk2zjy9vdpg1y39mckkn8mpic29w9ra4b1"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
@@ -11147,9 +11317,9 @@ in with self; {
   powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; };
   ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; };
   ppcc = derive2 { name="ppcc"; version="1.1"; sha256="0c22nkp6c6rl2d6c868pnrda1l6h9bxssmdbca3pdc5s8wjxi0nd"; depends=[]; };
-  ppclust = derive2 { name="ppclust"; version="0.1.2"; sha256="0q21vsvsdr09dggsb15syw39414bjp5lf4d7hnz0p2sc2v317lh0"; depends=[inaparc MASS]; };
+  ppclust = derive2 { name="ppclust"; version="0.1.3"; sha256="1480fcjzz1vfmz3sgcdrpfilqklmb1f0h4vna6xkfib5xh624lxb"; depends=[inaparc MASS]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
-  ppgmmga = derive2 { name="ppgmmga"; version="1.1"; sha256="0w2phsc6mzz4d8hzb07hhcqnvk1kqcsns1hk6bv6dr33q6xp1qnv"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; };
+  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.0"; sha256="0k4ql8za6kdplz7fq4cas2rz8vad5ssbiyv95iaqwzgslwnr7m3m"; depends=[tibble tidyr]; };
   ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
@@ -11197,15 +11367,17 @@ in with self; {
   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]; };
-  prettydoc = derive2 { name="prettydoc"; version="0.2.1"; sha256="00amqn0izg2jrn96pmm5papqmp0chn25msjk94nim3avqg9x4x92"; depends=[rmarkdown]; };
+  prettydoc = derive2 { name="prettydoc"; version="0.3.0"; sha256="1bjgcr9kxyzm8q5hilc6kfjy32rwy10cdfajb90w8drc91g0g9n9"; depends=[rmarkdown]; };
   prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; };
   prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
   prevR = derive2 { name="prevR"; version="3.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]; };
   prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; };
   priceR = derive2 { name="priceR"; version="0.1.0"; sha256="09jlf8c1lfiqmpm2vdgkacsracwcjgi6xgvlakny2c4iyir45sh5"; depends=[dplyr gsubfn stringr]; };
   pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.0.1"; sha256="0sgpnfx4qs7xzcwnlwjkwrqj39w5b4h8133ma527z845nkfixncl"; depends=[survey]; };
   prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; };
+  primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; };
   primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; };
   primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
   primerTree = derive2 { name="primerTree"; version="1.0.4"; sha256="15am88swc9h8igjnjqr4jg105i91lsl28nncqly03cgy4vm814kk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr reshape2 scales stringr XML]; };
@@ -11224,7 +11396,7 @@ 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.2"; sha256="1ix1ad4pghd67shrbhfqwycqmkiijzhqav1jd4g7251w5kqa2y2z"; depends=[dplyr generics rlang tidyselect vctrs yardstick]; };
+  probably = derive2 { name="probably"; version="0.0.3"; sha256="0i6r7yc8s3rlkxaqc48arci4i2wyi4xygf93bisd8zfgrzcvmgw8"; 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]; };
   probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; };
@@ -11236,9 +11408,9 @@ in with self; {
   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]; };
   processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; };
-  processx = derive2 { name="processx"; version="3.3.1"; sha256="1bhbfacx2z2d97pz5bch45nvbvywhx2zp049czlfbdivkzgxn8v1"; depends=[ps R6]; };
+  processx = derive2 { name="processx"; version="3.4.1"; sha256="1g6ipcaxg9y94lyrnbp7kkbqfkcdh1fyrqjjclbjp3x7iysdvazi"; depends=[ps R6]; };
   prodest = derive2 { name="prodest"; version="1.0.1"; sha256="16nqgd9wrjfxymwbxrnlak54cagbv3fxgbql0w5bxnmyrbbqy509"; depends=[AER DEoptim dplyr Matrix Rsolnp]; };
-  prodigenr = derive2 { name="prodigenr"; version="0.4.0"; sha256="1rbfg3jzspw51lbhjbdy0wy5fgl3k3cnb324i73nbgjn7ycmpfqx"; depends=[clipr clisymbols crayon desc devtools fs git2r rmarkdown rprojroot usethis withr]; };
+  prodigenr = derive2 { name="prodigenr"; version="0.5.0"; sha256="1h15fwd4rclja0q80y119sah1qbyjlbaqxg360ywq9ig151lxsjq"; depends=[fs git2r rmarkdown rprojroot usethis withr]; };
   prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; };
   productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; };
   productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; };
@@ -11269,7 +11441,7 @@ 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.1"; sha256="06gydd4a6lra25lsvn3jljihjinsmqbyvin9yd9bm2j9vg863wdp"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="4.1.6"; sha256="1zpqx0xcf0di3p8x48g8icjwisfans0b1x902mq9fcal0qyc5mi1"; 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.4.0"; sha256="150i2q4nakz28f39kmhrchz4qsr8ax6y02512md94k8hq4hamxg1"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -11278,7 +11450,7 @@ in with self; {
   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="1.8"; sha256="05w5lgf255agj70qdyjm64ci9j0pncz0k0bxhq2cxjbkv09169lr"; depends=[jsonlite Rcpp]; };
+  protolite = derive2 { name="protolite"; version="1.9"; sha256="18k2909af314k3av7vwnkcz0k7ykfwjk2891pyqnlkxmknmg69z6"; 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=[]; };
@@ -11288,7 +11460,7 @@ in with self; {
   provViz = derive2 { name="provViz"; version="1.0.5"; sha256="11gzc9wjich7hmb47aj1fxsz39hmfq1629wag0p7l7205p0vsadl"; depends=[]; };
   provenance = derive2 { name="provenance"; version="2.3"; sha256="1nzgnjfy91r9995jhn7s96jqqlc35s4kxhqscpj9jv93ngddq3zd"; depends=[IsoplotR MASS]; };
   proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; };
-  proxyC = derive2 { name="proxyC"; version="0.1.4"; sha256="1490acnqd8sq3z37d42qhi9rlrgdp5p3m3xi8frq9pq7i0f159x6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; };
+  proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; };
   prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; };
   prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; };
   pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; };
@@ -11316,13 +11488,14 @@ in with self; {
   pssmooth = derive2 { name="pssmooth"; version="1.0.2"; sha256="09x5dhwx40j1fy7bzj0z0lj7sbjlwrqn2b8ph0387prbbp9q2lxs"; depends=[chngpt MASS np osDesign]; };
   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]; };
   psychReport = derive2 { name="psychReport"; version="0.4"; sha256="0025m39gxjv63p230xg6vmyndni8bqx5nfs6dzz7xlc8qys56jqs"; 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]; };
   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.2"; sha256="095jy43p513kdw3d0bmh1rl6rkp6ah0fkbaawzmjnq12a01ywrxk"; 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.3.3"; sha256="0m7jsyqfgx8k77j8qg7ysdf41nhc3xa9mm8yfs95y2yk4x2lmwzp"; depends=[abind corpcor crayon dplyr glasso lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply 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]; };
@@ -11331,7 +11504,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.1.2"; sha256="039grgwm0fj7q3lkjckklb2a0yazcliiv8j2cfrfrwgq74w56p2f"; depends=[GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; };
+  ptmixed = derive2 { name="ptmixed"; version="0.2.1"; sha256="03mr26xx4i93pa6hjkp5pfd9i4pialpcwxiw8pnk3zifqiq3168b"; depends=[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]; };
@@ -11340,7 +11513,7 @@ in with self; {
   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]; };
-  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.15"; sha256="0cwvdjdk4pd00g9hdj7116jcrlqw243pv78ckrhmvhsdpj9diz5q"; depends=[boot R2HTML RCurl XML]; };
+  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; };
   pubtatordb = derive2 { name="pubtatordb"; version="0.1.3"; sha256="0k16nq7fbsd07wkv6zys0jqdd35ikq3aiax3jdihk94gq46raqc1"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
   pulsar = derive2 { name="pulsar"; version="0.3.5"; sha256="0n16jcjxaz19gc12idj3vva9bb0ljxwimgcgil57pi9rmflv9jm1"; depends=[Matrix]; };
@@ -11351,10 +11524,10 @@ in with self; {
   purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; };
   purrr = derive2 { name="purrr"; version="0.3.2"; sha256="0ccs78a2ylr60f3z0f7iywi8h1pwr8mz4ga78bs4pwgnwkclvir7"; depends=[magrittr rlang]; };
   purrrlyr = derive2 { name="purrrlyr"; version="0.0.5"; sha256="0rcamyf7d01rpd9izh8xp66j130aqarfbc24p898dqhghb6q1ryq"; depends=[BH dplyr magrittr purrr Rcpp]; };
-  purrrogress = derive2 { name="purrrogress"; version="0.1.0"; sha256="0kbwwa1mwpf8vfagblmcw2467v5z9mmgn41sabz79d3lg862i9a1"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; };
+  purrrogress = derive2 { name="purrrogress"; version="0.1.1"; sha256="1l7wr7jjpang9gx61pfw9qiapsviwpp13kbylmxvw7lz7q0khzcz"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; };
   pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; };
   pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
-  pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.2.0"; sha256="05dmidh9s30brzkmi4yjkdv262saaycm80ss31vbq1000v00nf47"; depends=[ggplot2 scales zipfR]; };
+  pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.4.0"; sha256="1cvym37l3vyanfvbb845fcdcy8xsqinj8vnz64wiqyb83hnq3cq7"; depends=[ggplot2 scales zipfR]; };
   pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; };
   pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; };
   pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; };
@@ -11371,23 +11544,22 @@ in with self; {
   pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; };
   pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; };
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
-  pyinit = derive2 { name="pyinit"; version="1.0.2"; sha256="148b8l5a8c636rgm8dwd8v6ggw9qmkafc5a40bciqc4rk09lfhl3"; depends=[robustbase]; };
-  pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
+  pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; };
+  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]; };
   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.0"; sha256="0rz4d5pf4xzzn6d8ab0ji1795qpmz70m958rvar4hbf97dcr8r7x"; depends=[adimpro aws awsMethods dti oro_nifti stringr]; };
+  qMRI = derive2 { name="qMRI"; version="1.0.1"; sha256="1b6wa3s9km22ymwhd7a1hxnaish4zhdi23w96mydjb32bf28x0rp"; 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.0"; sha256="046zyzgmd4rygl871xri02ylkyzl6yszn7zjc47kq7bb8jj0c1ya"; depends=[copula data_table doParallel foreach ggplot2 plyr]; };
+  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=[]; };
   qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; };
   qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; };
   qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; };
   qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; };
   qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; };
-  qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
   qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; };
   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]; };
@@ -11397,12 +11569,13 @@ in with self; {
   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.0.0"; sha256="1hidp0ai901ybrwmnhdyly74yy1jbhqlx0npxswig6a9sxgbmms4"; depends=[ggplot2 gridExtra]; };
+  qgcomp = derive2 { name="qgcomp"; version="1.1.0"; sha256="1nh6z45rzfiv8zymxdigz6zd86x751ciwrmc85s1g3awn5bf6r1p"; depends=[ggplot2 gridExtra survival]; };
   qgraph = derive2 { name="qgraph"; version="1.6.3"; sha256="0makwk8kygqfi4hqzhfzd2jbljlwvs24mv7psr5wyh76g8392drn"; depends=[abind BDgraph colorspace corpcor d3Network fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2]; };
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
   qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
   qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; };
   qicharts2 = derive2 { name="qicharts2"; version="0.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]; };
@@ -11434,7 +11607,7 @@ in with self; {
   qrng = derive2 { name="qrng"; version="0.0-5"; sha256="0ddwbbw5w7y8vns83z4dyh8inl976k2cg55rxbynaks8bdxr38mj"; depends=[]; };
   qrnn = derive2 { name="qrnn"; version="2.0.4"; sha256="0i0hyb97xb3kwpvg6cqkwvl612cx11bszkm7pzhiy6ss598r6wwi"; depends=[]; };
   qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; };
-  qs = derive2 { name="qs"; version="0.17.1"; sha256="02bv3bmdz2klay8masb1zyx500rsbcfadkvby269ncd359i28l4f"; depends=[RApiSerialize Rcpp]; };
+  qs = derive2 { name="qs"; version="0.17.3"; sha256="1z0q9kgyf1rkkbjl8b4rm444c3war4drqbi2lgbvzm6q8jy6pdh1"; depends=[RApiSerialize Rcpp]; };
   qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; };
   qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; };
   qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; };
@@ -11463,13 +11636,13 @@ in with self; {
   qualtRics = derive2 { name="qualtRics"; version="3.1.0"; sha256="06lbjck0a7rnh5j67y8x1r1ryzy1pjmhvzdzxj9r7sdqgw767p26"; depends=[assertthat dplyr httr jsonlite readr rlang sjlabelled stringr yaml]; };
   qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; };
-  quanteda = derive2 { name="quanteda"; version="1.4.3"; sha256="0lh32xsqrbai1jp6jgdypgz1imv4gf4x0dbwd5kss0y80sr80r3c"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; };
+  quanteda = derive2 { name="quanteda"; version="1.5.1"; sha256="08hzgqza853jrk0r6cgn5398k0llfpm6jk4hs4rw8l2dn0520nq5"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
   quantities = derive2 { name="quantities"; version="0.1.2"; sha256="01h0d2cmqqyqch98d8pgv3n2rvp3vc3sby95srahgcrrlxmmrrvj"; 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.41"; sha256="110ax3ngn6i94h7iw7ha67kfsmj94hycp7lk62nmyvkp34vpfykh"; depends=[Matrix MatrixModels SparseM]; };
+  quantreg = derive2 { name="quantreg"; version="5.42.1"; sha256="1aycnghci329yqw63kybv7sfjjx5whq3xs7xzic4wsaj7j4b1hjc"; 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]; };
@@ -11489,7 +11662,7 @@ in with self; {
   quickregression = derive2 { name="quickregression"; version="0.2"; sha256="1z0sspi8q7dvgxqbj5na56v458pv6jhxrssnm6j23156dchgw39h"; depends=[car]; };
   quiddich = derive2 { name="quiddich"; version="1.0.0"; sha256="10kiyn1all58klyygmz6zw0w9nfl9vq19qybmkqh410rd5ryjz3p"; depends=[ape]; };
   quietR = derive2 { name="quietR"; version="0.1.0"; sha256="1f923dllhchgf49bp2d9186v3cxzdya6i56ww6cj0n0mh8gfi27z"; depends=[]; };
-  quint = derive2 { name="quint"; version="2.0.0"; sha256="10jcpabsk7bdw7cvq21z0hsrp4gnlbf35iypc2gprrbkk8sw4i8i"; depends=[Formula partykit rpart]; };
+  quint = derive2 { name="quint"; version="2.0.1"; sha256="0a6ibaz9x4nba3kn7gbnz0f53sv3489zpa2vvywq1g9dx8nm7r3v"; depends=[Formula partykit rpart]; };
   quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; };
   quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; };
   qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; };
@@ -11501,6 +11674,7 @@ in with self; {
   r2d3 = derive2 { name="r2d3"; version="0.2.3"; sha256="0v612mbzdjr8cq1ffall9hagbwxfv7fh963x8f0w5r84v1m3y2bl"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
   r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; };
+  r2pmml = derive2 { name="r2pmml"; version="0.23.0"; sha256="1md7fzx7yc6b3plflcq4c109v2plhvb1a6dg628bhyiicjs1s83c"; depends=[]; };
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
   r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; };
   r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; };
@@ -11547,6 +11721,7 @@ in with self; {
   rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; };
   rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; };
   rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4.1"; sha256="1bwg8mzddsc39km85b41bxp2hwqmb4g5a3010f6yp1qlgcb9rmj1"; depends=[plyr]; };
+  rLandsat = derive2 { name="rLandsat"; version="0.1.1"; sha256="0zbmd36fs2rwdw4x2aphp44q3abyh4zj3dvx9z6jbkgwlsxvck0v"; depends=[dplyr httr jsonlite RCurl readr stringr svMisc]; };
   rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
   rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; };
@@ -11561,20 +11736,23 @@ in with self; {
   rPraat = derive2 { name="rPraat"; version="1.2.0-2"; sha256="00qxccdbs42d9mi33af08i4la4fi500rqxvll39mffnrwlwa3bhw"; 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="1.0.1"; sha256="0a1lx1x2xd05a07qbqg5d1v21fqqknlmrl9gbjg3k6wmydxwcly8"; 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]; };
   rSPARCS = derive2 { name="rSPARCS"; version="0.0.4"; sha256="1w2w5gx82dd4s0zbqk376195svs0z9f9cgx8zcy7gig94ilbrv5l"; depends=[data_table foreign geosphere plyr raster sp spatialEco tigris]; };
   rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; };
+  rSymbiota = derive2 { name="rSymbiota"; version="1.0.0"; sha256="0dld8li5b8ylhdmll6iz5pk4pxh2dk37hbx0458jn0zhd4fl1cm7"; depends=[crayon dplyr ggplot2 Hmisc httr knitr magick maps mapview RCurl RSelenium rvest rworldmap sf sp stringr sys treemap XML xml2]; };
   rTRNG = derive2 { name="rTRNG"; version="4.20-1"; sha256="0l0gs65rbl080f1l67xiygz551q5lj0q48nz8m6gsjfq5ias5gn6"; depends=[Rcpp RcppParallel]; };
   rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; };
   rTensor = derive2 { name="rTensor"; version="1.4"; sha256="08i94vvk5i25j40dwn497svgrmz90iwzp6qgiir37wgvx355xwzr"; depends=[]; };
   rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
-  rWind = derive2 { name="rWind"; version="1.0.4"; sha256="13ci2xzkjal869zm7llvkm8zrya7vhqy3gizq9py87zsds3h0f4y"; depends=[gdistance lubridate Matrix raster]; };
+  rWind = derive2 { name="rWind"; version="1.1.3"; sha256="1q9f7mrjks7nb9lgkmi6w774dz479d2hhzhns0v0mrllmv9nck1s"; depends=[gdistance lubridate Matrix raster]; };
   rWishart = derive2 { name="rWishart"; version="0.1.1"; sha256="1zv35l2nvwwidx5zxfh7a4jgiaq2mqk69xf974994k1ksfvibkmi"; depends=[lazyeval MASS Matrix]; };
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   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]; };
@@ -11583,29 +11761,31 @@ in with self; {
   radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; };
   radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; };
   radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; };
-  radiant_basics = derive2 { name="radiant.basics"; version="0.9.9"; sha256="132y74g3mr291jcyrbky3ky0bh4pqll0mafcxm4ykrcqr9his3rw"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; };
-  radiant_data = derive2 { name="radiant.data"; version="0.9.9"; sha256="17mgm0sggh4f7ihqmj9m3996p3pqc7h2cwx6ll1ha3kg5mx0znyn"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; };
+  radiant_basics = derive2 { name="radiant.basics"; version="1.0.0"; sha256="188dzsr8lwbam9hvvwqgcf08aj4ja04fvfcw315g4jy1nbhbvg33"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; };
+  radiant_data = derive2 { name="radiant.data"; version="1.0.0"; sha256="0b35jn4mcj10hqra18l8pi6s4pvj6fxipslbn6hkr4zza1z27gzw"; depends=[base64enc broom car curl dplyr DT ggplot2 glue gridExtra jsonlite knitr lubridate magrittr markdown plotly psych r_import readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; };
   radiant_design = derive2 { name="radiant.design"; version="0.9.9"; sha256="1d5ds24b7mp8xad5pgzvjr17akr7p8m6w0ryd5fkwylnfgnhznrb"; depends=[AlgDesign dplyr mvtnorm polycor pwr r_import radiant_data shiny]; };
-  radiant_model = derive2 { name="radiant.model"; version="0.9.9"; sha256="0mcds65pfz4d5h93imsvw74r0lp1vldlhy7q3h0xivrhkjri1g8v"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; };
+  radiant_model = derive2 { name="radiant.model"; version="1.0.0"; sha256="14zk2yl40694kyri5wr7czc2ymwqa68n7jzk6j1a28l7cbgs8xfx"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; };
   radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.9.1"; sha256="154q06vbj13y15rz2apvy521gda8jh66yhr87kqvlv9mh2k9ws2h"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang scales shiny]; };
   radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; };
-  radir = derive2 { name="radir"; version="1.0.3"; sha256="0v1w0jy19fqscwkggyjashb6n9r6xjc0d971zw0lqnh1ap3chg0y"; depends=[hermite]; };
+  radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; };
   radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; };
   radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; };
   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]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
+  ragg = derive2 { name="ragg"; version="0.1.2"; sha256="0bb6sa8zs42p5p4hcyip89rlgyzymzfdr7n7bxfyb61l2aj5x9db"; 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]; };
   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]; };
   railtrails = derive2 { name="railtrails"; version="0.1.1"; sha256="1hi55rcxmr7k3na3rpjqmd5fpgn51bymrp7yxmw45ff7mlzpa5h6"; depends=[tibble]; };
   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=[]; };
   rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
   rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; };
-  ramchoice = derive2 { name="ramchoice"; version="1.0"; sha256="0cjj4kk05mif0blfkw86xvnx3aaq07c64ffpvbvvb32s2pqvc91r"; depends=[MASS]; };
+  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]; };
@@ -11620,7 +11800,7 @@ in with self; {
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; };
   randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.0"; sha256="1kdxkz7c2a73hflagz8gxhp1dgqxwdik0wxczd72iy60a5navscw"; depends=[]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.9.1"; sha256="1vylj5mdhy11nda644yn7mdz9kf64a9zz8j317y5n1jmzvx4fyii"; 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]; };
@@ -11641,7 +11821,7 @@ in with self; {
   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]; };
   rankFD = derive2 { name="rankFD"; version="0.0.3"; sha256="0cqvr01hbq3cz2zxmysl2k88wfckyvnlsdk8ypdxdkap4gavnvqv"; depends=[coin lattice MASS Matrix]; };
-  rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; };
+  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]; };
   rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; };
   rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; };
@@ -11658,11 +11838,11 @@ in with self; {
   rasciidoc = derive2 { name="rasciidoc"; version="2.0.0"; sha256="1bqabjr8h0ldhmf7mirk0fkv6nrv80zrm2vrx836ib5cxb2hw1yv"; 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="2.9-5"; sha256="0ljrymsp4zzaxdj1l0mw0a6hi88m5h0h920ixfzrg0szbyxqd0yk"; depends=[Rcpp sp]; };
+  raster = derive2 { name="raster"; version="2.9-23"; sha256="1brqigic8ygr223bp2hgk5qjz3q03r4sfglrv4an0ghy7fgfralh"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
   rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
-  rasterVis = derive2 { name="rasterVis"; version="0.45"; sha256="0x1d28jn6l78lhccbnlnzyr18734f16rcfnfyl9vqpkrn7sgwc3i"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
+  rasterVis = derive2 { name="rasterVis"; version="0.46"; sha256="0lzjqkm22qfcmzgnjv9k9b49hx9xa3vjwcl9935a5kjqsn57ipdy"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; };
   ratematrix = derive2 { name="ratematrix"; version="1.2.1"; sha256="0hbwfgwkkd5a83f3nqk5gdyiqbpzsgshvcjcslaz73si05zsrkgs"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; };
@@ -11676,14 +11856,15 @@ in with self; {
   raustats = derive2 { name="raustats"; version="0.1.0"; sha256="0wyq45v4d5gyrn2zbn0qj7wm4a0jh0xjlp6wzzpdiy2w3c9xwx5z"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; };
   raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; };
   raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; };
-  rayshader = derive2 { name="rayshader"; version="0.10.1"; sha256="0yjqp3fgcay12iirji27nhpck51salln5793axqkj1fwjl6h12d4"; depends=[doParallel foreach imager magrittr png progress raster Rcpp RcppArmadillo rgl scales]; };
-  rbacon = derive2 { name="rbacon"; version="2.3.8"; sha256="1qhph8rwziiq1787dmsjz4j43j2375h8nhdfkjfn20snm043krz9"; depends=[coda Rcpp]; };
+  rayshader = derive2 { name="rayshader"; version="0.11.5"; sha256="1sycybfpw0d5d7f2579047jr60vay26hzqlvj8a5c9czdyrvlcxs"; depends=[doParallel foreach ggplot2 imager magrittr png progress raster Rcpp RcppArmadillo rgl scales]; };
+  rbacon = derive2 { name="rbacon"; version="2.3.9.1"; sha256="0gnvi0aaw4yyg1cvrdyps2590gx1lwcjl21y4q9zn3k00mnwmc12"; depends=[coda Rcpp]; };
+  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=[]; };
   rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; };
   rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
-  rbi = derive2 { name="rbi"; version="0.10.1"; sha256="1ajvmqa4zp44nb50gb3adf8xg4vxm15w233dxvdfnxv8sdn1nll6"; depends=[data_table ncdf4 processx reshape2]; };
-  rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.0"; sha256="03fshs7q7pdybi3p35940hwnq971534pg3anddansbnhjihabkgx"; depends=[data_table lubridate Matrix rbi reshape2]; };
+  rbi = derive2 { name="rbi"; version="0.10.2"; sha256="158yi9d8pxgb5b1x1qpjzrfnq673vmsbmgm00w0dbk03akcvlfzc"; depends=[data_table ncdf4 processx reshape2]; };
+  rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.1"; sha256="0hngqbdydvvp4zmicvnnmwz3fw6pjvgdxp7h80zk1qczid2yg4x5"; depends=[data_table lubridate Matrix rbi reshape2]; };
   rbin = derive2 { name="rbin"; version="0.1.1"; sha256="1rbwm5xc61sva1m3n5hd9vsh7gm4hamswny35zm7j0fyc4v4bzxz"; depends=[DescTools dplyr forcats ggplot2 glue magrittr miniUI purrr recipes rlang rstudioapi shiny tibble]; };
   rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; };
   rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; };
@@ -11711,19 +11892,19 @@ in with self; {
   rcdk = derive2 { name="rcdk"; version="3.4.7.1"; sha256="1d08ajji631792b7fyfwzvcaswh8jlanfsxrj6c1wx7xh3qqpigg"; depends=[fingerprint iterators itertools png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; };
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
-  rcheology = derive2 { name="rcheology"; version="3.6.0.0"; sha256="1hxs799w0lqrbd12lgrl4wm2n5qbg5hxwq3mcjrdya54mb74j7ff"; depends=[]; };
+  rcheology = derive2 { name="rcheology"; version="3.6.1.0"; sha256="08z1nygygl2b5qri1nngjijzf8dnpx4f67h71f2mm6v7mykjqwrd"; 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]; };
   rcites = derive2 { name="rcites"; version="1.0.1"; sha256="1rpalysmv0c7f23aj3k6h80cw9cmsv0vn82da07km5qfll5pis6y"; depends=[cli httr jsonlite]; };
   rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; };
   rclimateca = derive2 { name="rclimateca"; version="1.0.2"; sha256="012p6vj78m43y8n85diaf5z11h4v0p4s898jmlipvsha11q60csn"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
-  rclipboard = derive2 { name="rclipboard"; version="0.1.1"; sha256="0rgvin8nk8bbj7agwb0p2x6dg1p16s9qixjqq5rnxprdj7p6dhdm"; depends=[shiny]; };
+  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.2.1"; sha256="04a69kqn37plsy8x4lsm86w2hxvan4vhn3vlqb67fc1dkihkphyh"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; };
+  rcompanion = derive2 { name="rcompanion"; version="2.2.2"; sha256="1jlyd4cgzksxw7sjhjdvl10vr741ybidml95qi2gwp2r3x3nw4a3"; 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.0"; sha256="1qz040ylzclal5mmbjlaqng8cr3zm17zkzm73f94j6rzg9j5ip3q"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; };
+  rcosmo = derive2 { name="rcosmo"; version="1.1.1"; sha256="195cxjgkcgz9qx51hsg9bd2y7c96dk69c8yvy9s2w59jy9iy5i7y"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; };
   rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
   rcrossref = derive2 { name="rcrossref"; version="0.9.2"; sha256="1383xlwy3vj08hhghx5zsy0890zsm402x9hdqzs5x5q7mxkqdwjq"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; };
   rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; };
@@ -11738,7 +11919,7 @@ in with self; {
   rdbnomics = derive2 { name="rdbnomics"; version="0.4.7"; sha256="1qbng6hml3nafs9vv1vrpaj0755di6bcxrzvp2ng9psh2yv0plz2"; 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="0.2.2"; sha256="10530il8fxpgcads6yvj09jwanldlpvjgjqcknl2wly4gmwcwjq9"; depends=[ggplot2 lpdensity]; };
+  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=[]; };
@@ -11764,7 +11945,7 @@ in with self; {
   re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
   reReg = derive2 { name="reReg"; version="1.1.6"; sha256="198vgf3294if9zmvl54pgx6ram63pswpjnh44fy7n60g8nza44bb"; depends=[BB dplyr ggplot2 MASS nleqslv plyr purrr SQUAREM survival tibble tidyr]; };
-  reactR = derive2 { name="reactR"; version="0.4.0"; sha256="1fwbcspik8f1k307gw2vksbbk3z5ndw60cvfcjb9jw87kd14imnd"; depends=[htmltools]; };
+  reactR = derive2 { name="reactR"; version="0.4.1"; sha256="0fzx0qy9s366gd81xiz36k3v4d9sdsrrf3m5azlghvbvq5h42wxv"; depends=[htmltools]; };
   reactlog = derive2 { name="reactlog"; version="1.0.0"; sha256="1pajxd9k208s06sava2gqip22pzwlyslnfvkbkfw47mp4wb7zmk9"; depends=[jsonlite]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
   read_gb = derive2 { name="read.gb"; version="1.6"; sha256="17py6al9cwq4jmab7k2164f7hi8943gi8a50d8zpn1xms9l2cnld"; depends=[]; };
@@ -11788,6 +11969,7 @@ in with self; {
   readsdmx = derive2 { name="readsdmx"; version="0.2.2"; sha256="1ja6fpjsbx5jzv9ys12wkcn3jrj8a2gnxpbswqk6ppckryi9hnp7"; depends=[Rcpp]; };
   readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; };
   readtext = derive2 { name="readtext"; version="0.75"; sha256="0xbl4q3y4kzigr6rgqb04sq1xqddfzqivkjmbd0v5sfammrhla8n"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; };
+  readwritesqlite = derive2 { name="readwritesqlite"; version="0.0.2"; sha256="064imgjl197avdsjhqvlg9yzgsp4p4yisvk62l6arcnkixwlz086"; depends=[checkr DBI dttr2 err hms RSQLite sf tibble units]; };
   readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; };
   realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
@@ -11800,7 +11982,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.5"; sha256="056zv4vhayyy8q9izcdknbb9hff2gxivg21g5mkssia78vw8g3mg"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyr tidyselect timeDate withr]; };
+  recipes = derive2 { name="recipes"; version="0.1.6"; sha256="1ndz9h0zvdj141r63l8047wbhaj0x8fwzzyq7b8mh78pvrrdpq2i"; 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]; };
@@ -11820,7 +12002,7 @@ in with self; {
   reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; };
   redist = derive2 { name="redist"; version="1.3-3"; sha256="18asjam8hvayvnfysyjzbazjn27ds7163qhdq0p9aqlx03v89aa9"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; };
   redland = derive2 { name="redland"; version="1.0.17-10"; sha256="0k28896jsxy1qxnn6iyx3xxasq4y171xfjragqkj568nn9lmzfi8"; depends=[roxygen2]; };
-  redlistr = derive2 { name="redlistr"; version="1.0.2"; sha256="1s335dim68qx0i28w7586kacb8j8qawwg5az56a8ggja6yll306f"; depends=[plyr raster rgeos sp]; };
+  redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; };
   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]; };
@@ -11852,7 +12034,7 @@ in with self; {
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
   regtools = derive2 { name="regtools"; version="1.0.1"; sha256="0807r8721qmdl8ahvlzcvqaq2rfvlvhblwbwdpi79fm7dk8vvq1i"; depends=[car dummies FNN mvtnorm]; };
-  rehh = derive2 { name="rehh"; version="2.0.4"; sha256="1p5883p8fyafhz3nkg65ahcqxmmzh03wkvjm383j081bmcl1rb9x"; depends=[gplots rehh_data]; };
+  rehh = derive2 { name="rehh"; version="3.0.1"; sha256="061nk9xmlbllisszpscfpa95653745v645jm3qls1cp42d73rz6k"; depends=[rehh_data]; };
   rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; };
   rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; };
   reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; };
@@ -11878,7 +12060,7 @@ in with self; {
   rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; };
   remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
   rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; };
-  rematch2 = derive2 { name="rematch2"; version="2.0.1"; sha256="16k0i5p7fa3qfxv59ijyn638wpz8n4jrkrnilqmh5g9l8f8bn4h6"; depends=[tibble]; };
+  rematch2 = derive2 { name="rematch2"; version="2.1.0"; sha256="00cznm6rk33b53w7zybkz7549bnydc66znpi5mb0xd24pmqp0rvq"; depends=[tibble]; };
   remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; };
   remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; };
   remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; };
@@ -11886,17 +12068,17 @@ in with self; {
   remotes = derive2 { name="remotes"; version="2.1.0"; sha256="19v8dmnk9l4i9m64p7zgmj7y1vhnnwhi5kyn0k5d034zzkvchi49"; depends=[]; };
   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]; };
-  repeated = derive2 { name="repeated"; version="1.1.1"; sha256="1ni2rp16z73k2yj30v5qw1yg256yd98wm2n5j0lhjjngizzx09rs"; depends=[rmutil]; };
+  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.8"; sha256="1yrjr18wvk838214j9ward8niifvqi1gvb7vzx7cq4w8pb0gbgh6"; depends=[lmerTest nlme PowerTOST readxl]; };
+  replicateBE = derive2 { name="replicateBE"; version="1.0.10"; sha256="0f9ws632b1gi5v3q0zxp94b30m4rzz6cg7p5vqbq88fsab1hm52a"; 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.0"; sha256="12qz31wfn4qmag1zn65f18cxg781q86hbksizdix29sbkbpjg764"; depends=[DBI dplyr rlang wrapr]; };
+  replyr = derive2 { name="replyr"; version="1.0.4"; sha256="1vz2lw2b587c7yc2l9x2rx9wdb2l3nfr3cjv1jy0h4y9k5rmzfpg"; 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]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
-  reportROC = derive2 { name="reportROC"; version="3.3"; sha256="10q83gaaw6ybwcivbh9yimqw7x4k939a7kavxxiybn3300l2w7cv"; depends=[pROC]; };
+  reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; };
   reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; };
   reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
   reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; };
@@ -11907,14 +12089,14 @@ in with self; {
   represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; 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]; };
-  reproducible = derive2 { name="reproducible"; version="0.2.8"; sha256="0i9x4wprylhd19mcq3f5a5hh3mnmvgvp0y6qymjkz6vaw8jpp6d2"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster Rcpp RCurl remotes rgdal rgeos rlang sf sp testthat versions]; };
+  reproducible = derive2 { name="reproducible"; version="0.2.9"; sha256="1q7lvvz7sxd5a6248rzgyx3smqih0gjncz3y05qbmy77rpkv0h7x"; 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="0.1.0"; sha256="1ffldcs30xa4wcd825bgpcmqsndfyxx70dfmbb3c86ic9kq17p01"; depends=[tibble]; };
+  repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; };
   reqres = derive2 { name="reqres"; version="0.2.2"; sha256="18ib0qbfw3sih7xs1z4szjqppr7lbj5wx0w0kx80g810m7q27wyp"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
   requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; };
-  rerddap = derive2 { name="rerddap"; version="0.6.0"; sha256="08y2zbgi89d79d1a0mkv6xkwllvhw37sa5bv6wiaga1phfflp90k"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; };
-  rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.3.5"; sha256="0wi3zwzcb6xqxzf7y62cz7b2glnii2l1l581b9kgakc6f09wv92z"; depends=[abind dplyr ggplot2 httr ncdf4 parsedate plotdap readr rerddap sp]; };
+  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.0"; sha256="1a99acffmpywv9lx59fphy2p27xdmxsrmf9crj4m6ykj5rack7fj"; 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.0"; sha256="09hp97zk31f016d65vq64gv413c6bx1dwqy74ai34xk00flkwady"; depends=[]; };
@@ -11925,7 +12107,7 @@ 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.0"; sha256="1cwgs951sy36fyzcm256wqbwadl4j3kvbhzw991vnlml1b48c0cy"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; };
-  restatapi = derive2 { name="restatapi"; version="0.1.9"; sha256="11ja8vc76s744vz8gap97h0r02q2dmz2s5mn93sb6zmn1ryknd58"; depends=[data_table rjson rsdmx xml2]; };
+  restatapi = derive2 { name="restatapi"; version="0.2.3"; sha256="1rf6kl6r0i13l2zrir2y8ha3lmy3zgbjr1fwbsg1dnkgg4lq7rrc"; depends=[data_table rjson rsdmx 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]; };
@@ -11934,9 +12116,10 @@ in with self; {
   restriktor = derive2 { name="restriktor"; version="0.2-15"; sha256="1m3ng5cmkiim5gwi3v18d0987ghw1pkxxyw37pyz02iwlhzdj06s"; 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.12"; sha256="0pqr1rcs8yg9nlh729mvlws93cqhpmv49j9bcgarh7vxzkwyv0kb"; depends=[jsonlite Matrix Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.13"; sha256="1qwxh7zq9igl7dxl5g5qjbvv0mlac3w80djnkm0w8rxnaval3gmd"; depends=[jsonlite Matrix Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
-  retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
+  retistruct = derive2 { name="retistruct"; version="0.6.0"; sha256="1d7whcvz7im9h2cblldc4kjxw8fpj08q0k0hv0yyb1gkzp4snhrf"; 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=[]; };
   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]; };
@@ -11946,16 +12129,17 @@ 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.3.0"; sha256="0k5cr2qypfjrhv0l4d6hrzc2r6d9ipc279x16jhy3zzvwzgyjf0x"; depends=[ade4 modeltools plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
+  revtools = derive2 { name="revtools"; version="0.4.0"; sha256="138k9pcdv1gxfh52wlxavy6dinwqigrnckwka8bg3rwhdw0j8cky"; depends=[ade4 modeltools NLP plotly shiny shinydashboard SnowballC stringdist tm topicmodels viridisLite]; };
   reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
   rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; };
-  rexpokit = derive2 { name="rexpokit"; version="0.26.6.2"; sha256="08mrf80z7ckd5ad3nag2nnm5hhk2dz9f5jfkfhxz9n2lizs537yp"; depends=[Rcpp]; };
+  rexpokit = derive2 { name="rexpokit"; version="0.26.6.4"; sha256="0flqf57zsf0a70yrkgp9jfq3bmj36wyfzwldpkmfvw3qvfhddysw"; 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-4"; sha256="15784vhfp5sxmy58p2xgmc1v3bxx2f78i1pzc186q77zs88c5sq9"; 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.9.1"; sha256="04jd2w5g0y9m6wbk09rqfskcwixvxvv2j7blxid791jvj4jn8c74"; depends=[bitops data_table dplyr httr jsonlite purrr RCurl stringr tidyr]; };
   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]; };
   rflexscan = derive2 { name="rflexscan"; version="0.1"; sha256="1akja9nm7hzkf2q6r2vd29g0xsb6hivkjx40cvdg1di6zc7q9dnq"; depends=[igraph Rcpp rgdal sp]; };
@@ -11967,9 +12151,7 @@ in with self; {
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; };
   rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
-  rgam = derive2 { name="rgam"; version="0.6.6"; sha256="0klf2prw5zj76az66c5hzv23yya1b45l61xdy1zbnggvwh62fqik"; depends=[Rcpp RcppArmadillo]; };
   rgbif = derive2 { name="rgbif"; version="1.3.0"; sha256="1lamyylaj51vn693964xhgmx2fyrnlc4yljh63cb74gx9qjc9yga"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; };
-  rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
   rgdal = derive2 { name="rgdal"; version="1.4-4"; sha256="1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"; depends=[sp]; };
   rgdax = derive2 { name="rgdax"; version="1.0.0"; sha256="16ph6n1nyl2v2w51ih6wzkpw0j0hfa3f60q1g6p9zis59j0rh7d9"; depends=[digest httr jsonlite RCurl]; };
   rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; };
@@ -11980,7 +12162,7 @@ in with self; {
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; };
   rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
-  rgl = derive2 { name="rgl"; version="0.100.24"; sha256="0nm3iyvhhmh0zlywkfmrq3vyh8z1l296xxfmcky0ifd2qnysfcqj"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
+  rgl = derive2 { name="rgl"; version="0.100.26"; sha256="0h77akviwjd86j2qyx326xynbmwhypd6ydprzlwqnidd4ckrr271"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
   rglobi = derive2 { name="rglobi"; version="0.2.19"; sha256="13mzx7gmpz5zhp4nplkzigipyn3vkp8d5whz617fqrv8n3hy8ybm"; depends=[curl RCurl rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
   rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; };
@@ -12036,7 +12218,7 @@ in with self; {
   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.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
-  rjmcmc = derive2 { name="rjmcmc"; version="0.4.4"; sha256="1xvng9a3m228k65c988clf1cpsb0ilhlxbabm9gjxyzibrs457rl"; depends=[coda madness mvtnorm]; };
+  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]; };
   rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; };
@@ -12051,8 +12233,8 @@ in with self; {
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; };
-  rless = derive2 { name="rless"; version="0.1.0"; sha256="11w0hp8jsgs7k5kz35pzrjnifvhy1lgk3ll9im9vqjwcci5z6y8c"; depends=[V8]; };
-  rlfsm = derive2 { name="rlfsm"; version="0.2.0"; sha256="08fdllzk5q77fz6ii83vbmz8dnfwwr3ixs11ia2l1vrm1gdj9gf7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
+  rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; };
+  rlfsm = derive2 { name="rlfsm"; version="0.3.0"; sha256="1b8wkj333x845ss2j8daxixzhgk81pc0b3a1ahz159n2a1ha0afr"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
   rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; };
   rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.3.0"; sha256="0xq5dh3p94cqnhbbippqflmdlwy3f53hx8rph2bhdgkrwqm1751i"; depends=[MASS tseries]; };
@@ -12065,7 +12247,7 @@ in with self; {
   rmapshaper = derive2 { name="rmapshaper"; version="0.4.1"; sha256="0kd8hppn4d3z527s3kqz0mll7qjy0pbxbif46dfqx3rci6m62a68"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
   rmapzen = derive2 { name="rmapzen"; version="0.4.1"; sha256="1vql1cy38c4kv8pyl81877s587kq4l9sx9nslbgk3l41wvyyvphk"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
   rmargint = derive2 { name="rmargint"; version="1.0.2"; sha256="1hl2nxmgknw74jvmc05wz6zkf7i151xl7h7hdpcivvm60yizlx8i"; depends=[]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="1.13"; sha256="1vv3b8nlw8ra19492rjg3na42lwh3xr5a2jy2ia81fvvs846pywn"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="1.14"; sha256="0qfw5rkvwqpgix32g6qy9xrr50awmm146aqbm836xravih2b2dpn"; 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]; };
   rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
@@ -12075,6 +12257,7 @@ in with self; {
   rmdcev = derive2 { name="rmdcev"; version="0.9.0"; sha256="0bcriwrfynhvw27z57374hc7llsv5l58baplqkw4diq16gpqx5ik"; depends=[BH dplyr 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]; };
   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]; };
@@ -12097,12 +12280,13 @@ in with self; {
   rnassqs = derive2 { name="rnassqs"; version="0.4.0"; sha256="1vzkcw1rmrc4vq453jz63ldypnagv5vlwvczv5c938574g2yjwix"; depends=[httr jsonlite]; };
   rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; };
   rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; };
+  rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; };
   rncl = derive2 { name="rncl"; version="0.8.3"; sha256="03c8sizm32rdilbvf67gsw81w7i623pajn9blrrkq8rq8j3zdbns"; depends=[progress Rcpp]; };
   rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; };
   rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; };
   rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
   rngWELL = derive2 { name="rngWELL"; version="0.10-5"; sha256="0b4ys525gksgqwqx9id4bdgyi9mwj6n3r87xdzf4fc9hp3cc16jb"; depends=[]; };
-  rngtools = derive2 { name="rngtools"; version="1.3.1.1"; sha256="0k1nlcxggflq0043m15dfclnqnzchkpw2ik7jk82h4dqwvysiqcr"; depends=[digest pkgmaker stringr]; };
+  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]; };
   rnoaa = derive2 { name="rnoaa"; version="0.8.4"; sha256="1gyvsaz3whql4jzphrlawv3rrzyjp852kwzgq4wgdm8x25qyg6pv"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
@@ -12113,10 +12297,10 @@ in with self; {
   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]; };
   robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; };
-  robcbi = derive2 { name="robcbi"; version="1.1-2"; sha256="1n8whpnpsm9imiz8l1jxq5x597ydzb2b54jkvrl05hmwh79p97in"; depends=[robeth]; };
+  robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
   robcp = derive2 { name="robcp"; version="0.2.4"; sha256="1pvd8dw0kgwxrwnafaraya1qm3cwnp2c3ma569i7nwm2xsys76xj"; depends=[]; };
-  robeth = derive2 { name="robeth"; version="2.7-4"; sha256="11ghpy88r02844mw99zxl7qzkic8kcl0gw56a4kdyw84r0lyv8rg"; depends=[]; };
+  robeth = derive2 { name="robeth"; version="2.7-5"; sha256="0jz3ivck9ma8x03sz41zkln3qh70ckfm5c2l57nlxi0ci5h0dfh2"; depends=[]; };
   robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1.1"; sha256="1fxqva2khk16sj5ka5zdpaknh2w9n925ys0i4v7ahqvzhnxg6l3b"; depends=[lattice MASS robustbase]; };
   robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; };
@@ -12126,7 +12310,7 @@ in with self; {
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
   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"; sha256="1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"; depends=[fit_models lattice MASS robustbase rrcov]; };
+  robust = derive2 { name="robust"; version="0.4-18.1"; sha256="0xs098pfw5zdcdk3rsxkylfl6d2pyp566s5v92bzhgl7h8c90cfy"; 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=[]; };
@@ -12143,7 +12327,6 @@ in with self; {
   robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; };
   robustreg = derive2 { name="robustreg"; version="0.1-11"; sha256="08c6dyzki68hzl006s12bkjiirlw2n2isirjh8b79sd6zjrjlh72"; depends=[Matrix Rcpp RcppArmadillo]; };
   robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; };
-  robustvarComp = derive2 { name="robustvarComp"; version="0.1-5"; sha256="0jzcjfimycpbgr40hpal426lc8ckxyyd5wvjl7728qbnz85s75qj"; depends=[GSE numDeriv plyr robust robustbase]; };
   rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; };
   rocTree = derive2 { name="rocTree"; version="1.0.0"; sha256="0zq2w4jjkh6b657b92knkmnl121xiybnxq81x4xzz5nsg1sc8w1q"; depends=[data_tree DiagrammeR dplyr flexsurv ggplot2 MASS survival tibble]; };
   rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
@@ -12158,6 +12341,7 @@ in with self; {
   roll = derive2 { name="roll"; version="1.1.2"; sha256="16s60r8p85q176k5smzcdcqzx9snf62v8q6r3ddvpp7mh5l9clgj"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   rollRegres = derive2 { name="rollRegres"; version="0.1.2"; sha256="1cgdg4a40dqy7kc7bx567w8hirlwzg5aqn41hi5m1plzzprmcfzm"; 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]; };
   rollmatch = derive2 { name="rollmatch"; version="2.0.1"; sha256="1nyxsl2n8bnx31i78pzq0b19d58w70rqdn62bzrxdd11h9ph2dpr"; depends=[dplyr magrittr]; };
   roloc = derive2 { name="roloc"; version="0.1-1"; sha256="0xynj12gp010c23f6ll9p343vwgxwa22s771p1w2pi65cj2ixhas"; depends=[colorspace]; };
   rolocISCCNBS = derive2 { name="rolocISCCNBS"; version="0.1"; sha256="100jh5m2c1zp5wg3wd4y2i47dzx1j0g6lfwyqmwk4bz99yzzz5am"; depends=[colorspace roloc]; };
@@ -12176,12 +12360,12 @@ in with self; {
   roptim = derive2 { name="roptim"; version="0.1.2"; sha256="0kamdhyc7s1i7mbgzf6zbdbcs2qjjq4wgl1v181xzhq6gpv7fhy6"; depends=[Rcpp RcppArmadillo]; };
   rorcid = derive2 { name="rorcid"; version="0.5.0"; sha256="0508dc3av593bqylrq5zysav56p9243hg35gs8vhnbqjngfm1pib"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; };
   rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
-  rosetta = derive2 { name="rosetta"; version="0.0.1"; sha256="0ricxia5vc6hhx82m7xlbr7f31f4djb1ycg4p66fnjmxdmj85xd4"; depends=[car ggplot2 gridExtra lme4 multcompView pander psych rio ufs userfriendlyscience]; };
+  rosetta = derive2 { name="rosetta"; version="0.1.1"; sha256="0q2rhz9icx4w7ihb289v1bzngbi3dnsvyviv6mvg32il1xfw8ji9"; depends=[car ggplot2 ggrepel gridExtra lme4 multcompView pander plyr psych pwr rio ufs]; };
   rosetteApi = derive2 { name="rosetteApi"; version="1.12.1"; sha256="1b3cwxg7ja7g3bdl13j23xs8lw6ip70r4bah92pqs5pzmb5hx0wz"; depends=[httr jsonlite]; };
-  rosm = derive2 { name="rosm"; version="0.2.4"; sha256="00c5cj65fvi0aa07da90vcms3w4qshag2gws7jhpb3wb8nw0hmqq"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; };
+  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.7"; sha256="0yzyavdyhcm27cfjamjknjnlsgvawhkq0d24pial1h1hlqzm3s2a"; depends=[blogdown bookdown bookdownplus clipr devtools htmlwidgets knitr mindr rmarkdown rstudioapi shiny tinytex]; };
+  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-5"; sha256="15kw50c08vdamsxmi2ybripzh0vqif14jyrclyyflihrsw9l8p9p"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   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]; };
@@ -12194,7 +12378,7 @@ in with self; {
   roxygen2 = derive2 { name="roxygen2"; version="6.1.1"; sha256="0wq29ilqas8yn2z8v49fk0hbgchg29nmyyhwczgdipz0cbhbfipd"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp 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.1"; sha256="03v06ic2m3psblzbw3sfch3cjh3qjxs6iazdn51kha6r99vzqc6m"; depends=[Rcpp]; };
+  rpact = derive2 { name="rpact"; version="2.0.2"; sha256="0g5r0mqrp48bl3jsq83ga0b7b7fypv84idwxfgnrsj0gvjyzrgny"; 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_plot = derive2 { name="rpart.plot"; version="3.0.7"; sha256="0i4ix8vabnfvcaf7vs2mvyx85ix0wkxfrhr98nvhfxchzanzrrq4"; depends=[rpart]; };
@@ -12231,17 +12415,18 @@ in with self; {
   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.1.8"; sha256="10kf8081njxbsk92psh7bjn6s5x8a7117zi7k7v79ab3m9g2xb4m"; depends=[data_table rquery wrapr]; };
-  rquery = derive2 { name="rquery"; version="1.3.5"; sha256="048c9sqacpmcpfnwami9zhg318zczg9yw47573106sj27chx5q4j"; depends=[wrapr]; };
+  rqdatatable = derive2 { name="rqdatatable"; version="1.1.9"; sha256="1j8cczhid1im0afxnfhqcsy36vmcyrnqfwfbvns11ysjw5i6gh2v"; depends=[data_table rquery wrapr]; };
+  rquery = derive2 { name="rquery"; version="1.3.7"; sha256="05zygsf02p3dlbaap1mfi5whhq55mwj2h2p0wcx60hqwbfq2xj4k"; 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=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
+  rray = derive2 { name="rray"; version="0.1.0"; sha256="0x4wavvjsiy8b9bhgxddisx82k6q52qhngr2am50bf38d3x2n58h"; depends=[glue Rcpp rlang vctrs xtensor]; };
   rrcov = derive2 { name="rrcov"; version="1.4-7"; sha256="14zjyqcdiqx6js99nx5s8hmyx564ixy2d8s6i7wa50xmx368rl6b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
   rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; };
   rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; };
   rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; };
-  rrd = derive2 { name="rrd"; version="0.2.1"; sha256="1n4590h3xzja7j8fzay4b8rp98wnilg2znnkbw4ffk9fdac2wr5l"; depends=[assertthat tibble]; };
+  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=[]; };
   rredlist = derive2 { name="rredlist"; version="0.5.0"; sha256="12dqilcwyxad5yjz8gh29ycwj2rbm1g0hxfsqkl7zsjaz5lbcka0"; depends=[crul jsonlite]; };
@@ -12260,11 +12445,11 @@ in with self; {
   rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; };
   rsMove = derive2 { name="rsMove"; version="0.2.7"; sha256="0an5kknfap7hrg62gvdvrylx79p6fjdmbryhzlrj60i8n7cnc1c1"; depends=[caret ggplot2 lubridate plyr pryr raster Rcpp RCurl sp]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
-  rsample = derive2 { name="rsample"; version="0.0.4"; sha256="0f10975j7gi4m6mq3i1g5j5khqi4ffr5aa8777mk9c9y55i1wrx8"; depends=[dplyr generics purrr rlang tibble tidyr]; };
+  rsample = derive2 { name="rsample"; version="0.0.5"; sha256="0lkwhydb8csg24zkpsblyykzfsjqr930h46kbpm2wk9kgygkfspd"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="3.2.13"; sha256="11mgdmz5gxh96a68v8k9m11x000y5nhmhqfpz8rcqr14knfikr2d"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="3.2.15"; sha256="1d1aiy07cgfnp51vpqfypypkfwzmvw3y81xi81i33p6ylk3mmzi8"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
-  rsconnect = derive2 { name="rsconnect"; version="0.8.13"; sha256="00bfkg8qndyicc2xin2mjk0g086gsi7vnnfxlc548fvd49ji885f"; depends=[jsonlite openssl packrat RCurl rstudioapi yaml]; };
+  rsconnect = derive2 { name="rsconnect"; version="0.8.15"; sha256="018cdbcxlbvqpwzv0qxvvz8yhl0d6gcavpbk1m5fyrgpvys1brri"; depends=[curl jsonlite openssl packrat rstudioapi yaml]; };
   rscopus = derive2 { name="rscopus"; version="0.6.3"; sha256="1fplb7wmzp78a1xi9b4bw6xis16gixhvl227yfhip650ib4srpv1"; depends=[dplyr httr plyr tidyr]; };
   rscorecard = derive2 { name="rscorecard"; version="0.12.0"; sha256="112gcziyg8cpdw5aiyzc8473sqp8nr9q1ih4hh68hpvmxk8b407p"; depends=[dplyr httr jsonlite lazyeval magrittr tidyselect]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
@@ -12274,9 +12459,10 @@ in with self; {
   rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
   rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
-  rsimsum = derive2 { name="rsimsum"; version="0.5.2"; sha256="1fcg6g3dr774pbklzgsd8bnwbqgmnxpaz5dmlmxqhaqzzrm633vc"; depends=[checkmate ggplot2 ggridges rlang]; };
+  rsimsum = derive2 { name="rsimsum"; version="0.6.0"; sha256="0awb07dqi8cb6pqh81nw522aqrx29v981vpv62281nak9s4bjryg"; depends=[checkmate ggplot2 ggridges rlang scales]; };
   rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; };
   rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; };
+  rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; };
   rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; };
   rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; };
@@ -12285,27 +12471,26 @@ in with self; {
   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]; };
-  rsparse = derive2 { name="rsparse"; version="0.3.3.1"; sha256="14i3bmyp6s72zy298r2y6wl2lh9dn11fcy8gisvd9ds45nf1cj2j"; depends=[data_table float lgr Matrix mlapi Rcpp RcppArmadillo RhpcBLASctl]; };
+  rsparse = derive2 { name="rsparse"; version="0.3.3.3"; sha256="0kdgyn9qcmblwqmz8c0hwcysvz38bjf98b6sj9qsg83kq7prj8zg"; depends=[data_table float lgr Matrix mlapi Rcpp RcppArmadillo RhpcBLASctl]; };
   rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; };
   rsq = derive2 { name="rsq"; version="1.1"; sha256="0pvnyf875jybid16mg1y3dmnlrk1vahckhr5zaai1a0k4i6mh4jf"; depends=[MASS]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
-  rstan = derive2 { name="rstan"; version="2.18.2"; sha256="1zvh5qlxkwi947nqmlhazr7jwii68fpxnkcsr38s3m8havcxlxad"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; };
+  rstan = derive2 { name="rstan"; version="2.19.2"; sha256="1nh8sm97ck1fwmqj5ia70p5w8alcagx7y2956a3n5k97qfwwxr1i"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; };
   rstanarm = derive2 { name="rstanarm"; version="2.18.2"; sha256="0jflfj7g1rx0zhq0kbi1b1zwad1m7lhbvymz43g5c9cx3hh4gi68"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
   rstanemax = derive2 { name="rstanemax"; version="0.1.0"; sha256="0xwacxaj99qz4i2npgpiq4jggx73q53il3jm4qlhmpapbwrkbl5f"; depends=[BH dplyr ggplot2 magrittr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; };
   rstantools = derive2 { name="rstantools"; version="1.5.1"; sha256="11dlrz3mj1j9qigh2qff0ixdcfds4ppxd37112yq8bn16b0idasw"; depends=[]; };
   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.1.1"; sha256="1a39f4haxvzw06kbl5qxnnhzh4nqri0w66c4jxdp7g3plp67hn09"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; };
+  rstatix = derive2 { name="rstatix"; version="0.1.2"; sha256="0jww4div56b57bnf7pxkhnhgrdbyf6wfbxlbd74bl974vdg0dxv3"; 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.4.5"; sha256="0xdvv27cf3b45ahvlzbn8n0kmj4kyc7sl52xjr71757ymf154q3g"; depends=[bbmle fastGHQuad mgcv Rcpp RcppArmadillo survival]; };
   rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; };
   rstudioapi = derive2 { name="rstudioapi"; version="0.10"; sha256="15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0"; depends=[]; };
   rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
-  rsunlight = derive2 { name="rsunlight"; version="0.7.0"; sha256="0v2wrgq8fxvkf8sf4z4wi4bbvbskw5wzcplns9imwfmm3y2pabyi"; depends=[crul data_table jsonlite plyr stringr tibble]; };
   rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; };
   rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; };
-  rsvd = derive2 { name="rsvd"; version="1.0.1"; sha256="1faskhf5j2bj9f971qljsmh182g3rnyilj1wwijz530a6skxidzz"; depends=[Matrix]; };
+  rsvd = derive2 { name="rsvd"; version="1.0.2"; sha256="0fia77y5fxnhwkcxlgp98ygb8fdfraky75x80hkf7kvvpwc5rzn8"; depends=[Matrix]; };
   rsvg = derive2 { name="rsvg"; version="1.3"; sha256="11mccgf6hfskg45wqc114sx3qy2r494y6axdf73z6xwhs1wpm97g"; depends=[]; };
   rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; };
   rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; };
@@ -12316,11 +12501,10 @@ in with self; {
   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.8"; sha256="13nhvzgcv6lpnz2xr253q3wm0whmn9n0k4avm8kj43ha9qljalzp"; depends=[knitr rmarkdown tinytex xfun yaml]; };
+  rticles = derive2 { name="rticles"; version="0.9"; sha256="19kp0fk2skdnsk6vmgf5p9m9c2lf112kir1kpw33hmzyn8cf1fjv"; 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.6"; sha256="09p4rki1z6zy79z9hb8pajglznnklr4hg7fcyrdxnqs1sjbw1iwy"; depends=[pixmap]; };
-  rtika = derive2 { name="rtika"; version="1.21"; sha256="042kg26pkcsl5n4x9bk0gmgi52f3wcnz9d8kkj8191qayaby8f71"; depends=[curl digest rappdirs sys]; };
-  rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; };
+  rtika = derive2 { name="rtika"; version="1.22"; sha256="1vlv2v7s7p6plahph1wvki68ssyqq8l49brj3pp3r0cnz082askl"; 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]; };
@@ -12363,7 +12547,8 @@ in with self; {
   rvg = derive2 { name="rvg"; version="0.2.1"; sha256="0j61qlswrivz4a4jx8laprcyfzm867x3qibr65vd0fyvf7m6dl8p"; 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.3.1.1.0"; sha256="1405fc7svxm62isjb2k3f8ppb1q9dbnwbclnf17laimwrqlvg0m9"; depends=[assertthat BH cctools kde1d lattice Rcpp RcppEigen RcppThread wdm]; };
+  rvinecopulib = derive2 { name="rvinecopulib"; version="0.3.2.1.1"; sha256="093iy7jy7iair3qiqifmbml420bkyzyj8xd09vyffwnw1q3cri1d"; depends=[assertthat BH cctools 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.4.0"; sha256="01ia1wkmbigly45kyc1ydrah0yzxlymsnj3vy6wf8ck24lv51dif"; depends=[dplyr 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]; };
@@ -12377,7 +12562,7 @@ in with self; {
   rwunderground = derive2 { name="rwunderground"; version="0.1.8"; sha256="02p26gkicd5v511kb04p1h3wxj57r7j5vr97n3ibywc6ivz7nqxa"; depends=[countrycode dplyr httr lubridate tibble]; };
   rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; };
   rxylib = derive2 { name="rxylib"; version="0.2.4"; sha256="0va7kw40nycjn8gh9blzpbph4z319r5a16yim8lwx3hi6rs9myhr"; depends=[BH Rcpp]; };
-  ryandexdirect = derive2 { name="ryandexdirect"; version="3.1.6"; sha256="0g7xslhrfjhmw51f0qs5mqflm0fkwgdz9cjsg6f9qrlzlw7zhhsr"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; };
+  ryandexdirect = derive2 { name="ryandexdirect"; version="3.2.0"; sha256="0mzdxkbndyjqn0hx2hchcfnpfj2n2fc1gfgfgrj66r3cdvxsazsy"; depends=[bitops data_table dplyr httr jsonlite magrittr readr xml2]; };
   rym = derive2 { name="rym"; version="0.5.2"; sha256="1j69fmc0wgj8w5y68ix13kh3rsc4blmyc9hsmp41crgr10mi3nvi"; 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]; };
@@ -12399,13 +12584,13 @@ in with self; {
   sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; };
   sValues = derive2 { name="sValues"; version="0.1.6"; sha256="0830f4w6jgpiysk0vz0bxaxwa8m3k94fgj9l3qb42r3jjf9cdn29"; depends=[ggplot2 reshape2]; };
   saasCNV = derive2 { name="saasCNV"; version="0.3.4"; sha256="12h5vrl55sb4wmx0hzib5iax8p0q2qzk19h15r0asfkh9l7qz94l"; depends=[DNAcopy RANN]; };
-  sabre = derive2 { name="sabre"; version="0.2.1"; sha256="0zfw3mb21p48xjjwvz7p5q5ckh1sk17rymkkhln97jjfy5q1zwz8"; depends=[dplyr entropy rlang sf tibble tidyr]; };
+  sabre = derive2 { name="sabre"; version="0.3.1"; sha256="0yqw126yr7syjdwq780b395b9qwncqr86vjkmwcvs2w6v1j3nppi"; depends=[dplyr entropy raster rlang sf tibble tidyr]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
   sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; };
   sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; };
   sae = derive2 { name="sae"; version="1.2"; sha256="1fai9lkyyssnkkdrjrrx7vzj88nglmd4bkzan3hdhrc49abclp59"; depends=[lme4 MASS]; };
-  sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
+  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=[]; };
@@ -12427,9 +12612,10 @@ in with self; {
   sampling = derive2 { name="sampling"; version="2.8"; sha256="06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m"; depends=[lpSolve MASS]; };
   samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; };
   samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
-  samplingVarEst = derive2 { name="samplingVarEst"; version="1.3"; sha256="031iwgiw7dcncw1smxidn3kyvl0n06j5ag4pbhnicfqpj0pnx3l3"; depends=[]; };
+  samplingVarEst = derive2 { name="samplingVarEst"; version="1.4"; sha256="0gzz0qz67h3vpdsi5g1w7fkyacj8789qxmj353q7pd0jm20q60l1"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="3.0"; sha256="01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15"; depends=[GSA impute matrixStats openxlsx shiny shinyFiles]; };
+  samurais = derive2 { name="samurais"; version="0.1.0"; sha256="0s00hd3ax4r662n8iqmd9i56sgyjxbgc59la7qvh3jwcnzcvmgz9"; depends=[MASS Rcpp RcppArmadillo]; };
   sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; };
   sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
@@ -12441,10 +12627,9 @@ in with self; {
   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]; };
   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.1.2"; sha256="0grc3mkcfdbzcppwziphssshjhy89wqwd5gzsj6mv15dix54wjca"; depends=[cli crayon dplyr nortest numDeriv]; };
+  sars = derive2 { name="sars"; version="1.2.0"; sha256="03pqdnfchin541fb5awb5i5xl8ryh382wh898hxgxi05qaz1cv07"; 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.1"; sha256="15wib808y7xszrn2nvmsrjxy7ralqh5w7nz0qq3sckv39j9ss4wv"; depends=[digest]; };
   satellite = derive2 { name="satellite"; version="1.0.1"; sha256="1g8zzlsdvb56l2jph7i5wjgbpyx5dkwa3nv8mzmg0qyh3zd9pyi0"; 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]; };
@@ -12479,7 +12664,7 @@ in with self; {
   scatterD3 = derive2 { name="scatterD3"; version="0.9"; sha256="0miadn406viqzw1sc27fl3xb1l0vvachrfiv72jl9r7qgk2ga5jv"; depends=[digest ellipse htmlwidgets]; };
   scatterpie = derive2 { name="scatterpie"; version="0.1.2"; sha256="0r3m3781jvzxr0ry7rhd085c0xl5620sf5zcq9nnfl613imwxj2b"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; };
   scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; };
-  scbursts = derive2 { name="scbursts"; version="1.4"; sha256="0kdzgkc9gbbxi9pjw13d54pz6bxckdkgi56rgrgcl97ykzii3jxq"; depends=[readxl tibble]; };
+  scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; };
   scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; };
   scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; };
   scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; };
@@ -12501,7 +12686,7 @@ in with self; {
   scoper = derive2 { name="scoper"; version="0.1.0"; sha256="1a170x1h2wglsmqp0fjga2q29yfnfdbgjcm62412n575j9d4xp5n"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval shazam stringi]; };
   scopr = derive2 { name="scopr"; version="0.3.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.4"; sha256="0vc8484d3d933kddg37hbql5l6h7kpfl6iqi4irwy1vq63xf2126"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; };
+  scorecard = derive2 { name="scorecard"; version="0.2.5"; sha256="1amy5qbc7xcqa46rk9dbcvkpsndvjv7hm2vl9lvylv44xg98sb8a"; 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]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; };
@@ -12525,8 +12710,9 @@ in with self; {
   sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; };
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; };
-  sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18"; sha256="0bgrgs3v5jfhpy9y3fv06nydn3fkj8bxpc8h78igr1qjxbx3lc5n"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; };
+  sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.1"; sha256="0k7kks4kg62pk00zs7y5gbikaz2fpgkldw9p5jzhghdlkykz03xw"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; };
   sdcMicro = derive2 { name="sdcMicro"; version="5.4.0"; sha256="0qh9rcjg5pbq2lnymjzf5xh3h22f0j30xmq5hqsk9lkhr863mbn6"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
+  sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; };
   sdcTable = derive2 { name="sdcTable"; version="0.28"; sha256="1r15gz107mm2s3bnbxbrn2py80ran0753qcbqlgy61kr9dwbhh5x"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
@@ -12536,7 +12722,7 @@ in with self; {
   sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.4.1"; sha256="0z0wqc4hcmxqbavj9zma9j3dkg978l8dxcbyh9mlsbpfi4d1zph8"; depends=[]; };
-  sdols = derive2 { name="sdols"; version="1.7"; sha256="18c9y80pvhcqfl5ppfsfdhiygzx073xrzm1zzj08wn4r6snw04sh"; depends=[commonsMath rscala]; };
+  sdols = derive2 { name="sdols"; version="1.7.5"; sha256="0pdd63pm56prvy7b3bagpnc5ri6n0xj7p0jkndyfzj9cvgwbhb0f"; depends=[commonsMath rscala]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; };
   sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
@@ -12546,7 +12732,7 @@ in with self; {
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
-  searcher = derive2 { name="searcher"; version="0.0.3"; sha256="004k757hn5y80k7kim3049n3mjrsimqpzdz5fis2ggxbdwwf1bs1"; depends=[]; };
+  searcher = derive2 { name="searcher"; version="0.0.4"; sha256="0xxawwa95vfcbq8gg61ylnsg1qg6q1ng9iq4r1a1ai9440p5mvh3"; depends=[]; };
   seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; };
   season = derive2 { name="season"; version="0.3.8"; sha256="0kw3gvy7rv0rms0zj1rvqlfdn3yxr9r9ldm21zl2xrpx9cy04d2d"; depends=[ggplot2 MASS survival]; };
   seasonal = derive2 { name="seasonal"; version="1.7.0"; sha256="1mna8w1haj5h2rhiw7jkhprr6cc9qr0n8x73d10v0l732kx41n31"; depends=[x13binary]; };
@@ -12560,13 +12746,14 @@ in with self; {
   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.0"; sha256="117xmhclv219ci8vki8ni8yqvlnwgj0pd8n0r752wd8333y130wr"; depends=[Rcpp]; };
-  see = derive2 { name="see"; version="0.2.0"; sha256="0bwdq3zvj53qmacmwy4ffbqyngjziql4arb009ns4himhndkjyj9"; depends=[bayestestR dplyr ggplot2 ggridges gridExtra insight magrittr rlang scales]; };
+  see = derive2 { name="see"; version="0.2.1"; sha256="0c4hw3x30zip8rp04knw07b3cvczfkpx7zi7m6n411d5bl90xiij"; depends=[bayestestR dplyr ggplot2 ggridges gridExtra insight magrittr 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.3"; sha256="0mi5pqgf0x3lfhdhqmjrp04rb4c0vffi068kdalvywjkkprnqygi"; depends=[tuneR]; };
+  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]; };
   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]; };
@@ -12598,6 +12785,7 @@ in with self; {
   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="0.7.0"; sha256="1zf3qyqvlk8f7a5q39980cyci8smn2z326qlp275qs23yawnch9c"; 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]; };
   semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; };
@@ -12622,7 +12810,7 @@ in with self; {
   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.5.6"; sha256="073xhygj833a8k249kw5sbg7jmmcs9k4fsva88say5xhkbq62yqr"; 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.3"; sha256="1v4rr7v1hsrn15r4cbqd6ym9j9aiwnkmcix585fj3d4vfy1jklh5"; depends=[dplyr rlang tidyr wrapr]; };
+  seplyr = derive2 { name="seplyr"; version="0.8.4"; sha256="18z3nfxghzzcn23ilgsimbxz8mqi3q45i7b3ihdmkllc3ln1f0vk"; 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.13"; sha256="1kg0vjwbmapvrwh0cn2rfzsbkp8f2l0hlaw4qd5hxjij177h0whx"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
@@ -12639,7 +12827,7 @@ in with self; {
   sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; };
   serial = derive2 { name="serial"; version="2.1.4"; sha256="1wvs3aa9h1dff2jrxszqwrfv2b281zap1dj2mhlx2w4k8hnggas0"; depends=[]; };
   seriation = derive2 { name="seriation"; version="1.2-7"; sha256="0dbz5b5msy4fr2whhphyriqk1xc6305zpjq59rrwxyz3d7rzwpa6"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
-  serieslcb = derive2 { name="serieslcb"; version="0.3.0"; sha256="07z1ihdi1ng865fkg2mm593d6hl25nxaqfna5pwdppqvgx6hajqy"; depends=[gplots shiny]; };
+  serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; };
   seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; };
   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]; };
@@ -12652,7 +12840,7 @@ in with self; {
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.7-4"; sha256="0vnyr7xyfcl928kbrb1k8l4fkd0cjrfq486g6gxpvy5j0cc2h4i1"; depends=[classInt DBI magrittr Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.7-7"; sha256="192hw52x1qlif8zyai1kff1wiyr3yl5f7jj1rk3k0nr8das0qy6i"; depends=[classInt DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
@@ -12662,39 +12850,41 @@ in with self; {
   sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; };
   sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; };
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
+  sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; };
   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]; };
-  sglg = derive2 { name="sglg"; version="0.1.4"; sha256="1s7ygvlbal8iakhl7mkdnk0x914vvq53lnvjg5sy61zmh0gqwdj1"; depends=[AdequacyModel Formula robustloggamma ssym survival]; };
+  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.4"; sha256="1bivg3rw5c98355z4d596pwf4ciibbrmr3ay2ixj16dqd7g23j94"; depends=[reticulate tensorflow]; };
   sgmodel = derive2 { name="sgmodel"; version="0.1.0"; sha256="03s9z7n7w3pys5dp1z5x91bszgv3q1sax5z591dz9rvmn5glp2lj"; depends=[ggplot2 ramify Rtauchen tidyverse]; };
   sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
-  shades = derive2 { name="shades"; version="1.3.1"; sha256="0v0xp9l1zyq4iysmkrbdwk4r1rksjj8p5c1726yrcgyg55mj59nv"; depends=[]; };
+  shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; };
   shadow = derive2 { name="shadow"; version="0.6.1"; sha256="1jlbjx2wcl3rdvidkp8cg33br9z87bic98s8dr74768cgc36hg4k"; depends=[plyr raster rgeos sp]; };
   shadowtext = derive2 { name="shadowtext"; version="0.0.5"; sha256="1hnkn2pfbsz2ziymx4da34mqxsxa4av9f5ig2q9543227amxb0sk"; depends=[ggplot2 scales]; };
-  shallot = derive2 { name="shallot"; version="0.4.5"; sha256="0r1zxpqqdfck7a9f868f9knr1ccnv8kf006milafjci57pvim1fg"; depends=[commonsMath rscala sdols]; };
+  shallot = derive2 { name="shallot"; version="0.4.6"; sha256="0p8rbkjizgl9fvl480s53rcc5kwifirlghf5616rb295c512l4vk"; depends=[rscala sdols]; };
   shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; };
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive2 { name="shapes"; version="1.2.4"; sha256="1zqykhx8rz1k2ahi2lmmzll1c8k0as6vw4gbd3rpfb5fvpni3ni0"; depends=[MASS minpack_lm rgl scatterplot3d]; };
-  shapper = derive2 { name="shapper"; version="0.1.0"; sha256="04ncsq29fbiki1s83gh2gla1a7qb8kh0gp5267in3fhh62297xwp"; depends=[ggplot2 reticulate]; };
-  shar = derive2 { name="shar"; version="0.4"; sha256="0gjm8n3ifjnhzx21fhcg69dmy18wdq0kl1vh6s3jsjp4xkfill0i"; depends=[classInt raster Rcpp spatstat]; };
+  shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; };
+  shar = derive2 { name="shar"; version="0.5"; sha256="1vscs19ca5m8hiq280gra7cwwwk6yf4nlab02fd7czvxv6zhlyy1"; depends=[classInt raster Rcpp spatstat]; };
+  sharpData = derive2 { name="sharpData"; version="1.1"; sha256="05gvbf2j3mfrinl4rr8cjrglr6hbjf5xgzyjh2v7j76i1ckkpz4h"; depends=[KernSmooth]; };
   sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; };
   sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
-  shazam = derive2 { name="shazam"; version="0.1.11"; sha256="0j6b7cbfvqz0xdcbyfx0abfklnv7yvjaalx2l3863m81qn877d65"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
+  shazam = derive2 { name="shazam"; version="0.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]; };
   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.3.2"; sha256="0ky2w2f1lgak2q5a3ym44g0mlna7j8vw25g8yr2shv0rdjp53f18"; depends=[crayon digest htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; };
   shiny_i18n = derive2 { name="shiny.i18n"; version="0.1.0"; sha256="15llwr4yrx6rlk32b92wcq3dn360y5cvy4mh2aqkza9ikcvlhcvv"; depends=[jsonlite yaml]; };
   shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; };
   shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
-  shinyAce = derive2 { name="shinyAce"; version="0.3.3"; sha256="02q6wqw349nlyf3mbf18cxif1xv9cal5qzccrdlnv73szqn9jk7j"; depends=[jsonlite shiny]; };
+  shinyAce = derive2 { name="shinyAce"; version="0.4.0"; sha256="0hvih5g0pswlnz5rf3blx5yqw11ssxvm8w4klxddp1ap20ncbgl1"; depends=[jsonlite shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
   shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; };
@@ -12704,8 +12894,9 @@ in with self; {
   shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; };
   shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; };
   shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; };
+  shinyML = derive2 { name="shinyML"; version="0.1.0"; sha256="17400crygl4zz7v6p8if4i3af3r1rz3sjc7281z6cyl82ba7a0wl"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; };
   shinyMatrix = derive2 { name="shinyMatrix"; version="0.1.0"; sha256="14933x96cchkbdy0pw555vva7d83z5qyyjxxpz3gm6qwiipr9r3q"; depends=[jsonlite shiny]; };
-  shinyMolBio = derive2 { name="shinyMolBio"; version="0.1"; sha256="11plarwjap8853aq7dk8m3x1jv9mw95vwvci208f6s7dvc1448pv"; depends=[checkmate dplyr lazyeval plotly purrr RColorBrewer RDML shiny stringr whisker]; };
+  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]; };
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="1.0.0"; sha256="16gv01fbvnrn64kxf9kmard2cjjd99n3s37b1hp90ziqw479sgz4"; depends=[htmltools shiny]; };
@@ -12720,11 +12911,12 @@ in with self; {
   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]; };
+  shinyglide = derive2 { name="shinyglide"; version="0.1.1"; sha256="1jl48s4pl0f69j3gg9y1zpxnx0l4p6f4czjr27g6cs9y780z3r96"; depends=[htmltools shiny]; };
   shinyhelper = derive2 { name="shinyhelper"; version="0.3.1"; sha256="1z3wb3vdpz9pcn6rfmpbxky05cf8bxldhpwzldrmhn03spz3n987"; 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]; };
-  shinylogs = derive2 { name="shinylogs"; version="0.1.5"; sha256="0989d78q9dbpl95v08hxlgm21yh5c15aazdxhyv9db8l42w4cvvy"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; };
+  shinylogs = derive2 { name="shinylogs"; version="0.1.6"; sha256="0lk69snnazns2883szw0ihlyr6gdihqs28fj92qm9vdn6awjxy9d"; 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]; };
   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]; };
@@ -12734,19 +12926,18 @@ in with self; {
   shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; };
   shipunov = derive2 { name="shipunov"; version="1.2"; sha256="020xfdq5k6fw0nisskh7lysj5xrmf4b7n7vajwr6273hx6m08bbi"; depends=[]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
-  shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
-  shotGroups = derive2 { name="shotGroups"; version="0.7.4"; sha256="1x2ar8ybb972nd146gqz57hxybxc1myx862wbb743rpa70c7iawc"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
+  shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; };
+  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]; };
   showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; };
   shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
-  shrinkTVP = derive2 { name="shrinkTVP"; version="1.0.0"; sha256="09bcpzclb41hslkcx8j7gnmny2gz6gvxvjxpsclk9b7raqvwsg8z"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol]; };
+  shrinkTVP = derive2 { name="shrinkTVP"; version="1.0.1"; sha256="1nf6lpl38jyrd4mnfx2gk4wfpccw2mjy9ajlsy0rwnd9dk81wx4n"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol]; };
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
   shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; };
   shutterstock = derive2 { name="shutterstock"; version="0.1.0"; sha256="1vqbrjbwl2gdcf607f51cdzkjbkmk11n08mzx01j7bwcd278ny8r"; depends=[httr jsonlite]; };
   siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
-  sicegar = derive2 { name="sicegar"; version="0.2.2"; sha256="0fnr0wv8zbhs2i5y1kqyvhm0kzisc68ys3iy0wxwbdj3bnfgzj70"; depends=[dplyr fBasics ggplot2 minpack_lm]; };
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
   sidier = derive2 { name="sidier"; version="4.0.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]; };
@@ -12764,10 +12955,11 @@ in with self; {
   signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   sigora = derive2 { name="sigora"; version="3.0.1"; sha256="1pz9jibxjvvbc0wmd7sj2fss6hd8h1fvcg8vg72qwqvfy3f9jdry"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="1.0.5"; sha256="0i7nah32x0llbkkfcdv355507vc8w0dw3kl2hz37xj3fxcpz9218"; depends=[wrapr]; };
+  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]; };
   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]; };
+  simExam = derive2 { name="simExam"; version="1.0.0"; sha256="10p3y67cli5is2gj23cjy8y7zpbnn2jbxmfiq01ls0hc1jind82w"; depends=[Matrix msm]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
   simIReff = derive2 { name="simIReff"; version="1.0"; sha256="0yi43splda8chnh4bq5x6chbrl5c0y9sv1k2m31763da0czayall"; depends=[bde extraDistr ks MASS np rvinecopulib truncnorm]; };
   simLife = derive2 { name="simLife"; version="0.5.2"; sha256="1dhrjszfgxr0j4dkc2bwykyj515ji5rkb572nmnyjgkyi652j01v"; depends=[splancs]; };
@@ -12775,7 +12967,7 @@ in with self; {
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
   simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
   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.1.1"; sha256="10dsr1rbglv5kwm5q05dxv4396wxwzhlf0851ynndlcbyxl8rvc0"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
+  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]; };
   simTool = derive2 { name="simTool"; version="1.1.3"; sha256="1vjl2hf6nw108vidbrc6hxsl6qdkr56ahldavx2s9klkqg2kmhwr"; depends=[dplyr plyr purrr reshape tibble tidyr]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
@@ -12783,17 +12975,17 @@ in with self; {
   simcausal = derive2 { name="simcausal"; version="0.5.5"; sha256="0k1dbg10bmpxc37nq9vk849qsdi09whc8r85rj08pbcfaac8cgfv"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
   simcdm = derive2 { name="simcdm"; version="0.1.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; };
   simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; };
-  simdistr = derive2 { name="simdistr"; version="1.0.0"; sha256="0r7qfrq4vcjqrzajc6xmn0rrkinqwbr8cqghgp4iklbhsjbk2xfl"; depends=[]; };
-  simecol = derive2 { name="simecol"; version="0.8-12"; sha256="06zw9xhj8jwhmqwxxbj8hgz9cxrw1b4syy6z79aawv9cg1bnwfhf"; depends=[deSolve minqa]; };
+  simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; };
+  simecol = derive2 { name="simecol"; version="0.8-13"; sha256="0641qh5ih1mkbdr0a5qg9i280qkzdvdjyzw56awlv66zqbjqvqq8"; depends=[deSolve minqa]; };
   simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; };
-  simex = derive2 { name="simex"; version="1.7"; sha256="0dmyxhg3bk23y08xbgwlg791pcl3131im3jkh9x5pjqczfjvim0a"; depends=[]; };
+  simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; };
   simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; };
-  simmer = derive2 { name="simmer"; version="4.2.2"; sha256="0anzg70cqaixd32j14ry028hxhkazzj6k3pb9v9j2jpd4wlizdyp"; depends=[BH codetools magrittr R6 Rcpp]; };
+  simmer = derive2 { name="simmer"; version="4.3.0"; sha256="1j7mpgi0sicc673rma3h40n651bdy03dmyjvs7ry8y7d10lj01ls"; 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]; };
-  simmr = derive2 { name="simmr"; version="0.4.0"; sha256="0i5gzzd5wwxjq1dblmrsv20c0hy1px43lpv8qf5zapnmzjwx07an"; depends=[bayesplot boot coda compositions ggplot2 MASS R2jags reshape2 viridis]; };
+  simmr = derive2 { name="simmr"; version="0.4.1"; sha256="0903fh8vhl7r9cspanzkrn23kq68dkxhn01bjhyhf3c8wc9zfdy5"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; };
   simode = derive2 { name="simode"; version="1.1.4"; sha256="04ld7mf2xi3s7jrcs1w9wqbbnrjjb0kbzn8bn58ma2kxxb4cygq0"; depends=[deSolve pracma quadprog]; };
   simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; };
   simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; };
@@ -12812,6 +13004,7 @@ in with self; {
   simstudy = derive2 { name="simstudy"; version="0.1.13"; sha256="06lf8srcz5i5glz09sjg61v1a5blr6iv1s4v24syl28pf6f627i8"; depends=[data_table mvnfast mvtnorm Rcpp]; };
   simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; };
   simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; };
+  simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; };
   simukde = derive2 { name="simukde"; version="1.1.0"; sha256="0g4qb57q1g9ixl70zwiw8y934gcr421xmz4dl515lxzfzk0605fc"; depends=[ks MASS mvtnorm]; };
   simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; };
   simule = derive2 { name="simule"; version="1.3.0"; sha256="0jzyk1r2jfs7qivmy9x44c5bagy55jpy3hf0xpl9xnk409c3y2wd"; depends=[igraph lpSolve pcaPP]; };
@@ -12819,20 +13012,21 @@ in with self; {
   sindyr = derive2 { name="sindyr"; version="0.2.1"; sha256="0977qb9f2247y6bzlsp9lqfbmncq2prqr57myrgd6f60jc09n3mj"; depends=[arrangements crqa igraph matrixStats pracma]; };
   sinew = derive2 { name="sinew"; version="0.3.8"; sha256="1ggx7wgmgnsv69nnc55mg9g7rzjv5m23sygz7x8q68pybmjr7fc1"; depends=[cli crayon miniUI rematch2 rstudioapi shiny sos stringi yaml]; };
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
+  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.5-53"; sha256="1wcc0p2d0d1x6fp9kqr3khsfdz1jqff87rff580nvyf6pfzwqfrd"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; };
+  sirt = derive2 { name="sirt"; version="3.6-21"; sha256="0khjjps3q1gdanszmgzi30yrk5qcwi2fxf8jq71raj77hfvgd2s8"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
-  sismonr = derive2 { name="sismonr"; version="1.1.2"; sha256="0ak5j4myr2jxb5k0vg7rqp938dmlkkxpbs266m1bapnm72w8wsri"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; };
+  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]; };
   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-6"; sha256="0plarfxa1gxggq88z1w2sbw6ixk49fz6i1zvdcbaa0va0ifc1gcm"; depends=[data_table lattice latticeExtra]; };
-  sitreeE = derive2 { name="sitreeE"; version="0.0-3"; sha256="1rj2gr9qyhd366iy7d4p1y42rcy6swhykdh33ynawdsggmmvmxbf"; depends=[data_table sitree]; };
+  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.0.0"; sha256="05dw4hgpw5msgy5cabf5dixr6ma66i9wz9wlajihqkpbg134jz1k"; depends=[MASS matrixStats mcmc MCMCpack]; };
-  sjPlot = derive2 { name="sjPlot"; version="2.6.3"; sha256="0h1mkmp5mrkbf7y3zh6m4cnm737cpg1m5si0lrmal7j2ixqicwjy"; depends=[bayestestR broom dplyr forcats ggeffects ggplot2 glmmTMB insight knitr lme4 magrittr MASS modelr nlme performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; };
+  sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; };
+  sjPlot = derive2 { name="sjPlot"; version="2.7.0"; sha256="1m0gy991fmxvqry91kkzdkdapyalhrwql25d0hg2a2naxgfw4zpk"; depends=[bayestestR broom dplyr forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr nlme 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.0"; sha256="0rnmlwpp41h04dzfjd5ncvzjzs43slaimb4v2in1axznv3haafyc"; depends=[haven insight magrittr purrr rlang tidyselect]; };
   sjmisc = derive2 { name="sjmisc"; version="2.8.1"; sha256="1a30n3cyd9h9ilaiai9ywy53f03nikafc47rvpws2c2vghc8mbn7"; depends=[dplyr insight magrittr purrr rlang sjlabelled]; };
@@ -12855,12 +13049,13 @@ in with self; {
   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]; };
   sleepwalk = derive2 { name="sleepwalk"; version="0.1.0"; sha256="1vfvpxzq16dmh6qrh7kwbndyfnr209frdz5hck3ry4gfz9rqzm5f"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; };
-  slfm = derive2 { name="slfm"; version="0.2.3"; sha256="04prsliiqbv5qx2lp9wf1h5hdjj6s6iaqpli7lpf74sfzxw773vw"; depends=[coda lattice Rcpp RcppArmadillo]; };
+  slfm = derive2 { name="slfm"; version="1.0.0"; sha256="1q4hm1lp498fqcnwr59agg08l1rh5gd8jqrjgkk4mh89zp3x5vaw"; depends=[coda lattice Rcpp RcppArmadillo]; };
   slickR = derive2 { name="slickR"; version="0.2.4"; sha256="14y4rwa450xqw6prdgp2l7xs9vv6zqbxwg7hc3hjgq47jy8qsdm1"; depends=[base64enc htmltools htmlwidgets xml2]; };
   slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; };
   slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; };
   slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; };
   slippymath = derive2 { name="slippymath"; version="0.3.1"; sha256="0dqnv089mcfxvpsc1px7mblim6m77n59xpcysz75jrvpc5q4lsrg"; depends=[png purrr raster]; };
+  slm = derive2 { name="slm"; version="1.0.0"; sha256="06r04kamg9y491q9wl4cvnvl301y7a47l70sl25vzi2q7y3bcf8y"; depends=[capushe ltsa]; };
   sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; };
   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]; };
@@ -12885,13 +13080,13 @@ in with self; {
   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="0.4.5"; sha256="1455fjfihznzivz80jad7pyfjms8yyvmsz6wqdvqv3n6dsyr8fvb"; depends=[fields maps matrixStats smacpod sp SpatialTools spdep]; };
+  smerc = derive2 { name="smerc"; version="1.0.1"; sha256="0gxqz5v33w428sqalhzx7nrjjkn3sqpx3jk5a7i9g0786m3y9azj"; 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]; };
-  smooth = derive2 { name="smooth"; version="2.5.1"; sha256="1vrdkvr7svf6scknh5v2n0y401d0gf7s1ii8rwfs3bhcp3gxpbfw"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="2.5.2"; sha256="08ifnvldjcpnwpmkkg9r6dr2p8k1i1jihjz1g3qdb34axf08jql1"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; };
   smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; };
@@ -12909,6 +13104,7 @@ in with self; {
   smurf = derive2 { name="smurf"; version="1.0.1"; sha256="1jp0dziqpiffj08kkm28bg4jzsijs30xlz237q8xdxdrf64igvik"; 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]; };
+  snahelper = derive2 { name="snahelper"; version="0.3.0"; sha256="036pwzs4x1qgb4bsn39afv1c34fxky259vl0zbac6l12wmysnpqv"; depends=[colourpicker DT 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=[]; };
@@ -12926,7 +13122,6 @@ in with self; {
   snowflakes = derive2 { name="snowflakes"; version="1.0.0"; sha256="0adna9jfs0wv4dhyjczxhq7c0ldjfai07p1q9119avxyilv9x0vi"; depends=[]; };
   snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
   snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; };
-  snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; };
   snpReady = derive2 { name="snpReady"; version="0.9.6"; sha256="1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr"; depends=[impute Matrix matrixcalc rgl stringr]; };
   snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
   snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
@@ -12934,8 +13129,10 @@ in with self; {
   sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; };
   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.3"; sha256="16z0ykbji9vh2j0d02x6vcrxwwqpzjckfxr1wjkvfc86mqpgpqmd"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
+  socialmixr = derive2 { name="socialmixr"; version="0.1.4"; sha256="0mwbdqbnqii80rgy6yk7q2b427wmqw7inciywrq7mbradqqyag48"; depends=[countrycode curl data_table httr jsonlite oai stringr wpp2015 XML]; };
+  sociome = derive2 { name="sociome"; version="1.0.2"; sha256="0nvzxxchcml8aprva4gn0hlqgik7y3dssl78mw11zbaacldlv99s"; depends=[dplyr magrittr mice psych purrr rlang stringr tibble 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]; };
   sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; };
@@ -12963,7 +13160,7 @@ in with self; {
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="3.9.3"; sha256="0ylwck1w1nw43f12gcfminx4b6sz6xwmywddbpi7lf44ickqm14m"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
+  sommer = derive2 { name="sommer"; version="4.0.1"; sha256="1yzi090kj9rqygsjwl80yzf6dlnll68gpnyp1wpp018f6lyg7xww"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
@@ -12980,12 +13177,13 @@ in with self; {
   sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; };
   sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; };
   soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; };
-  soundgen = derive2 { name="soundgen"; version="1.4.0"; sha256="1qaidf5acb78bjk4jak939d48cxm81hp2h393ks9x4wdqvwpyi3z"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
+  soundgen = derive2 { name="soundgen"; version="1.4.1"; sha256="13xq7ak4ggrqlpfb2c6xav1kpafvm3i9k1vk9vj28mcack870961"; depends=[dtw mvtnorm phonTools plyr reshape2 seewave shiny tuneR zoo]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; };
   sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; depends=[]; };
   sp = derive2 { name="sp"; version="1.3-1"; sha256="17xm1ig80p9wc860hm3bgishz6lj9fxgwqidj7rkbk4ap99qp62p"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
+  spANOVA = derive2 { name="spANOVA"; version="0.99.0"; sha256="09zzwgl6w3lwynh4b65c5hg9mgx6wn5miv48fj6fwgj9bz3kkb3y"; depends=[ape car devtools DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinythemes spatialreg spdep xtable]; };
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
   spBayes = derive2 { name="spBayes"; version="0.4-2"; sha256="0qmh8sdawhssr1jmx9dc56mxxwsgya8spsss88jgg0npvmpl5khb"; depends=[abind coda Formula magic Matrix]; };
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
@@ -13010,7 +13208,7 @@ in with self; {
   spacetime = derive2 { name="spacetime"; version="1.2-2"; sha256="0bgaarh2ibj3z6z504mzcb94x6w2bh5vyn1ar1lllqf4wn93z78y"; depends=[intervals lattice sp xts zoo]; };
   spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
   spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
-  spacyr = derive2 { name="spacyr"; version="1.0"; sha256="02vfcj4sr08xb6004h0gfsa3szshikhjxn1yahhxz8g04zhsi1g0"; depends=[data_table reticulate]; };
+  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.2-2"; sha256="024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi"; depends=[dotCall64]; };
@@ -13018,14 +13216,13 @@ in with self; {
   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.14.0"; sha256="0zz75i8z64w474s5c142rzdc5483xyxamx5gzcxaipqd7vqaracz"; depends=[abind complexplus foreach magrittr matrixcalc minpack_lm nnls plyr pracma readr signal smoother stringr svd tibble tkrplot]; };
-  sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; };
   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]; };
   sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; };
-  sparklyr = derive2 { name="sparklyr"; version="1.0.1"; sha256="1zq2qpg43hkp9j1hidjb15137qry0zqb43zd21invzl13n65x3qw"; 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.0.2"; sha256="06l1rjmmgxdg5ala6hzrbnx0swpn9qyv81i98ab8dpfw70lk1fhi"; 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]; };
@@ -13051,7 +13248,7 @@ in with self; {
   sparsepp = derive2 { name="sparsepp"; version="1.22"; sha256="0wa1585pkbn3y11apyim4z1ixn300c1yyv9bf2qldb6cjfiv7699"; depends=[]; };
   sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
   sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
-  sparsesvd = derive2 { name="sparsesvd"; version="0.1-4"; sha256="1yf373552wvdnd65r7hfcqa3v29dqn7jd4cn431mqd2acnqjrsam"; depends=[Matrix]; };
+  sparsesvd = derive2 { name="sparsesvd"; version="0.2"; sha256="1xm969fjq3fv1p2sqza2apz8picibj4s2agpwf1sx9nwn3b587qs"; depends=[Matrix]; };
   sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
   sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; };
   spartan = derive2 { name="spartan"; version="3.0.2"; sha256="040iq7y5fk93zcvbinnmlhj9l8w3bjq3yqcf7v715i77hx5d18bs"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
@@ -13062,7 +13259,7 @@ in with self; {
   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.1-1"; sha256="1sgc1a45wpx79h2y5i1k1qq7jqwf5a69lvl2sgaq4621f4l0b60b"; depends=[cluster EnvStats maptools MASS RANN raster RCurl readr rgeos rms SDMTools sf sp SpatialPack spatstat spdep yaImpute]; };
+  spatialEco = derive2 { name="spatialEco"; version="1.2-0"; sha256="110kzq8qhfjqqc2dcvy43a4m2q4a8vs2009kzhcnl1r8j843ibni"; depends=[cluster EnvStats 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]; };
   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]; };
@@ -13070,7 +13267,7 @@ in with self; {
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
   spatialreg = derive2 { name="spatialreg"; version="1.1-3"; sha256="1004rz4x34i0nmm46ac2vq7ddxp31cvbbdhd79jd49z4vzycs2bn"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; };
-  spatialrisk = derive2 { name="spatialrisk"; version="0.6.1"; sha256="00n7kzxyg42sxfaxj0gxrj8h5cfwpqfx8mfhg0h5x3qvjr9b0l3b"; depends=[classInt dplyr ggplot2 Rcpp RcppProgress sf tmap viridis]; };
+  spatialrisk = derive2 { name="spatialrisk"; version="0.6.2"; sha256="1n7akj7jhl6m3gqa51wi4cmbi3bblzrja3ss6ni664pargnkvd0q"; depends=[classInt dplyr ggplot2 Rcpp RcppProgress sf shiny tmap viridis]; };
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; };
   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]; };
@@ -13136,7 +13333,7 @@ in with self; {
   splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
   splashr = derive2 { name="splashr"; version="0.6.0"; sha256="0l57w5gwr0p2049z1201nlqsy23h37gsybd1lj3vycxz43ir7213"; depends=[curl dplyr formatR HARtools httr jsonlite lubridate magick openssl purrr scales stevedore stringi xml2]; };
   splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; };
-  splinetree = derive2 { name="splinetree"; version="0.1.1"; sha256="1cspjj7757p7na8kvd3p0vjixmhv8pnmkazqp2x1j1c7wwgp48zq"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; };
+  splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; };
   splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; };
   splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; };
   splithalf = derive2 { name="splithalf"; version="0.5.2"; sha256="16ydqj1mjsii18zllm5v24qw8na88sa3ml2s1b0xlc72fvy76646"; depends=[dplyr Rcpp robustbase tidyr]; };
@@ -13150,7 +13347,7 @@ 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.6.2"; sha256="0vhv5nnv9ihfr7phgqk8i2ld7hgndvwsn5q73k87xn4mdgclfv4k"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; };
+  spmoran = derive2 { name="spmoran"; version="0.1.7.1"; sha256="0nxg1xl3m4lkpxrkfcbnmf1x0gf43llz7095rj6i3flgmymirnxh"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
   spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; };
   spocc = derive2 { name="spocc"; version="0.9.0"; sha256="1azid8girmj4f0j4x9irljpxbsdpsxz572grb4fdjdxmlzpls7sy"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
@@ -13159,7 +13356,7 @@ in with self; {
   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]; };
   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.0"; sha256="1ziag07x7ibf405z7i9dji8g2ign2c9dmzx794svf2qzzahrds8q"; depends=[dplyr genius httr jsonlite lubridate purrr readr rvest stringr tibble tidyr]; };
+  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]; };
   sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
   spray = derive2 { name="spray"; version="1.0-6"; sha256="19j3fmgxwvni73xmldwaf6n8czxrwlhb9psl7iry0skw8vmdp4jy"; depends=[magic partitions Rcpp]; };
@@ -13175,7 +13372,7 @@ in with self; {
   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.0.0"; sha256="0bx3x4cddsr5r402cxi0321628ab7hjajgcv937ah4km3g2z9ihs"; depends=[crossdes deldir foreign Hmisc MASS rgeos sp]; };
   spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; };
-  sptemExp = derive2 { name="sptemExp"; version="0.1.3"; sha256="1j5c63mywv92c2zyqaa1rp22s5dmsj0as1f3q93455wjvvr42sz6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
+  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="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; };
   spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; };
   spup = derive2 { name="spup"; version="1.3-1"; sha256="0xq9z9iy3bwqhzq783qydgmczxvh7knkk9vdvwnbpbk0rbjgq3kn"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
@@ -13188,7 +13385,7 @@ in with self; {
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
   srm = derive2 { name="srm"; version="0.1-166"; sha256="1rqlvmynbcqp8j6jkyrimwkma0x1a4zw8vf0xx84q01qgqf0i8ar"; depends=[Rcpp RcppArmadillo]; };
   srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; };
-  srvyr = derive2 { name="srvyr"; version="0.3.4"; sha256="0xv7ix3a8jd28rrpyv1f54s6yf5avji0wbf598b4b3kvbp081mfp"; depends=[dplyr magrittr rlang survey tibble]; };
+  srvyr = derive2 { name="srvyr"; version="0.3.5"; sha256="0yy18jaja7w7q6lbc2ky2lranjr6j23s88nplrvvn5a28n72mkdp"; depends=[dplyr magrittr rlang survey tibble tidyselect]; };
   ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr 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]; };
@@ -13206,7 +13403,7 @@ in with self; {
   ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
   ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.1"; sha256="08gkmmn71qra34x00r1vl6zyfwz7bwkbsax09vkqi7a15k1c3dph"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
   ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; };
-  ssmrob = derive2 { name="ssmrob"; version="0.6"; sha256="0a6rwgc5qzfb6z4di5scaq3mlilgv2qrmkl38fkjvf4vrnmmja5k"; depends=[MASS robustbase sampleSelection]; };
+  ssmrob = derive2 { name="ssmrob"; version="0.7"; sha256="0asf0r83rzar96lcjm38i85qscbs9gbsrwbd1nfwzz9yl08mh07k"; depends=[MASS robustbase sampleSelection]; };
   ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; };
   sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
   sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; };
@@ -13247,7 +13444,7 @@ in with self; {
   startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; };
   statGraph = derive2 { name="statGraph"; version="0.2.0"; sha256="03cxm3kvs88q7p8v859xzma97vlklx50yh3kgmmfzf4axdm6dcgm"; 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]; };
-  statar = derive2 { name="statar"; version="0.7.0"; sha256="0jp2547gvm1na4bnnvzw3j3jya5db2k6xnbnmbwv9cmw1bwfbazk"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; };
+  statar = derive2 { name="statar"; version="0.7.1"; sha256="0gxchf3mnjvxcp7dg8f1dxbm16hx4ks92z0h0ig7m9l6k6f8adkv"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; };
   statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; };
   statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
   states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; };
@@ -13259,7 +13456,7 @@ in with self; {
   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="0.2.1"; sha256="0s3zzkb34jygb4ph2j0q488qasvg1xgsabgnnisc9fqwalxd096l"; depends=[readr sf]; };
+  stats19 = derive2 { name="stats19"; version="1.0.0"; sha256="1lm2qif0g710n5i7gzqhbwhxm76cabs5zm6504wja343fk3vzb54"; depends=[readr sf]; };
   statsDK = derive2 { name="statsDK"; version="0.1.1"; sha256="0insx4sivac0nfxaa11iz9dd7374g51fcndsgljj3f14zw1xyq66"; depends=[dplyr ggplot2 httr jsonlite lubridate readr stringr tibble tidyr]; };
   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]; };
@@ -13289,26 +13486,26 @@ in with self; {
   stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; };
   stm = derive2 { name="stm"; version="1.3.3"; sha256="1b1i4r161i92f5q63zjfghzg39bw9d2rqdxx0y6zjd8n2p0ni3wv"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; };
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
-  stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; };
+  stmgp = derive2 { name="stmgp"; version="1.0.1"; sha256="0rbskcggshn880d1pcl95ixbg16pzyhy14j1x44ipby5md737w89"; 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.2"; sha256="1n2ivdv6fa3qkk2xhgcy8cixpbw6mijr4p8q34q8d9fvh9qs9g11"; depends=[data_tree R6]; };
+  stoRy = derive2 { name="stoRy"; version="0.1.3"; sha256="146xs8as5f8ig2xpj9k2san4bllqxddsnlflnhl0sy6132vshyr1"; depends=[data_tree R6]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
   stochvol = derive2 { name="stochvol"; version="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; };
   stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; };
   stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
-  stopwords = derive2 { name="stopwords"; version="0.9.0"; sha256="050v3hq1wd3w83zrp76nv6n67qsf5fss2cbihb6waijancm7zfzh"; depends=[ISOcodes]; };
+  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]; };
   storr = derive2 { name="storr"; version="1.2.1"; sha256="0409gb6wji3cjxkdcd0wc3jvsx61h3rxd8a3nr018y8rh1rpsaj6"; depends=[digest R6]; };
   stosim = derive2 { name="stosim"; version="0.0.14"; sha256="10k8j7manskjsrjc1l44yhy682b1qh0k2jx3cs5k69j2z42mnhmk"; depends=[Rcpp]; };
-  stplanr = derive2 { name="stplanr"; version="0.2.10"; sha256="1ignfgin0i2s40dh2m55dpwaxzyvc9c65q3q5q0j04byrfqg0ncw"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; };
+  stplanr = derive2 { name="stplanr"; version="0.3.0"; sha256="0jzwpr4gbif44j8c2s0gjfx21lnskwj2vpqi8hx2m9n6lgr2348p"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringi stringr]; };
   stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; };
   stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
   strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
-  strapgod = derive2 { name="strapgod"; version="0.0.2"; sha256="1lw201hnrfb0rnlf5p92liinkjg8j0947vcnn2d2z878lfvy0s11"; depends=[dplyr rlang tibble tidyr]; };
+  strapgod = derive2 { name="strapgod"; version="0.0.3"; sha256="1sh716zqh6cc2qddn8v9pwdyf4xq9a59k7h797swzlk0r50y83h9"; depends=[dplyr rlang tibble tidyr]; };
   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]; };
@@ -13388,7 +13585,7 @@ in with self; {
   superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
   supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; };
   suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; };
-  support = derive2 { name="support"; version="0.1.3"; sha256="0gwvqwg2xmcki9kh3pmzpw99z8zfhbqynjgw2j9k75msbidsxs26"; depends=[BH doParallel matrixStats MHadaptive nloptr randtoolbox Rcpp RcppArmadillo]; };
+  support = derive2 { name="support"; version="0.1.4"; sha256="1yahhb9l2f3129av4cj4q77q1s0nfszzd6z7dqkfpnjvvk8gzdq7"; depends=[BH MHadaptive randtoolbox Rcpp RcppArmadillo]; };
   support_BWS = derive2 { name="support.BWS"; version="0.2-0"; sha256="1yfjpr9v9zsbkysm3r6zk9r0a072g038lmj9wk4014a3rk9kmm80"; depends=[]; };
   support_BWS2 = derive2 { name="support.BWS2"; version="0.2-2"; sha256="1pykq297gz42n6scl5s6zjy33wjvcb5590vcrgysdigf3hqb22ra"; depends=[]; };
   support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; };
@@ -13422,7 +13619,7 @@ in with self; {
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="3.0"; sha256="1wnjizd5n5lyp8nw6srplrw7swrrivmbcphdvgaa9q1y8lkpq5w0"; depends=[data_table laeken]; };
-  surveysd = derive2 { name="surveysd"; version="1.0.0"; sha256="155917rfyaijpiiiqgggnyisknikx3xid4kjqvh9299bs769a169"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; };
+  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="2.44-1.1"; sha256="1faiwyg7x8y2kfzb66l4yc8br0mdlz4k20znmjrwq96dbzhm3cam"; depends=[Matrix]; };
@@ -13430,7 +13627,7 @@ in with self; {
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
   survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; };
-  survminer = derive2 { name="survminer"; version="0.4.4"; sha256="1gczf52wxw5jlncmfk4xqfjxf83nn3kd4ha3mij8yd4f110q9i5q"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
+  survminer = derive2 { name="survminer"; version="0.4.5"; sha256="03dx3wb2s5yl617sgxb7x002wf0mgdz29c4jhgp260wvibh0b3rm"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
   survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; };
   survsup = derive2 { name="survsup"; version="0.0.2"; sha256="0q41hn8iqib2w6gkz2mll4h46vr9ca25jrg0g5jr9wgrzsnf5jci"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; };
   survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; };
@@ -13450,13 +13647,13 @@ 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.0"; sha256="109h8k9xkiqcqib9x0f78acq2ag854v1pgrhx5hfxprdj863mhss"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; };
+  svars = derive2 { name="svars"; version="1.3.1"; sha256="15lmgf1q6cd987f56nf3r8z4mmwjyfs5s9avav8jl7d1l73rzhiw"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange tsDyn vars zoo]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
   svd = derive2 { name="svd"; version="0.4.3"; sha256="0wlvzqak6fng6v5473hyphrfxrfc2apw5f3fgvg7bz2fj6nzcry4"; depends=[]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
   svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; };
   svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; };
-  svgViewR = derive2 { name="svgViewR"; version="1.3"; sha256="0771k1v0aqlq8q9rvynb5dkwq0kmlsn8nh251lka98jwh36vhld0"; depends=[rjson Rook]; };
+  svgViewR = derive2 { name="svgViewR"; version="1.4"; sha256="00nm2sdgil2kw6f19sy03m8452zia47bv1bkynxw3q7vck3vb3vx"; depends=[Rcpp rjson Rook]; };
   svglite = derive2 { name="svglite"; version="1.2.2"; sha256="1gwv51wqp6pgm2f9gavsiq65njs77fr49n8y6y9ax60k3a4vvg14"; depends=[BH gdtools Rcpp]; };
   svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; };
   svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; };
@@ -13474,13 +13671,12 @@ in with self; {
   swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; };
   sweep = derive2 { name="sweep"; version="0.2.1.1"; sha256="0hfvgvzr5mh9niwpsr9jcly426dz457afrg4q5w13ahsasx7c9jg"; depends=[broom devtools dplyr forecast lazyeval lubridate tibble tidyr timetk]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
-  swephR = derive2 { name="swephR"; version="0.1.5"; sha256="139xp7lwzqspckf04fnfcwrpi4zhi01k94fhhka92sk2647yvd4z"; depends=[Rcpp]; };
+  swephR = derive2 { name="swephR"; version="0.2.1"; sha256="0vrhgkz3bafkb6a46g5dx5qyh52ind5fwch0lbn7dnhwibdy209a"; 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]; };
   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.0"; sha256="1q3f4v4xi7h93bm9jhsmd9qz01p7zmp3mcf5rh2jr8vabzzbfljj"; depends=[curl dplyr jsonlite magrittr purrr 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]; };
@@ -13506,13 +13702,13 @@ in with self; {
   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]; };
-  synthACS = derive2 { name="synthACS"; version="1.4.5"; sha256="04vw2xbg055anwiawkddnik4q67vvbvx9firm85hs7cj73mv07q4"; depends=[acs data_table Rcpp]; };
+  synthACS = derive2 { name="synthACS"; version="1.5.2"; sha256="1y9kvp4fq1602c9876jc8102iidxzqkqsh89ix3m5qf63ldx071f"; depends=[acs data_table Rcpp]; };
   synthpop = derive2 { name="synthpop"; version="1.5-1"; sha256="0cd9g0aa4598l3gyqpywalmkmvibhqkxhkm2qkln11rkwv12lcyv"; depends=[classInt foreign ggplot2 lattice MASS mipfp nnet party plyr polspline proto randomForest rpart]; };
   sys = derive2 { name="sys"; version="3.2"; sha256="1k5vk5q9wa5sin0n226i05nymg469s24f6lx64yyhb7yc624j698"; 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]; };
-  systemfonts = derive2 { name="systemfonts"; version="0.1.0"; sha256="0bxaabsa4qzmv6k3yywgn9y54xwnjzkwkmcmvph8lk20r6zkj3v5"; depends=[]; };
+  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]; };
   syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; };
@@ -13521,7 +13717,7 @@ in with self; {
   tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
   tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; };
-  table_express = derive2 { name="table.express"; version="0.1.1"; sha256="0wmggi88g2fb242pwsj2apf0j3cygzx679xz41xyv00bba2ghs26"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; };
+  table_express = derive2 { name="table.express"; version="0.3.0"; sha256="0yrvq0psf6j11cbyhbk3aqskxqm3v9a9dkakmknmynzx4zp6p9fv"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; };
   table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; };
   table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; };
   tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; };
@@ -13561,26 +13757,28 @@ in with self; {
   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]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; };
-  taxotools = derive2 { name="taxotools"; version="0.0.30"; sha256="0xfjlfw3g2scqklh4lily30mpgc92pjjcfn41ygpfxc5adicrd71"; depends=[plyr sqldf taxize wikitaxa]; };
+  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.2"; sha256="1zz310253s6gz0hzzldil5r03mm7ngvvnba7hxm8fm9dhfmvkbj6"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
+  tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; };
   tbm = derive2 { name="tbm"; version="0.3-0"; sha256="03bh98jn5rm3c159sbyx830cjf8yhpbn8jdgrmnqrwgr1fp5hdqf"; depends=[basefun coneproj mboost mlt sandwich variables]; };
   tbrf = derive2 { name="tbrf"; version="0.1.2"; sha256="03n9s2n5y9d669l78v6s2dbk3sz51g5v28301ng2w082njrsvxhv"; 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]; };
   tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
   tclust = derive2 { name="tclust"; version="1.4-1"; sha256="17md6l9v9dl9b72l84df01b52h2xiynbcjm437mv9mzcr09fc2sb"; depends=[]; };
-  tcpl = derive2 { name="tcpl"; version="2.0.1"; sha256="16a245wvyckkc2hxq57gcwd4d29ri3c9nn44amwiy779gc2rb0sm"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; };
+  tcpl = derive2 { name="tcpl"; version="2.0.2"; sha256="0xic4jy8ldawmkvvwckiyy57ai5wif9yn7hyfndbxr6mvjl3rbbc"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; };
   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.0.1"; sha256="17nr5fa4f16ww8si8qikbqmixl38jxjy185b80ff2i5v4129mnwd"; depends=[data_table]; };
   tdthap = derive2 { name="tdthap"; version="1.1-9"; sha256="0y01x0hcf0rw06cpn4pk17b0shf4v2c9was7vfs0zhsbq8qcwx7r"; depends=[]; };
   tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; };
   teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; };
   tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; };
-  teamcolors = derive2 { name="teamcolors"; version="0.0.1"; sha256="07mqsbhrsy23qc4j1w1wji36cbh6dijkp6p7g3598nlzhw7ln3aj"; depends=[]; };
+  teamcolors = derive2 { name="teamcolors"; version="0.0.2"; sha256="1dns9z03n2bf8bda965wx243dacdm6ixp7zgzkvqr5mifcgmfafh"; depends=[dplyr ggplot2]; };
+  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]; };
@@ -13597,18 +13795,19 @@ in with self; {
   tensorA = derive2 { name="tensorA"; version="0.36.1"; sha256="176hjy3bvg3in62r97wxbhq187sjz6c1gwy9x6spaxl6k4my3zy7"; depends=[]; };
   tensorBF = derive2 { name="tensorBF"; version="1.0.2"; sha256="1dw1a6xqcsl4isbzbfiplgqq5nak5n9ffzm23mzzmkh1r1a8kl1y"; depends=[tensor]; };
   tensorBSS = derive2 { name="tensorBSS"; version="0.3.5"; sha256="1m4g9jr2s37xys2q4gv6rqknrznd4nrppa7qrgygqywwlmnyid44"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; };
-  tensorflow = derive2 { name="tensorflow"; version="1.13.1"; sha256="0fv58ml67miq7cb0d66p880vs8c91v6gdz5xba9mxppbd63k5li8"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
+  tensorflow = derive2 { name="tensorflow"; version="1.14.0"; sha256="0lw1k6s9x975w2nly32vp0157qc8jvmda2i6bpfmvf2xmadq0dr8"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; };
   tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; };
   tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; };
   tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; };
-  tesseract = derive2 { name="tesseract"; version="4.0"; sha256="1dadr3q0g8vr44rc0xmhism8llq3awl4svvrcghlrv7m85zps9ih"; depends=[curl digest pdftools rappdirs Rcpp]; };
+  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]; };
   testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; };
   testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; 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]; };
   testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; };
   testit = derive2 { name="testit"; version="0.9"; sha256="0mayvbzfg7zkr9n38h0z9rkzxgpsck5vimfbgm70ww1ckggv7xlw"; depends=[]; };
-  testthat = derive2 { name="testthat"; version="2.1.1"; sha256="03jgr0hlr77yp0aib4v30yjyjrjsa8dczr02yk21m93vl25vqvkp"; depends=[cli crayon digest magrittr praise R6 rlang withr]; };
+  testthat = derive2 { name="testthat"; version="2.2.1"; sha256="0y0bvggm4pzkzp6xn7b8cf3ybqp9ijxkhhyp3z49a9iipc90bvk7"; depends=[cli crayon digest evaluate magrittr 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.3.2"; sha256="0gg46iy4s17gri28g0nvqibm8wy4c6mj1hc5iyj6dsn4jskvpfmy"; depends=[base64enc htmltools magick rematch2 rstudioapi svgPanZoom whisker xml2]; };
@@ -13619,7 +13818,7 @@ in with self; {
   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]; };
   textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
-  textdata = derive2 { name="textdata"; version="0.1.0"; sha256="12w1xz6ll03zbzynbv1mnncmi92byiaybxf70j6nppm6bj2qf3dz"; depends=[fs rappdirs readr tibble]; };
+  textdata = derive2 { name="textdata"; version="0.2.0"; sha256="1rksgkkwm4il3bw3vg19207r331rs0i3aqcn1x83y9cyvn15y8wm"; depends=[fs rappdirs readr tibble]; };
   texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; };
   textfeatures = derive2 { name="textfeatures"; version="0.3.2"; sha256="0k0qcw1r76d3igmphw0kg1ncd26zfqz4hbrhf6s3r0j16i14jlx0"; depends=[dplyr purrr rlang text2vec tfse tibble tokenizers]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
@@ -13636,6 +13835,7 @@ in with self; {
   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=[]; };
+  tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; };
   tfdatasets = derive2 { name="tfdatasets"; version="1.13.1"; sha256="19szgpb040v33hicrqdigjpg3z6jph0fxx6rh8ln16hk4sb2rd2d"; depends=[magrittr reticulate rlang tensorflow 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=[]; };
@@ -13673,7 +13873,7 @@ in with self; {
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-  tidyLPA = derive2 { name="tidyLPA"; version="1.0.2"; sha256="02alsv44v8yf23aibpchichwn6yrmwy2751a18kaj8azgz1x7i07"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; };
+  tidyLPA = derive2 { name="tidyLPA"; version="1.0.3"; sha256="0vx2zzajisf2hcwbd1r6b0qmp330pp5x1w4sikm5zdbxrq0ws7y3"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; };
   tidyRSS = derive2 { name="tidyRSS"; version="1.2.11"; sha256="0ikizs24frvv888zxris6j41lfcvy7hrp5z3h3mk5vxdlqi3rag7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; };
   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]; };
@@ -13684,11 +13884,13 @@ in with self; {
   tidyhydat = derive2 { name="tidyhydat"; version="0.4.0"; sha256="0k239xixq6x9xb51ipmxn7ph72ibqa9s9sp79gkabgawc0lij6q0"; 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]; };
   tidylog = derive2 { name="tidylog"; version="0.1.0"; sha256="0mwd9crb0a0c8gpchsdjcap56fc602h1x7bk5f0rvvmw41xz06kn"; depends=[dplyr glue]; };
+  tidymargins = derive2 { name="tidymargins"; version="0.1.0"; sha256="1r782h6a5fhk9yb9ixjbpq3a9g56j3xz1871fsndkfigbzz39w51"; depends=[assertthat dplyr forcats magrittr pkgcond purrr rlang tidyr tidyselect]; };
   tidymodels = derive2 { name="tidymodels"; version="0.0.2"; sha256="1hidjrayqxz1g7bn20pqs1bwyx4cxxqx9dq5lwqyfsij0ir0lia9"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; };
   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.1"; sha256="1w6ciyk4024aad6japfar1pq4q9bygcgl5avzg2l8c7mcqd58rvl"; 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.3.0"; sha256="1c0j69b976s6gz6vm8ql2mjnl8awzs25vpjkjfsvclpzalldcq06"; depends=[dplyr knitr purrr rlang]; };
+  tidypredict = derive2 { name="tidypredict"; version="0.4.2"; sha256="16lrn7gj9vrshhk3kfk57m7pllicmy7f98fm05y12ir5a8mbz9d1"; depends=[dplyr generics knitr purrr rlang tibble]; };
   tidyquant = derive2 { name="tidyquant"; version="0.5.6"; sha256="0mnhn00fw3xl2k11m4c1ngfh0p6fz2am0dv1pv8hnfp1mp31bxrv"; depends=[dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang stringr tibble tidyr tidyverse timetk TTR xml2 xts]; };
   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="0.8.3"; sha256="0dyc4b03wi65bk7j0ma0y188syh37h57wgxji82i0h8j6pn593x1"; depends=[dplyr glue magrittr purrr Rcpp rlang stringi tibble tidyselect]; };
@@ -13697,17 +13899,17 @@ in with self; {
   tidystats = derive2 { name="tidystats"; version="0.3"; sha256="11bl4m14n29fcy9g3b0sx10fx2kl6949fczzdzw2cllqn2krfx45"; depends=[dplyr kableExtra knitr magrittr miniUI purrr readr rlang shiny stringr tibble tidyr]; };
   tidystopwords = derive2 { name="tidystopwords"; version="0.9.0"; sha256="1zw6rz8fs8mynaqhrxidrar8vyiq73i8hl4h2lrfz83rxrihbq39"; depends=[dplyr stringr]; };
   tidystringdist = derive2 { name="tidystringdist"; version="0.1.4"; sha256="1srxh5gyspcghzvnmpyq36ky608ipf71vv0s1jg01mgf2i5pdkf4"; depends=[attempt rlang stringdist tibble]; };
-  tidytext = derive2 { name="tidytext"; version="0.2.1"; sha256="110xwmdv4yxgyfw51zb1x9hwi4xdx3wqxpg1xq2vgkvcy6acnb7v"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
-  tidytidbits = derive2 { name="tidytidbits"; version="0.2.0"; sha256="194b5j1f8ap0rl6v227wpz4vbps3iw60k4wryk12yw4z4xp0l9xw"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; };
+  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.5.1"; sha256="1vbcaqjr020qxgx4fpca2hhgjcq2j86rzyhxmsizjj68fr9963p9"; depends=[assertthat data_table digest dplyr here hms htmltools httr lubridate magrittr readr rlang scales sf stringr tibble tidyr zip]; };
-  tidytree = derive2 { name="tidytree"; version="0.2.4"; sha256="04bznlfs617plv258nmsyq2pywnijcnzy2pbn5b2fgjk2xqkp29w"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
+  tidytree = derive2 { name="tidytree"; version="0.2.5"; sha256="0vfjv33352dmk9cr2qn0knzg761068rdk6jg32csd9vpmcma8awp"; depends=[ape dplyr lazyeval magrittr rlang tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
   tidyxl = derive2 { name="tidyxl"; version="1.0.4"; sha256="19kcm9lfbkf61z0whfkn69b8m36qd1rvyhyk5y0cqbzkxvq8f70i"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
   tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
   tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; };
-  tigger = derive2 { name="tigger"; version="0.3.1"; sha256="1ay8al764adpzabwsinxg97y2mz28k6y1m8ckfxhi9h11az23hid"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam stringi tidyr]; };
+  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]; };
@@ -13727,7 +13929,7 @@ in with self; {
   timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR 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]; };
-  timereg = derive2 { name="timereg"; version="1.9.3"; sha256="1hlj9qhzfyz3lqnlpn9r0madmik592zsgaxlnggf3r437nkbynwc"; depends=[lava numDeriv survival]; };
+  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]; };
   timetk = derive2 { name="timetk"; version="0.1.1.1"; sha256="0ca6xnsidc98yjb52gbafvfgxzdgszj8l9hvc77mwgc33g0ydvs1"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; };
@@ -13767,8 +13969,8 @@ 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.2"; sha256="0ssxp1qfc4fa98l8qy2wnsfqg0hhmq0qs7rhsjp4jgrw1wdff4jk"; depends=[httr jsonlite]; };
-  tmap = derive2 { name="tmap"; version="2.2"; sha256="0dvplmwmin4zpz5n46f2yr2zibfmfs6gc6byb68c508k6m08b6vx"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer sf tmaptools units viridisLite]; };
-  tmaptools = derive2 { name="tmaptools"; version="2.0-1"; sha256="0zfj2q3p4xmb7xzpiidfn20g569fscyhryzcpmvwkp98a7fg9swz"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; };
+  tmap = derive2 { name="tmap"; version="2.3"; sha256="1vkh2dkyp96d0wpvwkflmhjsi8vhycdchxd0imixpqi4hg5037v2"; depends=[classInt htmltools htmlwidgets leaflet leafsync 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-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
@@ -13776,7 +13978,7 @@ in with self; {
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
   tmod = derive2 { name="tmod"; version="0.40"; sha256="157m5jjkfd7g9aih5zylxzwkkdryj9l6yapgwjqydvwj6ab6k67l"; depends=[beeswarm plotwidgets tagcloud XML]; };
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
-  tmt = derive2 { name="tmt"; version="0.1.9-3"; sha256="0l4q21qq1srcfldwfwmc1w0wpi0zjpngpjrp6w287vgnqjc8y7kx"; depends=[ggplot2 Rcpp]; };
+  tmt = derive2 { name="tmt"; version="0.2.1-0"; sha256="1drb0z9jk76ixn3qw7xb5rirfc9h0frkhl1krs681aiaspqkgswj"; depends=[ggplot2 Rcpp]; };
   tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.0.2"; sha256="04bjdlrz82v9skirap2fmngi2sv9xakkgmkgpwdv3qshszvx3wz4"; depends=[]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; };
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
@@ -13787,12 +13989,14 @@ in with self; {
   togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; };
   tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.0"; sha256="1kbw5bsghhpxd1742wgq2pw2y52s2vhbk0w8qiw6qagvx2dq5z52"; depends=[Rcpp stringi]; };
   tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; };
+  tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
   tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; };
   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]; };
   topicmodels = derive2 { name="topicmodels"; version="0.2-8"; sha256="19msp5cz67ff4v1gfd8vhjnnsmwfkxiv08ym4k506j2mhaklipci"; 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]; };
   topsis = derive2 { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
   tor = derive2 { name="tor"; version="1.1.1"; sha256="0vibnjm0q8rn73c5xdbfw5z4pk4ja1m1mx9c6p423pz72znwrcpw"; depends=[fs readr rlang tibble]; };
@@ -13813,6 +14017,7 @@ in with self; {
   tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; };
   track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; };
   trackdem = derive2 { name="trackdem"; version="0.4.3"; sha256="04gjvm4dxdy7nwaq6f0nbvqb2hbvmava5x6q5kvyy7snsr8mx25f"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools 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]; };
@@ -13820,6 +14025,7 @@ in with self; {
   trade = derive2 { name="trade"; version="0.5.4"; sha256="05skmm2j826wjhmxdvkln50y0mjy74qcl2hay2l1322qqs7phin6"; depends=[antitrust]; };
   tradestatistics = derive2 { name="tradestatistics"; version="0.2"; sha256="0g2ag7ns1y1b76q6aygkr15dp7zd51fa01nm7q9fd7had07x3sgd"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; };
   trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; };
+  traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; };
   traitdataform = derive2 { name="traitdataform"; version="0.5.5"; sha256="1gf03gyva4f00bhzcb1x1hsghra15yrhfrr9cprmvax6bgrq64bp"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
@@ -13833,7 +14039,7 @@ in with self; {
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
   translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
-  transport = derive2 { name="transport"; version="0.11-1"; sha256="1hg4mhmjsvr2cqj0d21qwyrachlha9q119p8zjhly4zcyp4yz7wp"; depends=[Rcpp]; };
+  transport = derive2 { name="transport"; version="0.11-2"; sha256="1lpzivhv0fbcas6yhri064z2hian8flslz2zq3m33fh43jqqs1qg"; depends=[Rcpp]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
   trawl = derive2 { name="trawl"; version="0.2.1"; sha256="1ns4nk8zdnl2z9clc2q38sbb1ijkj86lcifxq7d111mcwsmpb6fi"; depends=[DEoptim MASS rootSolve Runuran squash TSA]; };
   tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; };
@@ -13849,7 +14055,7 @@ in with self; {
   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]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
-  treeplyr = derive2 { name="treeplyr"; version="0.1.6"; sha256="0ds3188ijhbffbxpgnr6pv14payh8is6pcxk2h331iqkra71n74j"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
+  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]; };
   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]; };
@@ -13864,7 +14070,7 @@ in with self; {
   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.7"; sha256="1k12yzicf3p5wpgzpsv4kk5xzrdfx712z67kj9xmcr1mbs8l5skb"; depends=[bazar dplyr lazyeval magrittr rlist rstudioapi]; };
-  tricolore = derive2 { name="tricolore"; version="1.2.0"; sha256="0mv72lh5z8drdn96nb39dz9gnzia6vm6vbl8z6ldmd952x727y0a"; depends=[assertthat dplyr ggplot2 ggtern shiny]; };
+  tricolore = derive2 { name="tricolore"; version="1.2.1"; sha256="04ihsgy6l8nlfp1q8c14g56v2inpw48mlhni4xqfqb7mzvalvhf8"; depends=[assertthat ggplot2 ggtern shiny]; };
   triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; };
   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]; };
@@ -13890,6 +14096,7 @@ in with self; {
   truncreg = derive2 { name="truncreg"; version="0.2-5"; sha256="1scbjh5k1b8cjjavax08grlxdfs75s63dss0ifpz4d0axc4nm3iy"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
+  trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; };
   tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.4"; sha256="0iahbm1zjgrb5x5awlvy1jgylw47p7qa1cxhrzg2mjknwpsd4vwm"; depends=[]; };
   tsBSS = derive2 { name="tsBSS"; version="0.5.2"; sha256="00brzy0dkvdwrsf5jlpyp6ggwc2wkmdkb3l6h8fx1i3lmhnaqhkg"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo]; };
   tsDyn = derive2 { name="tsDyn"; version="0.9-48.1"; sha256="0r8xxzr2z7r7xzpvi3sani169j3irw866gdmml0798czbdarq1qd"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
@@ -13904,6 +14111,7 @@ 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]; };
@@ -13911,8 +14119,8 @@ in with self; {
   tsfeatures = derive2 { name="tsfeatures"; version="1.0.1"; sha256="11ysmi9jd3x92fcylw6jbg62fdmdbi58nnasz0pm3ji46knwnd5n"; depends=[ForeCA forecast fracdiff furrr future purrr RcppRoll tibble tseries urca]; };
   tsfknn = derive2 { name="tsfknn"; version="0.3.0"; sha256="0h44s8bvnd68nhl0rbwvs0sycsjlmpnni0nr2169429a9y3f91f1"; depends=[ggplot2]; };
   tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
-  tsiR = derive2 { name="tsiR"; version="0.4.1"; sha256="1l6dvw4j4ish3ya51x5pw1580iibf2ywiyrx17c913sihvww43fr"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.8.2"; sha256="1dijimif048zc7hafdc5f01vl1gjyjdmziv505l1fsh94jkxs453"; depends=[anytime dplyr lubridate purrr Rcpp rlang tibble tidyr tidyselect]; };
+  tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; };
+  tsibble = derive2 { name="tsibble"; version="0.8.3"; sha256="1gvnbnl818jh7vxwdssghsnqh3xwg5rhj6gg7jb8r6zzqjq56l57"; depends=[anytime dplyr lubridate purrr rlang tibble tidyr tidyselect]; };
   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]; };
@@ -13923,6 +14131,7 @@ in with self; {
   tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; };
   tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; };
   tsutils = derive2 { name="tsutils"; version="0.9.0"; sha256="09xv5iv6icjbj5rhcsspbs8n2rl9k9gml0iizq8rd5a01153zlsm"; depends=[forecast MAPA RColorBrewer]; };
+  tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; };
   tsvr = derive2 { name="tsvr"; version="1.0.0"; sha256="07ifcnij78lw29h1yxjyws3z5mxvk4lz33vgs2dr8ka5mwafbbc0"; depends=[]; };
   tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.2"; sha256="1lmvwk83186qb59k3i4ppv85dvz7fww8wr97mvkl8457mf4n6kg0"; depends=[evd MASS mvtnorm]; };
@@ -13962,12 +14171,13 @@ in with self; {
   twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
   twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; };
   twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
+  twitterwidget = derive2 { name="twitterwidget"; version="0.1.1"; sha256="1dlhydhy69284gg3jsxwa6h8cp1rlkg1j8h8z1fjz4fyy1p5xrpv"; depends=[htmlwidgets]; };
   twl = derive2 { name="twl"; version="1.0"; sha256="0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3"; depends=[corrplot data_table MCMCpack Rfast]; };
   twosamples = derive2 { name="twosamples"; version="1.0.0"; sha256="0i8k157ph2whll72a590rnafgjx767k8vxy5d8x9dq7s4baiw1cx"; depends=[Rcpp]; };
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   twoway = derive2 { name="twoway"; version="0.6.2"; sha256="0q053jvb2sa762bjnpzkxzdcq1wk82ynp4rjl4j6qncqccvqq0c3"; depends=[]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
-  txtq = derive2 { name="txtq"; version="0.1.3"; sha256="1ych9wqmd0bw2n0pv88q2irwzz99krylb8m08ii6ljql1bm8ix9w"; depends=[base64url filelock fs R6]; };
+  txtq = derive2 { name="txtq"; version="0.1.4"; sha256="0qvxz3k7as70wvqnxm5myk8ppan6f3c2vnnk5hqvxa370r3b8a9x"; 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.1.0"; sha256="0dlks1mm5li72ir18nnd4s9ll20700plha0d82h9wxpkkhwzqzng"; depends=[Brobdingnag pbapply]; };
@@ -13979,15 +14189,16 @@ in with self; {
   uclust = derive2 { name="uclust"; version="0.1.0"; sha256="0b4cj1np4b7m3nfk3crisw9qznk86lbh7x9xb70lwjmcjjgxkw8q"; 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.2"; sha256="032g3rr1w6kg5kmqhr2pcy2gb8341fvpljv5499azwbhv01ifdp0"; depends=[data_table Matrix Rcpp]; };
+  udpipe = derive2 { name="udpipe"; version="0.8.3"; sha256="1ys4ss700h3xk4z72lsjavd6vic4ihm00b1mzidq41klrgpwzcb0"; depends=[data_table Matrix Rcpp]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
-  ufs = derive2 { name="ufs"; version="0.2.0"; sha256="1z7vwlk01nxz55zfs30scx7crldf9ic7rklpw8rh4vk7p755nzk2"; depends=[BiasedUrn dplyr ggplot2 ggridges gtable pander scales SuppDists viridis]; };
+  ufs = derive2 { name="ufs"; version="0.3.0"; sha256="02w784fjkpx6jq9vbrkxvn7c6vjabna1f7gx9jcrgp77xr2b1d4q"; depends=[digest diptest dplyr GGally ggplot2 ggrepel ggridges gridExtra gtable knitr pander plyr scales SuppDists viridis]; };
   ui = derive2 { name="ui"; version="0.1.0"; sha256="1pc18v99n1psiiv7jxy3as1qwg2y41i1syrpvkbk05yii1qzsw2b"; depends=[Matrix maxLik mvtnorm numDeriv]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.2.1"; sha256="1l96mch9r5npsdv1v4qfyj43ana7a2ff7yj04q6fzhh27v0fx7ak"; depends=[rmarkdown]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
   ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.16"; sha256="0bj1dpsz4709dcb297b9rcb4nbzvxxhrqh5sv2qbrcypdh0x2m3b"; depends=[RCurl XML]; };
   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.2.0"; sha256="1s82w9gy1387h7cprjfbhp49l89zbmn3gc9s0wzqb1s73nza9n31"; depends=[Rcpp reticulate RSpectra]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
   umx = derive2 { name="umx"; version="2.10.0"; sha256="0sh16dwzkib1gzaj18nk2zdp8pq6ri7hwknzzpz1632r956kd7cy"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
@@ -14001,7 +14212,7 @@ in with self; {
   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.2"; sha256="0az9knspvf49mvp41m64lpm1a0nzvkygg957pb81mm9kh6cjbhfs"; depends=[gmp graph]; };
-  unifed = derive2 { name="unifed"; version="1.1.0"; sha256="0rcvq5n1k7ji6avnfb5vks9yik1vjxd3pyji1mhhkg2k7kpdn75b"; depends=[]; };
+  unifed = derive2 { name="unifed"; version="1.1.1"; sha256="0bh15cvpasgd0ypcmybbss5s9hsilfxgqj4b0mppj44vxm15bzk6"; depends=[]; };
   uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
   unikn = derive2 { name="unikn"; version="0.1.0"; sha256="08ykiwb7379rrrqxi1363vfrm6cq3vdmfas2plf26jkx4n806rm2"; depends=[]; };
@@ -14022,7 +14233,7 @@ in with self; {
   unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
   untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; };
   unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; };
-  updog = derive2 { name="updog"; version="1.0.1"; sha256="0y2w62f25an1d7fpkiqhimak0ww201r873sjb08akwf82v4k34wz"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; };
+  updog = derive2 { name="updog"; version="1.1.0"; sha256="0zyb9n7wlxvigi4w4rz0nrhpzdycvvdgz6hc4bg4v4bk0k8dnkmk"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; };
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
@@ -14040,7 +14251,7 @@ in with self; {
   usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; };
   useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
   userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; };
-  usethis = derive2 { name="usethis"; version="1.5.0"; sha256="0pn6ka3726psaqlx573g6nxi90apf0rn5m4k2lz1jr66xdc19sag"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; };
+  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]; };
   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]; };
@@ -14048,9 +14259,9 @@ in with self; {
   ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
   utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; };
   utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; };
-  utile_tables = derive2 { name="utile.tables"; version="0.1.4"; sha256="01456rw4jglkkxbbwcjv4gqcx1jv4l94jbk1szpkgdvqf7pzvgiz"; depends=[dplyr purrr rlang survival tibble tidyr utile_tools]; };
-  utile_tools = derive2 { name="utile.tools"; version="0.1.2"; sha256="17fvm631bl1frw54a3fajncagb4r0xfz0s8lnnlk8xybqvyk2qxi"; depends=[dplyr glue lubridate purrr rlang stringr survival tibble]; };
-  utile_visuals = derive2 { name="utile.visuals"; version="0.1.1"; sha256="1bzwbs8yzq7qcbgjnavn58c9sqafg7r9lfy1nr5a4d7x40fhzdhd"; depends=[ggplot2]; };
+  utile_tables = derive2 { name="utile.tables"; version="0.1.5"; sha256="0z3frv84q1hq60b2qdj7wfxqv62cs9986r0dki7lc0vfs7cyai2h"; depends=[dplyr magrittr purrr rlang survival tibble tidyr utile_tools]; };
+  utile_tools = derive2 { name="utile.tools"; version="0.2.0"; sha256="0k3lj94k6ajfpy36rrzwl8b3w2dccshrsmwn8zl70y5159ivm1z2"; depends=[dplyr lubridate purrr rlang stringr tibble]; };
+  utile_visuals = derive2 { name="utile.visuals"; version="0.2.0"; sha256="1wh41iiqi1lwsjifglr5ip1ajz8vhnijzjpb7l9lwbvivphhlcwh"; depends=[ggplot2 gridExtra purrr utile_tools]; };
   utility = derive2 { name="utility"; version="1.4.3"; sha256="12g2y9xzzi2sl3ya3va1p7nc7hrjhr4arsz06f8xlxw5n8kvdxag"; depends=[]; };
   utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.6"; sha256="07avc0j6qkzqmznbydn0zdg743g7g7kn2bcx5n03m3wg0fqyggr7"; depends=[data_table dplyr RCurl stringdist stringr]; };
   utiml = derive2 { name="utiml"; version="0.1.5"; sha256="02wxsg1gg2y83cii5ly7r8lk376kas261f9qyl03z55p5m72w9zy"; depends=[mldr ROCR]; };
@@ -14103,7 +14314,7 @@ in with self; {
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
   vcr = derive2 { name="vcr"; version="0.2.6"; sha256="0gqsiphlnq1lh6mqg9ikipxfzyzdiqxcvbwi0gpgfjk10gjj8f13"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; };
   vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
-  vctrs = derive2 { name="vctrs"; version="0.1.0"; sha256="13w1r8zpalirpfaz5sykpn0mj4jmhxi2qkdcfq081ixlfjyzwa6c"; depends=[backports digest glue rlang zeallot]; };
+  vctrs = derive2 { name="vctrs"; version="0.2.0"; sha256="05h0y8qzwc899qj84gkhg4jwzscd065as00d4d8smv42h4i8zkjv"; 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]; };
@@ -14118,10 +14329,10 @@ in with self; {
   vegclust = derive2 { name="vegclust"; version="1.7.7"; sha256="0f81jw429ib601lvbzi4q23kb5n6lvavlgw56wfqdmvvkl68vwlc"; depends=[circular Kendall MASS Rcpp sp vegan]; };
   vegdata = derive2 { name="vegdata"; version="0.9.5"; sha256="145frmlsdb7m5z8qa03js4061pqmgvy3gykxkpiv1wv2wnfzyvnr"; depends=[foreign XML]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
-  vegperiod = derive2 { name="vegperiod"; version="0.2.5"; sha256="1icjv3z8bfl2yl1pkr3kbs34q2yqv65aadw40jzrd98djdprzkni"; depends=[]; };
+  vegperiod = derive2 { name="vegperiod"; version="0.2.6"; sha256="0v8bpxaa0xp8ywnycxs3613scncrhv8g7p99j6n5hs26m4h1km49"; depends=[]; };
   vegtable = derive2 { name="vegtable"; version="0.1.4"; sha256="1gk80i4gi98nigiya4n8ng8d2y7l3j63i1ijg4g80nfr5w64qh5w"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; };
-  vein = derive2 { name="vein"; version="0.7.8"; sha256="19rjd84ckw2f6wagzy0rivq2bnyb74gv92rxamhfd7xp05xhp2ml"; depends=[data_table eixport sf sp units]; };
-  velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; };
+  vein = derive2 { name="vein"; version="0.7.12"; sha256="1f2x8bdhfsj5v6gql1qq8g2lrxjj5z9pji2iirsy1samqxnnpirk"; 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=[]; };
@@ -14137,15 +14348,16 @@ in with self; {
   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=[]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
+  viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; };
   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]; };
   vimp = derive2 { name="vimp"; version="1.1.4"; sha256="146z6xismk97613cdiz508hn0mgg0w0rqnjb9as66sq57kqgn5yn"; depends=[SuperLearner]; };
   vinereg = derive2 { name="vinereg"; version="0.5.0"; sha256="17qni21jaizmfzl975xd39ahlc5flfnmy6xy7n9adfv346f3zwp0"; depends=[cctools furrr future kde1d rvinecopulib]; };
   vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; };
   violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
-  vioplot = derive2 { name="vioplot"; version="0.3.0"; sha256="1ddmmqq7qrnvr5q518afnysrl7ccr8am9njknv3dpwaqzcdr9akn"; depends=[sm zoo]; };
+  vioplot = derive2 { name="vioplot"; version="0.3.2"; sha256="13kfjp747bnzksai8j39y2hyl3ljc6n53c2cfhaw78q3d63x0lbv"; depends=[sm zoo]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-  vip = derive2 { name="vip"; version="0.1.2"; sha256="1y4v0qd7qag9jw9vazlnl3hp4813lcbhmbq60s3znhdmxnbb4irw"; depends=[ggplot2 gridExtra magrittr ModelMetrics pdp plyr tibble]; };
+  vip = derive2 { name="vip"; version="0.1.3"; sha256="140sv4rp7g600adh0mq8k8m8v6qdb6rkan87fh6i0svw67vbjr16"; depends=[ggplot2 gridExtra magrittr ModelMetrics pdp plyr tibble]; };
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
   viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
@@ -14162,9 +14374,9 @@ in with self; {
   visualFields = derive2 { name="visualFields"; version="0.6"; sha256="1w6wkyzjakj6ss9nv4gzkgva4m21jbsz10c2jy660bjb25rf59ih"; depends=[deldir flip gtools Hmisc matrixStats spatstat]; };
   visualR = derive2 { name="visualR"; version="2.0.1"; sha256="1q0vzxh6zy76yr5bd55781fk9cb7xr1bpf1fywzsi6341ds5qxys"; depends=[dplyr jsonlite optionstrat plotly quantmod zoo]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
-  visvow = derive2 { name="visvow"; version="0.5.0"; sha256="0kkj09hdan5an59v0jvqchx4kkk7d9ak91c79hs78fdpj65xc16b"; depends=[Cairo DT ggdendro ggplot2 ggrepel MASS plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS splitstackshape svglite WriteXLS]; };
+  visvow = derive2 { name="visvow"; version="0.6.0"; sha256="0f6w7gv8pglzvnixxk0x418wva2yzc108hm0rr99rdxqixl56lyc"; 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.1.0"; sha256="1xjrgx0zmy922dg60b296j393lyx2jc07alwzvaj2bgqakpspgk0"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown]; };
+  vitae = derive2 { name="vitae"; version="0.2.0"; sha256="0wxd4dlw8s5wi3x9nb6kn1yb3fjg1fbswx4dfg7pl6w19gx8ff4v"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown]; };
   vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; };
   vivo = derive2 { name="vivo"; version="0.1.0"; sha256="1xsx7qv30m9zyfqckdzycml563z1xrm0jmsbahs7il55xwg2pndh"; depends=[dplyr ggplot2 ingredients]; };
   vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; };
@@ -14177,7 +14389,7 @@ in with self; {
   voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; };
   vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; };
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; };
-  vosonSML = derive2 { name="vosonSML"; version="0.26.3"; sha256="0qcvs0ndfyql1vzx27ks006lwbxl2dx5vnf4jl05pj0jwxc8zgkx"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr RCurl RedditExtractoR rlang rtweet stringr tm]; };
+  vosonSML = derive2 { name="vosonSML"; version="0.27.2"; sha256="0a2qqs6kf48l5ik3dsw40xsw1wzq7bnc3vdh33jiqh2fm93nzvrp"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr RCurl RedditExtractoR rlang rtweet stringr textutils tictoc tm]; };
   vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; };
   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]; };
@@ -14195,9 +14407,10 @@ in with self; {
   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.0"; sha256="0mvfqv7zhkhihdw0iazpf82qi05j457mknrc8p38amqak4n3xgdm"; depends=[wrapr]; };
+  vtreat = derive2 { name="vtreat"; version="1.4.4"; sha256="0wsa2aaggscaig6zgnxl7xi9a2r6256j6dw85493b3lfifb6bdq4"; depends=[wrapr]; };
   vtree = derive2 { name="vtree"; version="2.0.0"; sha256="1zxsvzbyq6nkghg9dx1zxs2mnxzwv54nv317fh3vq45c6wdj43cn"; depends=[DiagrammeR DiagrammeRsvg rsvg]; };
   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]; };
   wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; };
   wCorr = derive2 { name="wCorr"; version="1.9.1"; sha256="1n4qd11bh0aq80fsw68vfky7nnvgkk6irsfjrknkf9bjvwvihlak"; depends=[minqa mnormt Rcpp RcppArmadillo]; };
@@ -14220,7 +14433,7 @@ in with self; {
   wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; };
   walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; };
   walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; };
-  wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
+  wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; };
   warbleR = derive2 { name="warbleR"; version="1.1.15"; sha256="1vd2yvb1crzxbrbfk8iv31ir09xc646m8glfgqkgazhnj0y6l6yr"; depends=[bioacoustics bitops dtw fftw iterators jpeg maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc soundgen tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
   washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; };
@@ -14274,7 +14487,7 @@ in with self; {
   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.1"; sha256="1pn6jyjr8g22x1hdmikppbh6pqbqwzvlxkh0cp3811ljipsl0qdj"; depends=[ggplot2 scales]; };
+  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.1"; sha256="0vzvbibaxr6baq75ldccv0f3wifabdh9i4qgpmfsn7zv0rypal7v"; depends=[lme4]; };
@@ -14293,6 +14506,7 @@ in with self; {
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
   whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; };
   whitening = derive2 { name="whitening"; version="1.1.1"; sha256="0madrdy2pvr7q4lhznw2kyhs7x927npwmpqwfwkv6v5c4zv7mbjp"; depends=[corpcor]; };
+  whoa = derive2 { name="whoa"; version="0.0.1"; sha256="1gkm3l0kjf52yc6y437dsfx3hc9bfhnb049hm4qii46nr1plz69x"; depends=[dplyr ggplot2 magrittr Rcpp tibble tidyr vcfR viridis]; };
   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]; };
@@ -14301,6 +14515,7 @@ in with self; {
   widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; };
   widyr = derive2 { name="widyr"; version="0.1.1"; sha256="14r1qiq4i7lmn3i76aa0d9wcjw1jclm1jf371j25s92w8z36mdln"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; };
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
+  wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; };
   wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.14"; sha256="00i38py9n4l0iqkn3257a3jbiwh3hrmx1p9x6rfh9sgfcch8yyj5"; depends=[hellno httr jsonlite RColorBrewer rvest stringr xml2]; };
   wikisourcer = derive2 { name="wikisourcer"; version="0.1.4"; sha256="0x6yp7hmrasrxpwlbsabzrr316d5yxynafmv0jh6yhx4i36l08wf"; depends=[magrittr purrr rvest tibble urltools xml2]; };
@@ -14335,7 +14550,7 @@ 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-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
+  wordspace = derive2 { name="wordspace"; version="0.2-5"; sha256="1xrnzq5hmdwdd7692as4ddjkr64bfgl141xx2gvcla308rxql9yp"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
   workflowr = derive2 { name="workflowr"; version="1.4.0"; sha256="1m7x89wmivcpj4p8qi6dlpf25j4r7l5axa602qq1bx0r050hajrm"; depends=[callr fs getPass git2r glue httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; };
   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]; };
@@ -14351,7 +14566,7 @@ in with self; {
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.8.7"; sha256="1z35c2r28cdcvrma4i5mlsabhj8bj16avdb0zypq9rmf0v01s2rv"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.8.9"; sha256="153zs72cpm3phcl74ip4l2lgr65jn41509j3xkh34nala02kd8vw"; 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.1"; sha256="0w4wnpl3yhaqp63p32bk60xrbmd7xd11kxifjbzrghi7d4483a46"; depends=[]; };
@@ -14363,10 +14578,10 @@ in with self; {
   wsyn = derive2 { name="wsyn"; version="1.0.1"; sha256="1lsaah5dndg1myx3qgbm4hih2wr1zgjfaracnyljfrri2cb436n6"; depends=[fields MASS]; };
   wtest = derive2 { name="wtest"; version="3.1"; sha256="1rlas9jn57mcyjic9dhkqj355djldc95q07b076w847cd4pmzqvb"; depends=[]; };
   wtss = derive2 { name="wtss"; version="1.1.0"; sha256="019zvmq4z5xy5dwcf4g0z43x2mb14d1lgqhs1zp6821izffpbd0s"; depends=[jsonlite lubridate RCurl roxygen2 zoo]; };
-  wunderscraper = derive2 { name="wunderscraper"; version="0.1.0"; sha256="1h9nhxvs673n2ivw466qm77k20541cwgmmq35iv3dcb3hvw36p0r"; depends=[httr jsonlite sf tigris]; };
   wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
   wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; };
   wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; };
+  wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.8"; sha256="00zhi7xzay5lppx49j9g18vp4czdzcjajqcy6qf5m4lhxjv2bhw7"; depends=[data_table lubridate tidyr]; };
   x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; };
   x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; };
   x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
@@ -14377,7 +14592,7 @@ 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.10"; sha256="19a08bm7m1i3jyzn9wqrh46z6987dsq3z2p8r8zxyidb4d20k30v"; depends=[htmltools knitr rmarkdown servr xfun]; };
+  xaringan = derive2 { name="xaringan"; version="0.11"; sha256="0020vrfimny7a2wa1v5jkfvb040bp17zr6l2wmz9nl505qlqs2j9"; depends=[htmltools knitr rmarkdown servr xfun]; };
   xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; 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]; };
@@ -14385,18 +14600,19 @@ in with self; {
   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.8"; sha256="05jlbi5byqpw0fkhmmxqglnaxh9gwbcigx77kcpw1pkxnpwfry62"; depends=[]; };
   xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; };
-  xgboost = derive2 { name="xgboost"; version="0.82.1"; sha256="0plhx63wcm4syslzmjfv6bdgaqn96fnav048hrj0vxk4dzgfp8sq"; depends=[data_table magrittr Matrix stringi]; };
+  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=[]; };
   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.0"; sha256="0q5fsd7h067jwh7kgqn534dvnwnbr1xs3iwcpa4ygblp94b50rgm"; 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]; };
   xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
   xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; };
   xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
   xmeta = derive2 { name="xmeta"; version="1.1-4"; sha256="1y9jldi8qn4jpr05g8fnvb23gig180hh36pc2v4y8n8289s9yvg2"; depends=[aod glmmML metafor mvmeta numDeriv]; };
-  xml2 = derive2 { name="xml2"; version="1.2.0"; sha256="154lmksfiwkhnlmryas25mjhfg6k4mmnnk7bbb29mnn5x5pr2yha"; depends=[Rcpp]; };
+  xml2 = derive2 { name="xml2"; version="1.2.1"; sha256="0186d7r36xw1z9f8ajz35a0dz4ch6hmrjl9536yc7vq78v4vn5an"; depends=[Rcpp]; };
   xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.2"; sha256="1npf4ng9d34k56ib1ac4cb3p2x8gqm3jha1sc25nv6546ahcrcjh"; depends=[]; };
   xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; };
   xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; };
@@ -14417,7 +14633,6 @@ 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=[]; };
-  xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; };
   xts = derive2 { name="xts"; version="0.11-2"; sha256="1f0kxrvn13py3hk2gh2m56cqm39x3bqp1i350r5viddacrm2yxqj"; 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]; };
@@ -14447,21 +14662,22 @@ in with self; {
   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.2"; sha256="1m7njjdisbkz8sx4x37w833d7wxvlz1dpxbmyckiigim2ixv8xin"; depends=[MASS miscF NADA truncnorm]; };
+  zCompositions = derive2 { name="zCompositions"; version="1.3.2-1"; sha256="0xd0vgb6hvhxaqjkxwbgjfkx3mly4wkp40vzlsn2dph720vj87b7"; 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]; };
   zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; };
   zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; };
   zeitgebr = derive2 { name="zeitgebr"; version="0.3.3"; sha256="1g2bqc1xx42q54i6ck0ihpxkzw3hmxqn3cvv416afjc0cm45zw8d"; depends=[behavr data_table lomb pracma]; };
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
-  zen4R = derive2 { name="zen4R"; version="0.1"; sha256="0zz2jzalc8r2cs1p92kchhx61s4bfc0vaj9abrp5j42h7ywsvfw3"; depends=[httr jsonlite R6]; };
+  zen4R = derive2 { name="zen4R"; version="0.2"; sha256="064brdzjb42r034mfhwdhq6win6rn5zqwapnbbkk8m7yqbs1xvii"; depends=[httr jsonlite R6 rvest xml2]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
-  zenplots = derive2 { name="zenplots"; version="0.0-4"; sha256="0fr9jxqwnbds2grysyz6j129043dfaakwy6gnsb0c7d2iigj9wjy"; depends=[graph MASS PairViz]; };
+  zenplots = derive2 { name="zenplots"; version="1.0.0"; sha256="0jz7b52caymsw010dbls5rbakkilmkl6jnnhwbizybllnf2dg578"; depends=[graph loon MASS PairViz]; };
   zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; };
   zetadiv = derive2 { name="zetadiv"; version="1.1.1"; sha256="0laxp2pd5s0s9wcnvs1r4shid2gi8ap4y9py6gpl207ywq6cxmgz"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
-  zip = derive2 { name="zip"; version="2.0.2"; sha256="1xvgs7mhxi0sdp5ix4nisqm9lf8f75b7ip7b1hqpq9bzh0x6z8ix"; depends=[]; };
+  zip = derive2 { name="zip"; version="2.0.3"; sha256="0zii05jg9v9ljd0wd67g9x4bhlmpmsy5dzd093sbnc5n3vjbi32a"; depends=[]; };
   zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };

From f3ea1c8238bea544eac14607ac3bdee386718bce Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Wed, 3 Jul 2019 10:40:46 -0400
Subject: [PATCH 419/562] kakoune: 2019.01.20 -> 2019.07.01

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

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 8dfcc485668..065657d16e2 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "kakoune-unwrapped";
-  version = "2019.01.20";
+  version = "2019.07.01";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
     rev = "v${version}";
-    sha256 = "04ak1jm7b1i03sx10z3fxw08rn692y2fj482jn5kpzfzj91b2ila";
+    sha256 = "0jdkldq5rygzc0wcxr1j4fmp2phciy8602ghhf6xq21a9bq2v639";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
     export version="v${version}"
   '';
 
+  doInstallCheckPhase = true;
+  installCheckPhase = ''
+    $out/bin/kak -ui json -E "kill 0"
+  '';
+
   meta = {
     homepage = http://kakoune.org/;
     description = "A vim inspired text editor";

From cd105f02a8ca017e57a61f528a33a24125c35a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Tue, 6 Aug 2019 16:48:47 +0200
Subject: [PATCH 420/562] tilt: 0.9.4 -> 0.9.7

---
 pkgs/applications/networking/cluster/tilt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index f3361f30b21..c4075075299 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,20 +5,20 @@ buildGoPackage rec {
   /* Do not use "dev" as a version. If you do, Tilt will consider itself
      running in development environment and try to serve assets from the
      source tree, which is not there once build completes.  */
-  version = "0.9.4";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner  = "windmilleng";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1n1hys9mwqr4jiwl2z5bi2lgbw4rp800hsavih87xzrda1gzvmad";
+    sha256 = "0b7jk7iwjzdsb2wp9qx4gs9g3gi2vcqw5ilkax3gfz7wsplm0n65";
   };
 
   goPackagePath = "github.com/windmilleng/tilt";
 
   subPackages = [ "cmd/tilt" ];
 
-  buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-23");
+  buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-30");
 
   meta = with stdenv.lib; {
     description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";

From 2e73605c1a926403c3b274e107e747126ff69e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Tue, 6 Aug 2019 17:01:06 +0200
Subject: [PATCH 421/562] kube3d: 1.1.0 -> 1.3.1

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index bc01055244c..c549efa7b40 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "kube3d";
-  version = "1.1.0";
+  version = "1.3.1";
 
   goPackagePath = "github.com/rancher/k3d";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "180q7a95znpkhfqcaw3asqrq22r6ppw98qsggp2wfm746mllg5pc";
+    sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2";
   };
 
   goDeps = ./deps.nix;

From f477658959629afe6340869cfe4b8fbd5a22d3ad Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 6 Aug 2019 17:11:56 +0200
Subject: [PATCH 422/562] grafana: 6.2.5 -> 6.3.0

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 70ba29dfe03..5b9a2192570 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "6.2.5";
+  version = "6.3.0";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -11,12 +11,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "03wign7dkc2a9267mmqicvvzgya0g1i9ygr0dz3jvks2k1yhlv2j";
+    sha256 = "0k95w7j2iq6v82d8701cl2zcszl8qfplpnhjfijr3djahbwbkls3";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "19zc9x1gkmdr7ijsrhrlln5cib20iyx0vgk0z79d8qyhq69nxfs8";
+    sha256 = "01q1d8fpf3dfrc11wzzi9i6939906l4s0kkl9v0c91p3qx3rfni9";
   };
 
   postPatch = ''

From 4bca06ebc53893dc69f9a0ffeff49472f6ccc3f6 Mon Sep 17 00:00:00 2001
From: Gemini Lasswell <gazally@runbox.com>
Date: Tue, 6 Aug 2019 08:18:49 -0700
Subject: [PATCH 423/562] arduino: fix incorrect sha256 in Darwin build

---
 pkgs/development/arduino/arduino-core/downloads.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix
index e71c898dd55..12cc7a6e52c 100644
--- a/pkgs/development/arduino/arduino-core/downloads.nix
+++ b/pkgs/development/arduino/arduino-core/downloads.nix
@@ -132,7 +132,7 @@
   };
   "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl {
     url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2";
-    sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
+    sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z";
   };
   "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl {
     url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip";

From 0b59f4212c0c99e79de47a3d7bfc7375cc509b0a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 14:02:06 -0400
Subject: [PATCH 424/562] pantheon: stylize expressions

The same way we want them in GNOME in nixpkgs.
Didn't touch the greeter expression because I have
a branch where it's already rewritten.
---
 .../apps/elementary-calculator/default.nix    | 21 ++++++++--
 .../apps/elementary-calendar/default.nix      | 29 +++++++++++---
 .../apps/elementary-camera/default.nix        | 25 ++++++++++--
 .../pantheon/apps/elementary-code/default.nix | 32 +++++++++++++---
 .../apps/elementary-files/default.nix         | 33 +++++++++++++---
 .../apps/elementary-music/default.nix         | 36 ++++++++++++++----
 .../apps/elementary-photos/default.nix        | 38 ++++++++++++++++---
 .../elementary-screenshot-tool/default.nix    | 19 ++++++++--
 .../apps/elementary-terminal/default.nix      | 22 +++++++++--
 .../apps/elementary-videos/default.nix        | 21 ++++++++--
 .../apps/switchboard-plugs/a11y/default.nix   | 14 ++++++-
 .../apps/switchboard-plugs/about/default.nix  | 16 +++++++-
 .../applications/default.nix                  | 14 ++++++-
 .../switchboard-plugs/bluetooth/default.nix   | 15 +++++++-
 .../switchboard-plugs/datetime/default.nix    | 17 ++++++++-
 .../switchboard-plugs/display/default.nix     | 14 ++++++-
 .../switchboard-plugs/keyboard/default.nix    | 19 +++++++++-
 .../mouse-touchpad/default.nix                | 18 +++++++--
 .../switchboard-plugs/network/default.nix     | 17 ++++++++-
 .../notifications/default.nix                 | 14 ++++++-
 .../onlineaccounts/default.nix                | 21 ++++++++--
 .../pantheon-shell/default.nix                |  6 ++-
 .../apps/switchboard-plugs/power/default.nix  | 26 ++++++++++---
 .../switchboard-plugs/printers/default.nix    | 15 +++++++-
 .../security-privacy/default.nix              | 25 +++++++++---
 .../switchboard-plugs/sharing/default.nix     | 14 ++++++-
 .../apps/switchboard-plugs/sound/default.nix  | 17 ++++++++-
 .../pantheon/apps/switchboard/default.nix     | 24 ++++++++++--
 .../pantheon/apps/switchboard/wrapper.nix     |  7 +++-
 .../artwork/elementary-gtk-theme/default.nix  |  7 +++-
 .../artwork/elementary-icon-theme/default.nix | 10 ++++-
 .../elementary-redacted-script/default.nix    |  5 ++-
 .../elementary-sound-theme/default.nix        |  8 +++-
 .../artwork/elementary-wallpapers/default.nix |  5 ++-
 .../elementary-default-settings/default.nix   |  5 ++-
 .../elementary-gsettings-schemas/default.nix  | 13 ++++++-
 .../desktop/elementary-print-shim/default.nix | 10 ++++-
 .../elementary-session-settings/default.nix   | 16 +++++++-
 .../elementary-shortcut-overlay/default.nix   | 18 ++++++++-
 .../extra-elementary-contracts/default.nix    |  7 +++-
 .../pantheon/desktop/gala/default.nix         | 33 +++++++++++++---
 .../applications-menu/default.nix             | 29 ++++++++++++--
 .../bluetooth/default.nix                     | 20 ++++++++--
 .../wingpanel-indicators/datetime/default.nix | 24 ++++++++++--
 .../wingpanel-indicators/keyboard/default.nix | 21 ++++++++--
 .../wingpanel-indicators/network/default.nix  | 19 ++++++++--
 .../nightlight/default.nix                    | 17 ++++++++-
 .../notifications/default.nix                 | 17 ++++++++-
 .../wingpanel-indicators/power/default.nix    | 21 ++++++++--
 .../wingpanel-indicators/session/default.nix  | 18 +++++++--
 .../wingpanel-indicators/sound/default.nix    | 23 +++++++++--
 .../pantheon/desktop/wingpanel/default.nix    | 19 +++++++++-
 .../pantheon/desktop/wingpanel/wrapper.nix    |  9 ++++-
 pkgs/desktops/pantheon/granite/default.nix    | 18 ++++++++-
 .../pantheon/services/cerbere/default.nix     | 13 ++++++-
 .../pantheon/services/contractor/default.nix  | 17 ++++++++-
 .../elementary-capnet-assist/default.nix      | 22 +++++++++--
 .../elementary-dpms-helper/default.nix        | 13 ++++++-
 .../pantheon-agent-geoclue2/default.nix       | 16 +++++++-
 .../pantheon-agent-polkit/default.nix         | 14 ++++++-
 pkgs/desktops/pantheon/update.nix             | 20 +++++++++-
 61 files changed, 941 insertions(+), 155 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 2c46466b3a6..bcbe50e5de3 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -1,7 +1,20 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig
-, meson, ninja, vala, desktop-file-utils, libxml2
-, gtk3, python3, granite, libgee, elementary-icon-theme
-, appstream, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, desktop-file-utils
+, libxml2
+, gtk3
+, python3
+, granite
+, libgee
+, elementary-icon-theme
+, appstream
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-calculator";
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index f079f7120e8..b806c085f84 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -1,8 +1,27 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
-, ninja, vala, desktop-file-utils, gtk3, granite, libgee
-, geoclue2, libchamplain, clutter, folks, geocode-glib, python3
-, libnotify, libical, evolution-data-server, appstream-glib
-, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, desktop-file-utils
+, gtk3
+, granite
+, libgee
+, geoclue2
+, libchamplain
+, clutter
+, folks
+, geocode-glib
+, python3
+, libnotify
+, libical
+, evolution-data-server
+, appstream-glib
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-calendar";
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 67c7241c3cc..279e9eff87a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -1,6 +1,25 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
-, desktop-file-utils, python3, gettext, libxml2, gtk3, granite, libgee, gst_all_1
-, libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, desktop-file-utils
+, python3
+, gettext
+, libxml2
+, gtk3
+, granite
+, libgee
+, gst_all_1
+, libcanberra
+, clutter-gtk
+, clutter-gst
+, elementary-icon-theme
+, appstream
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-camera";
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 50e4cb95f77..355f3ea8d0f 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -1,7 +1,29 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
-, python3, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme
-, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup
-, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, python3
+, desktop-file-utils
+, gtk3
+, granite
+, libgee
+, elementary-icon-theme
+, appstream
+, libpeas
+, editorconfig-core-c
+, gtksourceview3
+, gtkspell3
+, libsoup
+, vte
+, webkitgtk
+, zeitgeist
+, ctags
+, libgit2-glib
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
@@ -36,8 +58,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ctags
-    elementary-icon-theme
     editorconfig-core-c
+    elementary-icon-theme
     granite
     gtk3
     gtksourceview3
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 825f663b51e..39924f52c34 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -1,7 +1,29 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala
-, python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify
-, libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking
-, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, gettext
+, vala
+, python3
+, desktop-file-utils
+, libcanberra
+, gtk3
+, libgee
+, granite
+, libnotify
+, libunity
+, pango
+, plank
+, bamf
+, sqlite
+, libdbusmenu-gtk3
+, zeitgeist
+, glib-networking
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
@@ -57,7 +79,8 @@ stdenv.mkDerivation rec {
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
 
-    substituteInPlace filechooser-module/FileChooserDialog.vala --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
+    substituteInPlace filechooser-module/FileChooserDialog.vala \
+      --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index b0ca0e95846..7d235551a80 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -1,9 +1,31 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
-, ninja, vala, desktop-file-utils, gtk3, granite
-, python3, libgee, clutter-gtk, json-glib, libgda, libgpod
-, libnotify, libpeas, libsoup, zeitgeist, gst_all_1, taglib
-, libdbusmenu, libsignon-glib, libaccounts-glib
-, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, desktop-file-utils
+, gtk3
+, granite
+, python3
+, libgee
+, clutter-gtk
+, json-glib
+, libgda
+, libgpod
+, libnotify
+, libpeas
+, libsoup
+, zeitgeist
+, gst_all_1
+, taglib
+, libdbusmenu
+, libsignon-glib
+, libaccounts-glib
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-music";
@@ -51,9 +73,9 @@ stdenv.mkDerivation rec {
     libgda
     libgee
     libgpod
-    libsignon-glib
     libnotify
     libpeas
+    libsignon-glib
     libsoup
     taglib
     zeitgeist
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index b4807c6cf3a..94b6a2fce8e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -1,7 +1,35 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils
-, gtk3, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2
-, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3
-, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, desktop-file-utils
+, gtk3
+, libaccounts-glib
+, libexif
+, libgee
+, geocode-glib
+, gexiv2
+, libgphoto2
+, granite
+, gst_all_1
+, libgudev
+, json-glib
+, libraw
+, librest
+, libsoup
+, sqlite
+, python3
+, scour
+, webkitgtk
+, libwebp
+, appstream
+, libunity
+, wrapGAppsHook
+, elementary-icon-theme
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-photos";
@@ -52,10 +80,10 @@ stdenv.mkDerivation rec {
     libgphoto2
     libgudev
     libraw
+    librest
     libsoup
     libunity
     libwebp
-    librest
     scour
     sqlite
     webkitgtk
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 5cdff0b0ecb..4dd168f25f0 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -1,6 +1,19 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
-, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
-, libcanberra, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, python3
+, desktop-file-utils
+, gtk3
+, granite
+, libgee
+, libcanberra
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index fa80c41a8ce..8bd335c6530 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -1,6 +1,22 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
-, vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee
-, elementary-icon-theme, appstream, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, python3
+, vala
+, desktop-file-utils
+, gtk3
+, libxml2
+, granite
+, libnotify
+, vte
+, libgee
+, elementary-icon-theme
+, appstream
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-terminal";
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index 5f72b9534ff..9132707db2b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3
-, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1
-, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, python3
+, desktop-file-utils
+, gtk3
+, granite
+, libgee
+, clutter-gst
+, clutter-gtk
+, gst_all_1
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-videos";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 859e04eb954..a03594b7b18 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-a11y";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 6d7ecbffa31..bd6df460c04 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -1,5 +1,17 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
-, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, substituteAll
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+, pciutils
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-about";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index 0d7586391ce..dca9cc662a2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja
-, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 547b6d897e4..d1663ad48cd 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, bluez, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, bluez
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-bluetooth";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index e1303a3cc48..fb7ea18e88b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -1,5 +1,18 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig
-, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, substituteAll
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, libxml2
+, switchboard
+, tzdata
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-datetime";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 22fb795297e..c15abfd8cb8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja
-, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-display";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 71f865bdeb6..ba753af7e20 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -1,5 +1,20 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, substituteAll
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, libxml2
+, libgnomekbd
+, libxklavier
+, xorg
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-keyboard";
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 76edfa18add..00579c54525 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
-, libgee, granite, gtk3, switchboard, elementary-settings-daemon }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+, elementary-settings-daemon
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-mouse-touchpad";
@@ -17,7 +28,8 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace src/Views/General.vala --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
+    substituteInPlace src/Views/General.vala \
+      --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
   '';
 
   passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 283a13bd82a..09d6da4f246 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -1,5 +1,18 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala
-, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, substituteAll
+, vala
+, libgee
+, granite
+, gtk3
+, networkmanager
+, networkmanagerapplet
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-network";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index 277f70cf984..e547f22fec1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja
-, pkgconfig, vala, libgee, granite, gtk3, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-notifications";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 496a69ce1f6..aa9cdfa0ddd 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala
-, libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib
-, librest, webkitgtk, libsoup, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, libaccounts-glib
+, libsignon-glib
+, json-glib
+, librest
+, webkitgtk
+, libsoup
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-onlineaccounts";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 57ae3215f5f..b9fad17c2f7 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -50,8 +50,10 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace src/Views/Appearance.vala --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas
-    substituteInPlace src/Views/Appearance.vala --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas
+    substituteInPlace src/Views/Appearance.vala \
+      --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas
+    substituteInPlace src/Views/Appearance.vala \
+      --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas
   '';
 
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 8a56a8535e8..461ddcd3764 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -1,6 +1,20 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja
-, pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon
-, granite, gtk3, dbus, polkit, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, substituteAll
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, elementary-dpms-helper
+, elementary-settings-daemon
+, granite
+, gtk3
+, dbus
+, polkit
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-power";
@@ -44,8 +58,10 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace src/MainView.vala --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas
-    substituteInPlace src/MainView.vala --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
+    substituteInPlace src/MainView.vala \
+      --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas
+    substituteInPlace src/MainView.vala \
+      --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas
   '';
 
   PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 293faad51c7..5c303e04982 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, cups, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, cups
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-printers";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index d35844320a1..19967c3bce0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -1,6 +1,19 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja
-, pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist
-, switchboard, lightlocker }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, python3
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, polkit
+, zeitgeist
+, switchboard
+, lightlocker
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-security-privacy";
@@ -46,8 +59,10 @@ stdenv.mkDerivation rec {
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
 
-    substituteInPlace src/Views/LockPanel.vala --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas
-    substituteInPlace src/Views/FirewallPanel.vala --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
+    substituteInPlace src/Views/LockPanel.vala \
+      --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas
+    substituteInPlace src/Views/FirewallPanel.vala \
+      --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 265352ed881..b4aafb27006 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig
-, vala, libgee, granite, gtk3, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-sharing";
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 907bdc37e2a..ed3518c764f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -1,5 +1,18 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee
-, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, libgee
+, granite
+, gtk3
+, pulseaudio
+, libcanberra
+, libcanberra-gtk3
+, switchboard
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-sound";
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 12edf97f6ba..5c10cc0e9e4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -1,6 +1,20 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja
-, vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity
-, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, gtk3
+, libgee
+, granite
+, gettext
+, clutter-gtk
+, libunity
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "switchboard";
@@ -38,7 +52,9 @@ stdenv.mkDerivation rec {
     libunity
   ];
 
-  patches = [ ./plugs-path-env.patch ];
+  patches = [
+    ./plugs-path-env.patch
+  ];
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index f02f79b15a8..756ae86bb19 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -1,4 +1,9 @@
-{ makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }:
+{ makeWrapper
+, symlinkJoin
+, switchboard
+, switchboardPlugs
+, plugs
+}:
 
 let
   selectedPlugs = if plugs == null then switchboardPlugs else plugs;
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 3c5e3390605..fe9db999bb6 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-gtk-theme";
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 2cc88015f93..bdf42b1c1ef 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, python3
+, ninja
+, hicolor-icon-theme
+, gtk3
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-icon-theme";
diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
index 061feb4b2d9..76bdcf643f8 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, pantheon }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-redacted-script";
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index c01652f97e9..aff830fda56 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-sound-theme";
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 28408dabb9c..30145541750 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, pantheon }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-wallpapers";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 2fcba8fc347..a1a69ee303f 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, pantheon }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-default-settings";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index 2726ea2b936..dbcb992c425 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -1,4 +1,15 @@
-{ stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas
+{ stdenv
+, runCommand
+, mutter
+, elementary-default-settings
+, nixos-artwork
+, glib
+, gala
+, epiphany
+, elementary-settings-daemon
+, gtk3
+, plank
+, gsettings-desktop-schemas
 , extraGSettingsOverrides ? ""
 , extraGSettingsOverridePackages ? []
 }:
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 61afde4d82f..0be2431d33d 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, pkgconfig
+, vala
+, gtk3
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-print-shim";
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 637c3691f68..c262fb37dbc 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -1,4 +1,18 @@
-{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeShellScriptBin, elementary-settings-daemon, runtimeShell }:
+{ stdenv
+, fetchFromGitHub
+, substituteAll
+, writeScript
+, pantheon
+, gnome-keyring
+, gnome-session
+, wingpanel
+, orca
+, at-spi2-core
+, elementary-default-settings
+, writeShellScriptBin
+, elementary-settings-daemon
+, runtimeShell
+}:
 
 let
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index eafe3b4aa20..20b1ac7d353 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -1,5 +1,19 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils
-, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, libxml2
+, desktop-file-utils
+, gtk3
+, glib
+, granite
+, libgee
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-shortcut-overlay";
diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
index 34b8769e56c..973040a8da6 100644
--- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
+++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, substituteAll, fetchFromGitHub, file-roller, gnome-bluetooth }:
+{ stdenv
+, substituteAll
+, fetchFromGitHub
+, file-roller
+, gnome-bluetooth
+}:
 
 stdenv.mkDerivation rec {
   pname = "extra-elementary-contracts";
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 440426c00df..b80e93279c8 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -1,7 +1,28 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
-, desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra
-, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme
-, elementary-settings-daemon, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, desktop-file-utils
+, gettext
+, libxml2
+, gtk3
+, granite
+, libgee
+, bamf
+, libcanberra
+, libcanberra-gtk3
+, gnome-desktop
+, mutter
+, clutter
+, plank
+, elementary-icon-theme
+, elementary-settings-daemon
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "gala";
@@ -48,7 +69,9 @@ stdenv.mkDerivation rec {
     plank
   ];
 
-  patches = [ ./plugins-dir.patch ];
+  patches = [
+    ./plugins-dir.patch
+  ];
 
   postPatch = ''
     chmod +x build-aux/meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 3a497a23b9b..9f40c0f9e58 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,7 +1,28 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3
-, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus
-, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist
-, bc }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, substituteAll
+, meson
+, ninja
+, python3
+, pkgconfig
+, vala
+, granite
+, libgee
+, gettext
+, gtk3
+, appstream
+, gnome-menus
+, json-glib
+, plank
+, bamf
+, switchboard
+, libunity
+, libsoup
+, wingpanel
+, zeitgeist
+, bc
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-applications-menu";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 4d7868a1d14..7e73adcd7e9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -1,6 +1,20 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
-, ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2
-, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, gtk3
+, granite
+, libnotify
+, wingpanel
+, libgee
+, libxml2
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-bluetooth";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 70129690060..1ab3c579e14 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,6 +1,24 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3
-, ninja, vala, gtk3, granite, wingpanel, evolution-data-server
-, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, gtk3
+, granite
+, wingpanel
+, evolution-data-server
+, libical
+, libgee
+, libxml2
+, libsoup
+, elementary-calendar
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-datetime";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index aa63f82c965..00a57cb9943 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
-, substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee
-, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, substituteAll
+, vala
+, gtk3
+, granite
+, libxml2
+, wingpanel
+, libgee
+, xorg
+, libgnomekbd
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-keyboard";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index a201d6864a6..d5ce97df509 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -1,6 +1,19 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
-, gtk3, granite, networkmanager, networkmanagerapplet, wingpanel
-, libgee, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, gtk3
+, granite
+, networkmanager
+, networkmanagerapplet
+, wingpanel
+, libgee
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-network";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index fd4e1cc7e17..0eab02bf8c8 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -1,5 +1,18 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala
-, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, gtk3
+, granite
+, wingpanel
+, libgee
+, libxml2
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-nightlight";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 03369c3ad42..78c901a2306 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -1,5 +1,18 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite
-, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, gtk3
+, granite
+, wingpanel
+, libgee
+, libwnck3
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-notifications";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index a9af53449c9..f63cca74a4d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3
-, ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel
-, libgee, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, gtk3
+, granite
+, bamf
+, libgtop
+, udev
+, wingpanel
+, libgee
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-power";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 61572f07e2e..b363cb5485a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -1,6 +1,18 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
-, ninja, vala, gtk3, granite, wingpanel, accountsservice
-, libgee, elementary-icon-theme, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, gtk3
+, granite
+, wingpanel
+, accountsservice
+, libgee
+, elementary-icon-theme
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-session";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 3e17813fde2..6d0e791d1e4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -1,7 +1,22 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson
-, python3, ninja, vala, gtk3, granite, wingpanel, libnotify
-, pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook
-, elementary-icon-theme }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, gtk3
+, granite
+, wingpanel
+, libnotify
+, pulseaudio
+, libcanberra-gtk3
+, libgee
+, libxml2
+, wrapGAppsHook
+, elementary-icon-theme
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-sound";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index be6c89f9c05..b98c205d491 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -1,5 +1,20 @@
-{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja
-, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3 }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, wrapGAppsHook
+, pkgconfig
+, meson
+, ninja
+, vala
+, gala
+, gtk3
+, libgee
+, granite
+, gettext
+, mutter
+, json-glib
+, python3
+}:
 
 stdenv.mkDerivation rec {
   pname = "wingpanel";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index cfae604d3a5..6b554d89caa 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
@@ -1,4 +1,11 @@
-{ lib, makeWrapper, symlinkJoin, wingpanel, wingpanelIndicators, switchboard-with-plugs, indicators ? null }:
+{ lib
+, makeWrapper
+, symlinkJoin
+, wingpanel
+, wingpanelIndicators
+, switchboard-with-plugs
+, indicators ? null
+}:
 
 let
   selectedIndicators = if indicators == null then wingpanelIndicators else indicators;
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix
index cc612407bf6..7fba9610db0 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/pkgs/desktops/pantheon/granite/default.nix
@@ -1,4 +1,20 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, python3
+, meson
+, ninja
+, vala
+, pkgconfig
+, libgee
+, pantheon
+, gtk3
+, glib
+, gettext
+, hicolor-icon-theme
+, gobject-introspection
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "granite";
diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix
index 28e39464bfa..a8eaf766664 100644
--- a/pkgs/desktops/pantheon/services/cerbere/default.nix
+++ b/pkgs/desktops/pantheon/services/cerbere/default.nix
@@ -1,4 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, glib
+, libgee
+, vala
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "cerbere";
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index d7d3cdb0312..6401b96a2ea 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -1,4 +1,17 @@
-{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, python3
+, ninja
+, pkgconfig
+, vala
+, glib
+, libgee
+, dbus
+, glib-networking
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "contractor";
@@ -33,7 +46,7 @@ stdenv.mkDerivation rec {
     libgee
   ];
 
-  PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "share/dbus-1/services";
+  PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services";
 
   meta = with stdenv.lib; {
     description = "A desktop-wide extension service used by elementary OS";
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 4f8d3e9db42..6305c872b2f 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -1,5 +1,19 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala
-, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, python3
+, ninja
+, vala
+, desktop-file-utils
+, gtk3
+, granite
+, libgee
+, gcr
+, webkitgtk
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-capnet-assist";
@@ -40,7 +54,9 @@ stdenv.mkDerivation rec {
   ];
 
   # Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3
-  patches = [ ./remove-capnet-test.patch ];
+  patches = [
+    ./remove-capnet-test.patch
+  ];
 
   postPatch = ''
     chmod +x meson/post_install.py
diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
index f0ba319d32e..fb9d28eaf6b 100644
--- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
@@ -1,4 +1,14 @@
-{ stdenv, fetchFromGitHub, pantheon, makeWrapper, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, meson
+, ninja
+, desktop-file-utils
+, glib
+, coreutils
+, elementary-settings-daemon
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "elementary-dpms-helper";
@@ -22,7 +32,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    makeWrapper
     meson
     ninja
     wrapGAppsHook
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 79bc4bc6a01..8afbbbeed82 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -1,5 +1,17 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, glib
-, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, glib
+, gtk3
+, libgee
+, desktop-file-utils
+, geoclue2
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "pantheon-agent-geoclue2";
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index d9e5512ce78..53a65ddb947 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja
-, vala, gtk3, libgee, polkit, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, pantheon
+, pkgconfig
+, meson
+, ninja
+, vala
+, gtk3
+, libgee
+, polkit
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "pantheon-agent-polkit";
diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix
index 0162de7349a..50f1fbd4846 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/pkgs/desktops/pantheon/update.nix
@@ -1,5 +1,21 @@
-{ runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }:
-{ repoName, attrPath ? repoName, versionPolicy ? "release" }:
+{ runCommand
+, nix
+, bash
+, git
+, jq
+, nix-prefetch-scripts
+, coreutils
+, common-updater-scripts
+, gnugrep
+, gnused
+, curl
+}:
+
+{ repoName
+, attrPath ? repoName
+, versionPolicy ? "release"
+}:
+
 let
   script = ./update.sh;
 

From 47a9e8783ac34709d31a0f6799d0fac5f3d4268a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 5 Aug 2019 18:19:01 -0400
Subject: [PATCH 425/562] pantheon.updateScript: add a throw

---
 pkgs/desktops/pantheon/update.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix
index 50f1fbd4846..7e9aacc0c2b 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/pkgs/desktops/pantheon/update.nix
@@ -29,6 +29,8 @@ let
     chmod +x $out
   '';
 
-  versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy};
+  throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release).";
+
+  versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag;
 
 in [ updateScript versionFlag repoName attrPath ]

From 4c7dcfddb8b055c58c7902a84a48fcfc25fe899e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 6 Aug 2019 17:27:59 +0200
Subject: [PATCH 426/562] brave: 0.65.118 -> 0.67.123

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 3603e1605f9..dcf3224e207 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "0.65.118";
+  version = "0.67.123";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "13bihzf4yfgn01nrw780swhmcdh8gq71jqilhbi04jn1h1pbm3wg";
+    sha256 = "00kpysk84xwmlwziq7pjizmi2ljgiq45l1x743qkfflxlh0pj21m";
   };
 
   dontConfigure = true;

From 961b83a99de37e31530272cce066ecd2a32a58c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Tue, 6 Aug 2019 17:54:09 +0200
Subject: [PATCH 427/562] Don't use buildOcaml

---
 pkgs/build-support/ocaml/oasis.nix            | 29 ++++++++++++++++---
 .../ocaml-modules/tcslib/default.nix          |  2 +-
 pkgs/top-level/ocaml-packages.nix             |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index 7ad761bde28..ad1ba065ef7 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -1,10 +1,24 @@
-{ buildOcaml, ocaml_oasis }:
+{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild, camlp4 }:
 
-{ buildInputs ? [], ...
+{ name, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
+  minimumOcamlVersion ? null,
+  createFindlibDestdir ? true,
+  dontStrip ? true,
+  hasSharedObjects ? false,
+  setupHook ? null,
+  ...
 }@args:
 
-buildOcaml (args // {
-  buildInputs = [ ocaml_oasis ] ++ buildInputs;
+ assert minimumOcamlVersion != null ->
+          stdenv.lib.versionOlder minimumOcamlVersion ocaml.version;
+
+stdenv.mkDerivation (args // {
+  name = "ocaml-${name}-${version}";
+
+  buildInputs = [ ocaml findlib ocamlbuild camlp4 ocaml_oasis ] ++ buildInputs;
+
+  inherit createFindlibDestdir;
+  inherit dontStrip;
 
   buildPhase = ''
     runHook preBuild
@@ -28,4 +42,11 @@ buildOcaml (args // {
     prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install
     runHook postInstall
   '';
+
+  setupHook = if setupHook == null && hasSharedObjects
+              then stdenv.writeText "setupHook.sh" ''
+              export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
+              ''
+              else setupHook;
+
 })
diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix
index 7eafb2e6993..5e7a7864462 100644
--- a/pkgs/development/ocaml-modules/tcslib/default.nix
+++ b/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -4,7 +4,7 @@ buildOasisPackage rec {
   name = "tcslib";
   version = "0.3";
 
-  minimumSupportedOCamlVersion = "4.03.0";
+  minimumOCamlVersion = "4.03.0";
 
   src = fetchFromGitHub {
     owner  = "tcsprojects";
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1ca56235c65..8eed3e74092 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -12,7 +12,7 @@ let
 
     buildOcaml = callPackage ../build-support/ocaml { };
 
-    buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { buildOcaml = buildOcaml; };
+    buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { };
 
     buildDunePackage = callPackage ../build-support/ocaml/dune.nix {};
 

From 8759ff6cadbf42863a40b562fb28e554c8871976 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 02:49:05 -0700
Subject: [PATCH 428/562] cdo: 1.9.0 -> 1.9.7.1

---
 pkgs/development/libraries/cdo/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix            |  4 +---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix
index af69e23ca1f..2a3dbc7a2d1 100644
--- a/pkgs/development/libraries/cdo/default.nix
+++ b/pkgs/development/libraries/cdo/default.nix
@@ -5,15 +5,15 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.9.0";
-  name = "cdo-${version}";
+  pname = "cdo";
+  version = "1.9.7.1";
 
   # Dependencies
   buildInputs = [ curl netcdf hdf5 ];
 
   src = fetchurl {
-    url = "https://code.mpimet.mpg.de/attachments/download/15187/${name}.tar.gz";
-    sha256 = "024hsr6qfg2dicwvm0vvkg3fr998bchf0qgwpj2v0jmz7a67ydnz";
+    url = "https://code.mpimet.mpg.de/attachments/download/20124/${pname}-${version}.tar.gz";
+    sha256 = "0b4n8dwxfsdbz4jflsx0b75hwapdf1rp14p48dfr7ksv0qp9aw9p";
   };
 
  # Configure phase
@@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional (enable_all_static) "--enable-all-static"
    ++ stdenv.lib.optional (enable_cxx) "--enable-cxx";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
     longDescription = ''
       Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG.
       There are more than 600 operators available.
     '';
     homepage = https://code.mpimet.mpg.de/projects/cdo/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.ltavard ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ltavard ];
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77563721c58..46843a5c3b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10204,9 +10204,7 @@ in
 
   cdk = callPackage ../development/libraries/cdk {};
 
-  cdo = callPackage ../development/libraries/cdo {
-    stdenv = gccStdenv;
-  };
+  cdo = callPackage ../development/libraries/cdo { };
 
   cimg = callPackage  ../development/libraries/cimg { };
 

From 2bd649b152895199fb5cc22a715f1ef5a3c34330 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 6 Aug 2019 13:07:57 -0400
Subject: [PATCH 429/562] virtualbox: use wrapQtAppsHook

Fixes #66200

See: #65399
---
 .../virtualization/virtualbox/default.nix     | 28 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index b36d918a803..1a6ba5ac527 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,7 +1,7 @@
-{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2
-, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL
-, libpng, glib, lvm2, libXrandr, libXinerama, libopus
-, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
+{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook
+, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
+, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
+, qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, nettools, dbus
 , makeself, perl
 , javaBindings ? true, jdk ? null # Almost doesn't affect closure size
@@ -33,7 +33,11 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "modsrc" ];
 
-  nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ];
+  nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]
+    ++ optional (!headless) wrapQtAppsHook;
+
+  # Wrap manually because we just need to wrap one executable
+  dontWrapQtApps = true;
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
@@ -43,7 +47,7 @@ in stdenv.mkDerivation {
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
     ++ optionals (headless) [ libXrandr libGL ]
-    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
+    ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ];
 
   hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
 
@@ -53,7 +57,7 @@ in stdenv.mkDerivation {
         -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
         -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
         ${optionalString (!headless) ''
-        -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \
+        -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
         ''} -i configure
     ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
@@ -105,9 +109,9 @@ in stdenv.mkDerivation {
     VBOX_JAVA_HOME                 := ${jdk}
     ''}
     ${optionalString (!headless) ''
-    PATH_QT5_X11_EXTRAS_LIB        := ${getLib qt5.qtx11extras}/lib
-    PATH_QT5_X11_EXTRAS_INC        := ${getDev qt5.qtx11extras}/include
-    TOOL_QT5_LRC                   := ${getDev qt5.qttools}/bin/lrelease
+    PATH_QT5_X11_EXTRAS_LIB        := ${getLib qtx11extras}/lib
+    PATH_QT5_X11_EXTRAS_INC        := ${getDev qtx11extras}/include
+    TOOL_QT5_LRC                   := ${getDev qttools}/bin/lrelease
     ''}
     LOCAL_CONFIG
 
@@ -177,6 +181,10 @@ in stdenv.mkDerivation {
     cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
   '';
 
+  preFixup = optionalString (!headless) ''
+    wrapQtApp $out/bin/VirtualBox
+  '';
+
   passthru = {
     inherit version;       # for guest additions
     inherit extensionPack; # for inclusion in profile to prevent gc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c731baa090..3c9adcdd038 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20935,7 +20935,7 @@ in
 
   virtscreen = callPackage ../tools/admin/virtscreen {};
 
-  virtualbox = callPackage ../applications/virtualization/virtualbox {
+  virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
     stdenv = stdenv_32bit;
     inherit (gnome2) libIDL;
   };

From 7c7d867ac8997b8fb66c9b1476264c015078b080 Mon Sep 17 00:00:00 2001
From: Taran Lynn <taranlynn0@gmail.com>
Date: Tue, 6 Aug 2019 09:34:40 -0700
Subject: [PATCH 430/562] kdenlive: add missing dependencies

breeze is needed for UI elements, frei0r for effects, and ffmpeg-full
for ffplay to handle playback.
---
 pkgs/applications/kde/kdenlive.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index a42210e6e40..fa75dd1eb97 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -1,6 +1,8 @@
 { mkDerivation
 , lib
 , extra-cmake-modules
+, breeze-icons
+, breeze-qt5
 , kdoctools
 , kconfig
 , kcrash
@@ -19,7 +21,8 @@
 , shared-mime-info
 , libv4l
 , kfilemetadata
-, ffmpeg
+, ffmpeg-full
+, frei0r
 , phonon-backend-gstreamer
 , qtdeclarative
 , qtquickcontrols
@@ -37,6 +40,8 @@ mkDerivation {
     kdoctools
   ];
   buildInputs = [
+    breeze-icons
+    breeze-qt5
     kconfig
     kcrash
     kdbusaddons
@@ -59,7 +64,8 @@ mkDerivation {
     qtwebkit
     shared-mime-info
     libv4l
-    ffmpeg
+    ffmpeg-full
+    frei0r
     rttr
     kpurpose
     kdeclarative

From 4e6253392cef3007057d264d8e999e2fcd0aa72e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 6 Aug 2019 12:48:58 -0500
Subject: [PATCH 431/562] terracognita: init at 0.1.6 (#66203)

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

diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix
new file mode 100644
index 00000000000..832a2285569
--- /dev/null
+++ b/pkgs/development/tools/misc/terracognita/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "terracognita";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "cycloidio";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ljh9dyn919k5f0yaca5an2vczj8cd5cb6qb4i5bdgmlh3wijiag";
+  };
+
+  modSha256 = "1ssz6rhdqma79x75qsxpa9is5zw1nlc0rv1h23dfsk8vla3p84ml";
+
+  meta = with lib; {
+    description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
+    homepage = "https://github.com/cycloidio/terracognita";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3769a829c83..8b1bbb5a7f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9919,6 +9919,8 @@ in
 
   teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { };
 
+  terracognita = callPackage ../development/tools/misc/terracognita { };
+
   terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };

From 31541d097d6091e903f89a3af7ce486f2b37dfa1 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 6 Aug 2019 20:06:22 +0200
Subject: [PATCH 432/562] xmr-stak: does not support ARM

Reference: https://github.com/fireice-uk/xmr-stak/issues/2427#issuecomment-488564897
---
 pkgs/applications/misc/xmr-stak/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index f47cafeb59b..be42127e254 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -40,6 +40,7 @@ stdenv'.mkDerivation rec {
     description = "Unified All-in-one Monero miner";
     homepage = "https://github.com/fireice-uk/xmr-stak";
     license = licenses.gpl3Plus;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ fpletz bfortz ];
   };
 }

From e383d992449db46444237422b316e6b37d528217 Mon Sep 17 00:00:00 2001
From: Xavier Vello <xavier.vello@gmail.com>
Date: Tue, 6 Aug 2019 21:53:30 +0200
Subject: [PATCH 433/562] Add bluez-qt as an explicit dependency of plasma5

When bluetooth is enabled, we install bluedevil, but
its applet cannot work without the qml components in
bluez-qt.

Superseedes #65440 that failed to address the issue.
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 6d148fba895..94a307ae100 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -178,7 +178,7 @@ in
         ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc
 
         # Optional hardware support features
-        ++ lib.optional config.hardware.bluetooth.enable bluedevil
+        ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ]
         ++ lib.optional config.networking.networkmanager.enable plasma-nm
         ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
         ++ lib.optional config.powerManagement.enable powerdevil

From 58b1a92f0825f729875cd874c5eef4ae604f91f0 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 6 Aug 2019 16:04:24 -0400
Subject: [PATCH 434/562] simgear: 2018.3.1 -> 2019.1.1

---
 .../development/libraries/simgear/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 11612eeb288..471bcb22234 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -3,26 +3,29 @@
 , openscenegraph, openal, expat, cmake, apr
 , curl
 }:
-
+let
+  version = "2019.1.1";
+  shortVersion = builtins.substring 0 6 version;
+in
 stdenv.mkDerivation rec {
-  name = "simgear-${version}";
-  version = "2018.3.1";
-  shortVersion = "2018.3";
+  pname = "simgear";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "0sm0v8v1sw5xzkzhf0gzh6fwx93hd62h5lm9s9hgci40x7480i99";
+    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
+    sha256 = "12sl18limlj61hlwl3bcv5ysfdpsjmd07cxchhf9xa8shk6d87i0";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [ plib freeglut xorgproto libX11 libXext libXi
                   libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut
-                  openscenegraph openal expat cmake apr curl ];
+                  openscenegraph openal expat apr curl ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Simulation construction toolkit";
-    homepage = https://gitorious.org/fg/simgear;
+    homepage = "https://gitorious.org/fg/simgear";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.lgpl2;

From 5ab179b44569337938d884c3dd6a83df5ecf9cbe Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Tue, 6 Aug 2019 22:26:00 +0200
Subject: [PATCH 435/562] openjfx: fix build

---
 pkgs/development/compilers/openjdk/openjfx/11.nix | 2 +-
 pkgs/development/compilers/openjdk/openjfx/12.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index a2b28d2dbf8..223feb1e2a1 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -7,7 +7,7 @@ let
   build = "1";
   repover = "${major}${update}+${build}";
   gradle_ = (gradleGen.override {
-    jdk = bootjdk;
+    java = bootjdk;
   }).gradle_4_10;
 
   makePackage = args: stdenv.mkDerivation ({
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix
index 283bd8f9e20..266dd7f334e 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/12.nix
@@ -7,7 +7,7 @@ let
   build = "14";
   repover = "${major}${update}+${build}";
   gradle_ = (gradleGen.override {
-    jdk = bootjdk;
+    java = bootjdk;
   }).gradle_4_10;
 
   makePackage = args: stdenv.mkDerivation ({

From bbb60140524124c0efe9cd0b311b7de8a8ec00d6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 6 Aug 2019 20:58:07 +0000
Subject: [PATCH 436/562] arangodb_3_5: fix build on aarch64 and vanilla x86_64

---
 pkgs/servers/nosql/arangodb/default.nix | 34 ++++++++++++-------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 5db737dbeba..11695d753e2 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }:
 
 let
-  common = { version, sha256, platforms }: stdenv.mkDerivation {
+  common = { version, sha256 }: stdenv.mkDerivation {
     pname = "arangodb";
     inherit version;
 
@@ -29,20 +29,18 @@ let
     '';
 
     cmakeFlags = [
-      # do not set GCC's -march=xxx based on builder's /proc/cpuifo
-      # `stdenv.hostPlatform.platform.gcc.arch` goes to -march= the usual way
+      # do not set GCC's -march=xxx based on builder's /proc/cpuinfo
       "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF"
       # also avoid using builder's /proc/cpuinfo
-      "-DHAVE_SSE42=${ { "westmere"       = "ON";
-                         "sandybridge"    = "ON";
-                         "ivybridge"      = "ON";
-                         "haswell"        = "ON";
-                         "broadwell"      = "ON";
-                         "skylake"        = "ON";
-                         "skylake-avx512" = "ON";
-                       }.${stdenv.hostPlatform.platform.gcc.arch or ""} or "OFF"
-                     }"
-    ];
+    ] ++
+    { "westmere"       = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+      "sandybridge"    = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+      "ivybridge"      = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+      "haswell"        = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+      "broadwell"      = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+      "skylake"        = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+      "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
+    }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ];
 
     enableParallelBuilding = true;
 
@@ -50,13 +48,13 @@ let
       homepage = https://www.arangodb.com;
       description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
       license = licenses.asl20;
-      inherit platforms;
+      platforms = platforms.linux;
       maintainers = [ maintainers.flosse ];
     };
   };
 in {
-  arangodb_3_2 = common { version = "3.2.18";     sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; platforms = lib.platforms.linux; };
-  arangodb_3_3 = common { version = "3.3.23.1";   sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; platforms = lib.platforms.linux; };
-  arangodb_3_4 = common { version = "3.4.7";      sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; platforms = lib.platforms.linux; };
-  arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; platforms = [ "x86_64-linux" ];  }; # "aarch64-linux" fails with "fatal error: x86intrin.h: No such file or directory"
+  arangodb_3_2 = common { version = "3.2.18";     sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; };
+  arangodb_3_3 = common { version = "3.3.23.1";   sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; };
+  arangodb_3_4 = common { version = "3.4.7";      sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; };
+  arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; };
 }

From c72d4f947c6b727448c03674e9f279d225820f96 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 6 Aug 2019 16:06:40 -0400
Subject: [PATCH 437/562] flightgear: 2018.3.1 -> 2019.1.1

---
 pkgs/games/flightgear/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 9765a9c06ee..5a04e75030f 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, fetchurl, wrapQtAppsHook
 , freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib
 , libSM, libunwind, libX11, xorgproto, libXext, libXi
 , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
@@ -6,14 +6,14 @@
 }:
 
 let
-  version = "2018.3.1";
-  shortVersion = "2018.3";
+  version = "2019.1.1";
+  shortVersion = builtins.substring 0 6 version;
   data = stdenv.mkDerivation rec {
     name = "flightgear-base-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
-      sha256 = "1h69ifj84l4k0f497ybk51xj3bprzw4xvwrwzzj708zhkjk78fmh";
+      sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf";
     };
 
     phases = [ "installPhase" ];
@@ -25,13 +25,13 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "flightgear-${version}";
+  pname = "flightgear";
    # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src`
   inherit version data;
 
   src = fetchurl {
-    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "0h56npn00b6fd38cf5cha82nnglxmhd12b7h2rn3gjymwhviyjix";
+    url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
+    sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
     categories = "Game;Simulation";
   };
 
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
   buildInputs = [
-    makeWrapper
     freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib
     libSM libunwind libX11 xorgproto libXext libXi
-    libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase
+    libXmu libXt simgear zlib boost libpng udev fltk13 apr qtbase
     glew qtdeclarative
   ];
 
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   '';
 
   qtWrapperArgs = [
-    ''--set FG_ROOT "${data}/share/FlightGear"''
+    "--set FG_ROOT ${data}/share/FlightGear"
   ];
 
   enableParallelBuilding = true;

From ad9e905ecc581997152752c590b2636e3f067f1e Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 6 Aug 2019 16:09:31 -0400
Subject: [PATCH 438/562] speed-dreams: 2.2.1-r6404 -> 2.2.2-r6553

---
 pkgs/games/speed-dreams/default.nix | 36 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index 2556aa49b4c..17cb57d3fdb 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -1,29 +1,33 @@
 { fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto,
 libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat,
-libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell }:
+libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }:
 
+let
+  version = "2.2.2-r6553";
+  shortVersion = builtins.substring 0 5 version;
+in
 stdenv.mkDerivation rec {
-  version = "2.2.1-r6404";
-  name = "speed-dreams-${version}";
+  inherit version;
+  pname = "speed-dreams";
 
   src = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-base-${version}.tar.xz";
-    sha256 = "0347sk8xbdsyvl48qybbycd7hvzsx5b37zzjx1yx73nzddhmlpbx";
+    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz";
+    sha256 = "1l47d2619kpfkvdwbkwr311qss6jjfwvgl5h9z2w3bwdgz0mbaij";
   };
 
   cars-and-tracks = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
-    sha256 = "1h50l110n42nrq6j3kcyhi3swgmrjcg979vb6h0zsf46afwv0z3q";
+    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
+    sha256 = "0l8ba5pzqqcfy4inyxy2lrrhhgfs43xab7fy751xz2xqpqpfksyq";
   };
 
   more-cars-and-tracks = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
-    sha256 = "03m3gwd03jqgsfjdglzmrv613cp4gh50i63fwmnwl282zhxydcwd";
+    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
+    sha256 = "10w180mhhk6dw4cza6mqa0hp5qgym9lcizfwykqbgcvs01yl2yqb";
   };
 
   wip-cars-and-tracks = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
-    sha256 = "0ysk756rd294xzpwvmjh0mb229ngzrc4ry9lpyhyak98rbcp9hxm";
+    url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
+    sha256 = "1wad9yaydaryhyi7ckyaii124h0z7kziqgcl475a5jr7ggbxc24q";
   };
 
   sourceRoot = ".";
@@ -35,12 +39,6 @@ stdenv.mkDerivation rec {
     tar -xf ${wip-cars-and-tracks}
   '';
 
-  prePatch = ''
-    # https://sourceforge.net/p/speed-dreams/mailman/message/35665539/
-    sed -i "s|lastSlash = '\\\0'|lastSlash = NULL|" src/libs/tgf/params.cpp
-    sed -i "s|const char\* error = '\\\0'|const char\* error = NULL|" src/libs/tgfclient/openalmusicplayer.cpp
-  '';
-
   preBuild = ''
     make -C src/libs/portability
     make -C src/libs/portability portability.o
@@ -62,11 +60,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xorgproto
     libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat
-    SDL2 enet libjpeg openscenegraph libvorbis ];
+    SDL2 enet libjpeg openscenegraph libvorbis curl ];
 
   meta = {
     description = "Car racing game - TORCS fork with more experimental approach";
-    homepage = http://speed-dreams.sourceforge.net/;
+    homepage = "http://speed-dreams.sourceforge.net/";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [raskin];
     platforms = stdenv.lib.platforms.linux;

From d2a1ae92442e2662b7a4198c82622ece371f0fd8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 6 Aug 2019 16:11:27 -0400
Subject: [PATCH 439/562] openscenegraph: drop 3.4.x

---
 .../libraries/openscenegraph/3.4.0.nix        | 39 -------------------
 pkgs/top-level/all-packages.nix               |  6 +--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/libraries/openscenegraph/3.4.0.nix

diff --git a/pkgs/development/libraries/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix
deleted file mode 100644
index 8d083904189..00000000000
--- a/pkgs/development/libraries/openscenegraph/3.4.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
-, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
-, cairo, poppler, librsvg, libpng, libtiff, libXrandr
-, xineLib, boost
-, withApps ? false
-, withSDL ? false, SDL
-, withQt4 ? false, qt4
-}:
-
-stdenv.mkDerivation rec {
-  name = "openscenegraph-${version}";
-  version = "3.4.0";
-
-  src = fetchurl {
-    url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
-    sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
-  };
-
-  nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
-
-  buildInputs = [
-    freetype libjpeg jasper libxml2 zlib gdal curl libX11
-    cairo poppler librsvg libpng libtiff libXrandr boost
-    xineLib
-  ] ++ lib.optional withSDL SDL
-    ++ lib.optional withQt4 qt4;
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
-
-  meta = with stdenv.lib; {
-    description = "A 3D graphics toolkit";
-    homepage = http://www.openscenegraph.org/;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-    license = "OpenSceneGraph Public License - free LGPL-based license";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 405835df1fa..4bc5cffc984 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12730,7 +12730,6 @@ in
   opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph { };
-  openscenegraph_3_4 = callPackage ../development/libraries/openscenegraph/3.4.0.nix { };
 
   openslp = callPackage ../development/libraries/openslp {};
 
@@ -13342,7 +13341,7 @@ in
     inherit (darwin.apple_sdk.frameworks) GLUT;
   };
 
-  simgear = callPackage ../development/libraries/simgear { openscenegraph = openscenegraph_3_4; };
+  simgear = callPackage ../development/libraries/simgear { };
 
   simp_le = callPackage ../tools/admin/simp_le { };
 
@@ -21804,7 +21803,7 @@ in
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = libsForQt5.callPackage ../games/flightgear { openscenegraph = openscenegraph_3_4; };
+  flightgear = libsForQt5.callPackage ../games/flightgear { };
 
   flock = callPackage ../development/tools/flock { };
 
@@ -22282,7 +22281,6 @@ in
     # Torcs wants to make shared libraries linked with plib libraries (it provides static).
     # i686 is the only platform I know than can do that linking without plib built with -fPIC
     libpng = libpng12;
-    openscenegraph = openscenegraph_3_4;
   };
 
   torcs = callPackage ../games/torcs { };

From 7c854aa974670b5ff1f707ad80ff0ccaf1d54b9f Mon Sep 17 00:00:00 2001
From: Patrick Chilton <chpatrick@gmail.com>
Date: Tue, 25 Jun 2019 23:58:20 +0200
Subject: [PATCH 440/562] nixos/gdm: add autoSuspend option

---
 .../services/x11/display-managers/gdm.nix     | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index ff4b91923e0..3f1669d0851 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -96,6 +96,14 @@ in
         type = types.bool;
       };
 
+      autoSuspend = mkOption {
+        default = true;
+        description = ''
+          Suspend the machine after inactivity.
+        '';
+        type = types.bool;
+      };
+
     };
 
   };
@@ -176,10 +184,40 @@ in
 
     systemd.user.services.dbus.wantedBy = [ "default.target" ];
 
-    programs.dconf.profiles.gdm = pkgs.writeText "dconf-gdm-profile" ''
-      system-db:local
-      ${gdm}/share/dconf/profile/gdm
-    '';
+    programs.dconf.profiles.gdm =
+    let
+      customDconf = pkgs.writeTextFile {
+        name = "gdm-dconf";
+        destination = "/dconf/gdm-custom";
+        text = ''
+          ${optionalString (!cfg.gdm.autoSuspend) ''
+            [org/gnome/settings-daemon/plugins/power]
+            sleep-inactive-ac-type='nothing'
+            sleep-inactive-battery-type='nothing'
+            sleep-inactive-ac-timeout=0
+            sleep-inactive-battery-timeout=0
+          ''}
+        '';
+      };
+
+      customDconfDb = pkgs.stdenv.mkDerivation {
+        name = "gdm-dconf-db";
+        buildCommand = ''
+          ${pkgs.gnome3.dconf}/bin/dconf compile $out ${customDconf}/dconf
+        '';
+      };
+    in pkgs.stdenv.mkDerivation {
+      name = "dconf-gdm-profile";
+      buildCommand = ''
+        # Check that the GDM profile starts with what we expect.
+        if [ $(head -n 1 ${gdm}/share/dconf/profile/gdm) != "user-db:user" ]; then
+          echo "GDM dconf profile changed, please update gdm.nix"
+          exit 1
+        fi
+        # Insert our custom DB behind it.
+        sed '2ifile-db:${customDconfDb}' ${gdm}/share/dconf/profile/gdm > $out
+      '';
+    };
 
     # Use AutomaticLogin if delay is zero, because it's immediate.
     # Otherwise with TimedLogin with zero seconds the prompt is still

From 9037a5acc221cd58740182911702adde020a729e Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Tue, 6 Aug 2019 18:16:19 -0400
Subject: [PATCH 441/562] cht.sh: unstable-2018-11-02 -> unstable-2019-08-06

- Bump cht.sh to unstable-2019-08-06
- Add bash and zsh completions
---
 pkgs/tools/misc/cht.sh/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index 837bc0e9ed7..c81a3d5d25d 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -9,15 +9,15 @@
 
 stdenv.mkDerivation rec {
   name = "cht.sh-${version}";
-  version = "unstable-2018-11-02";
+  version = "unstable-2019-08-06";
 
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchFromGitHub {
     owner = "chubin";
     repo = "cheat.sh";
-    rev = "9595805ac68b3c096f7c51fa024dcb97a7dfac44";
-    sha256 = "11g8say5fksg0zg0bqrgl92rprn4lwp20g9rz1i0r38f0jy3nyrf";
+    rev = "f507ba51d6bc1ae6c7df808cadbe4f8603951b6b";
+    sha256 = "0r7x9a3qzzkbd1m5zdlkpmhx0p7b7ja42190s7fidls3dsm710g0";
   };
 
   # Fix ".cht.sh-wrapped" in the help message
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -m755 -D share/cht.sh.txt "$out/bin/cht.sh"
+
+    # install shell completion files
+    mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
+    mv share/bash_completion.txt $out/share/bash-completion/completions/cht.sh
+    cp share/zsh.txt $out/share/zsh/site-functions/_cht
+
     wrapProgram "$out/bin/cht.sh" \
       --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}"
   '';

From 1632c09e237b1e9e418c439d046cca8c1057a8d7 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Tue, 6 Aug 2019 18:38:55 -0400
Subject: [PATCH 442/562] Add evanjs to maintainers

- Add evanjs to maintainer list
- Add evanjs to maintainers for cht.sh
---
 maintainers/maintainer-list.nix    | 5 +++++
 pkgs/tools/misc/cht.sh/default.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 23168ff16e9..dfdbd78fb46 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1698,6 +1698,11 @@
       fingerprint = "67FE 98F2 8C44 CF22 1828  E12F D57E FA62 5C9A 925F";
     }];
   };
+  evanjs = {
+    email = "evanjsx@gmail.com";
+    github = "evanjs";
+    name = "Evan Stoll";
+  };
   evck = {
     email = "eric@evenchick.com";
     github = "ericevenchick";
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix
index c81a3d5d25d..48ce782536f 100644
--- a/pkgs/tools/misc/cht.sh/default.nix
+++ b/pkgs/tools/misc/cht.sh/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "CLI client for cheat.sh, a community driven cheat sheet";
     license = licenses.mit;
-    maintainers = with maintainers; [ fgaz ];
+    maintainers = with maintainers; [ fgaz evanjs ];
     homepage = https://github.com/chubin/cheat.sh;
   };
 }

From a0e09b9542d8329c39d245f5bd712e13c659bcc0 Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Tue, 6 Aug 2019 19:47:15 -0400
Subject: [PATCH 443/562] protontricks: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index ae8dfc59075..2683192c89e 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonApplication rec {
   pname = "protontricks";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "Matoking";
     repo = pname;
     rev = version;
-    sha256 = "1v7bgr1rkm8j99s5bv45cslw01qcx8i8zb6ysfrb53qz86zgkgsn";
+    sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4";
   };
 
   propagatedBuildInputs = [ vdf ];

From 4cd4e54f424e6e8d32a6f7ee16346c1fa839ac5d Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Tue, 6 Aug 2019 19:49:32 -0400
Subject: [PATCH 444/562] pythonPackages.vdf: 3.1 -> 3.2

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

diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix
index 1c924d8973d..2ce3e24f4cd 100644
--- a/pkgs/development/python-modules/vdf/default.nix
+++ b/pkgs/development/python-modules/vdf/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "vdf";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "ValvePython";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19xqjq2159w2l9vaxlkickvy3zksp9ssdkvbfcfggxz31miwp1zr";
+    sha256 = "08rb982hcwc9pr9gl0zfk9266h84fwbz097qjfkss3srwghr1247";
   };
 
   checkInputs = [ pytest pytestcov mock ];

From ff536181d3f8550d5e384e39038a26704799eaf2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 18:55:42 -0700
Subject: [PATCH 445/562] pythonPackages.vega_datasets: fix build

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

diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix
index af1489df035..2d3dda551fb 100644
--- a/pkgs/development/python-modules/vega_datasets/default.nix
+++ b/pkgs/development/python-modules/vega_datasets/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
 
   checkPhase = ''
-    py.test vega_datasets --doctest-modules
+    py.test vega_datasets --doctest-modules -k 'not column_names'
   '';
 
   meta = with lib; {

From 72bda5bdcc3b0425f92003e79dd860fc0b1a5617 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 6 Aug 2019 19:00:18 -0700
Subject: [PATCH 446/562] pythonPackages.altair: 3.1.0 -> 3.2.0

---
 .../python-modules/altair/default.nix         | 50 +++++++++++++------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index 4d78ad80cc3..344a724756e 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -1,30 +1,52 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales
-, entrypoints, jsonschema, numpy, pandas, six, toolz, typing
-, pythonOlder, recommonmark }:
+, entrypoints
+, glibcLocales
+, ipython
+, jinja2
+, jsonschema
+, numpy
+, pandas
+, pytest
+, pythonOlder
+, recommonmark
+, six
+, sphinx
+, toolz
+, typing
+, vega_datasets
+}:
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zdznkybw3g8fd280h5j5cnnwcv30610gp8fl8vwqda1w2p6pgvp";
+    sha256 = "098macm0sw54xqijdy1c8cppcgw79wn52qdc71qqb51nibc17gls";
   };
 
-  postPatch = ''
-    # Tests require network
-    rm altair/examples/boxplot_max_min.py altair/examples/line_percent.py
-  '';
+  propagatedBuildInputs = [
+    entrypoints
+    jsonschema
+    numpy
+    pandas
+    six
+    toolz
+  ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
 
-  checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
-
-  propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ]
-    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+  checkInputs = [
+    glibcLocales
+    ipython
+    jinja2
+    pytest
+    recommonmark
+    sphinx
+    vega_datasets
+  ];
 
   checkPhase = ''
     export LANG=en_US.UTF-8
-    py.test altair --doctest-modules
+    pytest --doctest-modules altair
   '';
 
   meta = with stdenv.lib; {

From 293c2885fe0fc1eb4e328757ff3b462d115202b1 Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Tue, 6 Aug 2019 22:15:16 -0400
Subject: [PATCH 447/562] qbittorrent: 4.1.6 -> 4.1.7

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

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 9696c55bd86..9d2ac8ed384 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.1.6";
+  version = "4.1.7";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "1y9kv84sy5fg64wbl4xpm8qh0hjba7ibk045cazp0m736rjmxk8c";
+    sha256 = "1z4k64h3ik1a7ir4v9g3ar1wq8zfh4r2pq43hr2wvlamm2111gdv";
   };
 
   # NOTE: 2018-05-31: CMake is working but it is not officially supported

From 6e6c1448faaf4d8fd131ac1cde221eeb3813573d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Wed, 7 Aug 2019 06:51:36 +0200
Subject: [PATCH 448/562] Suggested edits

---
 pkgs/build-support/ocaml/oasis.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index ad1ba065ef7..00f75c76597 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -1,11 +1,9 @@
-{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild, camlp4 }:
+{ stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
 
 { name, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
   minimumOcamlVersion ? null,
   createFindlibDestdir ? true,
   dontStrip ? true,
-  hasSharedObjects ? false,
-  setupHook ? null,
   ...
 }@args:
 
@@ -13,9 +11,9 @@
           stdenv.lib.versionOlder minimumOcamlVersion ocaml.version;
 
 stdenv.mkDerivation (args // {
-  name = "ocaml-${name}-${version}";
+  name = "ocaml${ocaml.version}-${name}-${version}";
 
-  buildInputs = [ ocaml findlib ocamlbuild camlp4 ocaml_oasis ] ++ buildInputs;
+  buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis ] ++ buildInputs;
 
   inherit createFindlibDestdir;
   inherit dontStrip;
@@ -43,10 +41,4 @@ stdenv.mkDerivation (args // {
     runHook postInstall
   '';
 
-  setupHook = if setupHook == null && hasSharedObjects
-              then stdenv.writeText "setupHook.sh" ''
-              export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
-              ''
-              else setupHook;
-
 })

From b1f0e3ebc55ea8bde2806d83896e0f14db73a410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Wed, 7 Aug 2019 09:50:46 +0200
Subject: [PATCH 449/562] Suggested edits

---
 pkgs/build-support/ocaml/oasis.nix                | 12 +++++++-----
 pkgs/development/ocaml-modules/tcslib/default.nix |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index 00f75c76597..74977486f2f 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -1,17 +1,19 @@
 { stdenv, ocaml_oasis, ocaml, findlib, ocamlbuild }:
 
-{ name, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
-  minimumOcamlVersion ? null,
+{ pname, version, buildInputs ? [], meta ? { platforms = ocaml.meta.platforms or []; },
+  minimumOCamlVersion ? null,
   createFindlibDestdir ? true,
   dontStrip ? true,
   ...
 }@args:
 
- assert minimumOcamlVersion != null ->
-          stdenv.lib.versionOlder minimumOcamlVersion ocaml.version;
+if args ? minimumOCamlVersion &&
+   ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
+then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation (args // {
-  name = "ocaml${ocaml.version}-${name}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis ] ++ buildInputs;
 
diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix
index 5e7a7864462..9d1d5a8096c 100644
--- a/pkgs/development/ocaml-modules/tcslib/default.nix
+++ b/pkgs/development/ocaml-modules/tcslib/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }:
 
 buildOasisPackage rec {
-  name = "tcslib";
+  pname = "tcslib";
   version = "0.3";
 
   minimumOCamlVersion = "4.03.0";

From b1bd9fc47fc3fe7c680ff4a83e36a2d0d5baa16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Wed, 10 Jul 2019 13:14:24 +0200
Subject: [PATCH 450/562] vcv-rack: 0.6.2b -> 1.1.3

---
 pkgs/applications/audio/vcv-rack/default.nix  | 33 ++++++++++---------
 pkgs/applications/audio/vcv-rack/glfw.patch   | 13 ++++++++
 .../vcv-rack/rack-minimize-vendoring.patch    | 14 ++++++++
 3 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/applications/audio/vcv-rack/glfw.patch
 create mode 100644 pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 15935751c32..2e55306029f 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -5,13 +5,18 @@
 let
   glfw-git = glfw.overrideAttrs (oldAttrs: rec {
     name = "glfw-git-${version}";
-    version = "unstable-2018-05-29";
+    version = "2019-06-30";
     src = fetchFromGitHub {
-      owner = "glfw";
+      owner = "AndrewBelt";
       repo = "glfw";
-      rev = "0be4f3f75aebd9d24583ee86590a38e741db0904";
-      sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5";
+      rev = "d9ab59efc781c392128a449361a381fcc93cf6f3";
+      sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8";
     };
+    # We patch the source to export a function that was added to the glfw fork
+    # for Rack so it is present when we build glfw as a shared library.
+    # See https://github.com/AndrewBelt/glfw/pull/1 for discussion of this issue
+    # with upstream.
+    patches = [ ./glfw.patch ];
     buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
   });
   pfft-source = fetchFromBitbucket {
@@ -23,32 +28,31 @@ let
 in
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "VCV-Rack-${version}";
-  version = "0.6.2b";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6";
+    sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2";
     fetchSubmodules = true;
   };
 
+  patches = [ ./rack-minimize-vendoring.patch ];
+
   prePatch = ''
-    ln -s ${pfft-source} dep/jpommier-pffft-source
+    cp -r ${pfft-source} dep/jpommier-pffft-source
 
     mkdir -p dep/include
 
     cp dep/jpommier-pffft-source/*.h dep/include
-    cp dep/nanosvg/src/*.h dep/include
+    cp dep/nanosvg/**/*.h dep/include
     cp dep/nanovg/src/*.h dep/include
     cp dep/osdialog/*.h dep/include
     cp dep/oui-blendish/*.h dep/include
 
     substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
     substituteInPlace compile.mk --replace "-march=nocona" ""
-    substituteInPlace Makefile \
-       --replace "-Wl,-Bstatic" "" \
-       --replace "-lglfw3" "-lglfw"
   '';
 
   enableParallelBuilding = true;
@@ -60,13 +64,12 @@ with stdenv.lib; stdenv.mkDerivation rec {
 
   installPhase = ''
     install -D -m755 -t $out/bin Rack
-    cp -r res $out/
 
-    mkdir -p $out/share/rack
-    cp LICENSE.txt LICENSE-dist.txt $out/share/rack
+    mkdir -p $out/share/vcv-rack
+    cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack
 
     # Override the default global resource file directory
-    wrapProgram $out/bin/Rack --add-flags "-g $out"
+    wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/vcv-rack/glfw.patch b/pkgs/applications/audio/vcv-rack/glfw.patch
new file mode 100644
index 00000000000..77875415160
--- /dev/null
+++ b/pkgs/applications/audio/vcv-rack/glfw.patch
@@ -0,0 +1,13 @@
+diff --git a/src/init.c b/src/init.c
+index af4a579e..317e25b8 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -339,7 +339,7 @@ GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun cbfun)
+ 
+ char glfwOpenedFilename[1024];
+ 
+-const char *glfwGetOpenedFilename()
++GLFWAPI const char *glfwGetOpenedFilename()
+ {
+     if (glfwOpenedFilename[0])
+     {
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
new file mode 100644
index 00000000000..eca9c2f13c0
--- /dev/null
+++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
@@ -0,0 +1,14 @@
+diff -ru a/Makefile b/Makefile
+--- a/Makefile	1970-01-01 01:00:01.000000000 +0100
++++ b/Makefile	1970-01-01 01:00:01.000000000 +0100
+@@ -21,8 +21,8 @@
+ build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
+ 
+ 	LDFLAGS += -rdynamic \
+-		dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \
+-		-lpthread -lGL -ldl -lX11 -lasound -ljack \
++		-lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
++		-lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \
+ 		$(shell pkg-config --libs gtk+-2.0)
+ 	TARGET := Rack
+ endif

From fb91d00c40b402737fb986d94e89c8fa77038d7f Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Wed, 7 Aug 2019 16:27:35 +0800
Subject: [PATCH 451/562] cargo-bloat: 0.7.2 -> 0.8.2

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

diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix
index 71633a8a885..e7c8e869c87 100644
--- a/pkgs/development/tools/rust/cargo-bloat/default.nix
+++ b/pkgs/development/tools/rust/cargo-bloat/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bloat";
-  version = "0.7.2";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "RazrFalcon";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1g011c98vix0285ws8xby5v50272v15zfyaj948vazsb4zl0gxbm";
+    sha256 = "1r8d3mqzaiasvhxmry8va55ggq817y82x8yb3vzih84lxq134y8n";
   };
 
-  cargoSha256 = "0bpy8888zbqy9b8hkbfsdxqcs88dn2r7p3qnhfn7a6ri4bw7ihhw";
+  cargoSha256 = "1ys3wd1k39vkll25c56sfv767rcd53yb46adwgzdkkyl2pjphf1r";
 
   meta = with lib; {
     description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";

From d0ef94258dff16549846575ef217e1af2644e53c Mon Sep 17 00:00:00 2001
From: Nikola Knezevic <nikola@knezevic.ch>
Date: Wed, 7 Aug 2019 10:31:13 +0200
Subject: [PATCH 452/562] Make hostname in tests overridable

The original form effectively forbade any NixOS configuration that is under
test to explicitly set the hostname.
---
 nixos/lib/build-vms.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 6c92aa1ffa2..b622a4d59e8 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -67,7 +67,7 @@ rec {
             in
             { key = "ip-address";
               config =
-                { networking.hostName = m.fst;
+                { networking.hostName = mkDefault m.fst;
 
                   networking.interfaces = listToAttrs interfaces;
 

From be81b5db1d4b441010eb65be620628b5920cda00 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 7 Aug 2019 11:20:03 +0200
Subject: [PATCH 453/562] qdirstat: use qt5's mkDerivation

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

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 61df8f612fc..4d204021247 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, qmake
 , coreutils, xdg_utils, bash
-, makeWrapper, perlPackages }:
+, makeWrapper, perlPackages, mkDerivation }:
 
 let
   version = "1.6";
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "qdirstat-${version}";
 
   src = fetchFromGitHub {

From 83cfaaccf4e337ab11ca1ce38b33cf0ffc20e8a0 Mon Sep 17 00:00:00 2001
From: Hugo <hugolreeves@gmail.com>
Date: Wed, 7 Aug 2019 21:33:07 +1200
Subject: [PATCH 454/562] gopass: fix build on darwin (#66244)

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

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index a0b1f28854b..41a0d6eb7a5 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -15,12 +15,11 @@ buildGoPackage rec {
     sha256 = "0v3sx9hb03bdn4rvsv2r0jzif6p1rx47hrkpsbnwva31k396mck2";
   };
 
-  wrapperPath = with stdenv.lib; makeBinPath ([
+  wrapperPath = stdenv.lib.makeBinPath ([
     git
     gnupg
     xclip
-    wl-clipboard
-  ]);
+  ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard);
 
   postInstall = ''
     mkdir -p \

From fc03be296fc679b85da3fd796f84d20f0189637e Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 7 Aug 2019 11:34:25 +0200
Subject: [PATCH 455/562] qtractor: adding wrapQtAppsHook

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

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 1c9829bcd9f..2e504a3c9ec 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,7 +1,7 @@
 { alsaLib, autoconf, automake, dssi, fetchurl, libjack2
 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
 , libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd
-, sord, sratom, stdenv, suil }:
+, sord, sratom, stdenv, suil, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    autoconf automake libtool pkgconfig qttools
+    autoconf automake libtool pkgconfig qttools wrapQtAppsHook
   ];
+
   buildInputs =
     [ alsaLib dssi libjack2 ladspaH
       ladspaPlugins liblo libmad libsamplerate libsndfile libtool

From 034a97ecc1aaa7f75829253c42d14dd13be9cb2f Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Wed, 7 Aug 2019 11:51:52 +0200
Subject: [PATCH 456/562] pythonPackages.jug: 1.6.8 -> 1.6.9

Removes the need to patch the code for NumPy 1.17.0
---
 pkgs/development/python-modules/jug/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index cb6aa142db0..ad26b62931d 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -5,7 +5,7 @@
 
 buildPythonPackage rec {
   pname = "Jug";
-  version = "1.6.8";
+  version = "1.6.9";
   buildInputs = [ nose numpy ];
   propagatedBuildInputs = [
     bottle
@@ -16,18 +16,9 @@ buildPythonPackage rec {
     zlib
   ];
 
-  patches = [
-    # Fix numpy usage. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/luispedro/jug/commit/814405ce1553d3d2e2e96cfbeae05d63dc4f2491.patch";
-      sha256 = "1l8sssp856dmhxbnv3pzxgwgpv6rb884l0in5x7q19czwn5a4vmv";
-      excludes = [ "ChangeLog" ];
-    })
-  ];
-
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s1l1ln9s6mi2aa132gqr789nnhdpiw057j3sp54v1sbq2cwd42p";
+    sha256 = "0193hp8ap6caw57jdch3vw0hl5m8942lxhjdsfaxk4bfb239l5kz";
   };
 
   meta = with stdenv.lib; {

From 40970f10969258311d1f4dc6e9ee1e6a7b06c68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Wed, 7 Aug 2019 11:59:35 +0200
Subject: [PATCH 457/562] wpa_supplicant/gui: fix qt wrapping

Import mkDerivation explicitly instead of using stdenv.mkDerivation, to
allow proper wrapping.
---
 pkgs/os-specific/linux/wpa_supplicant/gui.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index 891de61c017..7c6f595bfaf 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,6 +1,6 @@
-{ stdenv, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
+{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
 
-stdenv.mkDerivation {
+mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
 
   inherit (wpa_supplicant) src;

From 8f2abf573b03ec50b1d6bbb05c2fff9934abd255 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 7 Aug 2019 13:02:09 +0200
Subject: [PATCH 458/562] grafana: 6.3.0 -> 6.3.2

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 5b9a2192570..c9e6da89d93 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "6.3.0";
+  version = "6.3.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -11,12 +11,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0k95w7j2iq6v82d8701cl2zcszl8qfplpnhjfijr3djahbwbkls3";
+    sha256 = "03jhygd3h211dr3dgdg4mi13sj1rib333x436kv14v8xd8rsl162";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "01q1d8fpf3dfrc11wzzi9i6939906l4s0kkl9v0c91p3qx3rfni9";
+    sha256 = "18khy0ki128mswy4viwbb53904ljrgj0y0qv076nn8m2zbyddyp9";
   };
 
   postPatch = ''

From b1d00b71b6dcf0d16bd0467d33ac09a70fb63387 Mon Sep 17 00:00:00 2001
From: Derek Kulinski <d@kulinski.us>
Date: Wed, 7 Aug 2019 04:15:10 -0700
Subject: [PATCH 459/562] pgpool: 3.4.14 -> 4.0.5 (#66224)

Updated to PGPool-II 4.0.5 and modify the code to allow absolute path
for pool_passwd file.
---
 pkgs/servers/sql/pgpool/default.nix           |  8 ++++---
 .../pgpool/pgpool-II-3.4.14-glibc-2.26.patch  | 12 ----------
 pkgs/servers/sql/pgpool/pgpool.patch          | 23 +++++++++++++++++++
 3 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch
 create mode 100644 pkgs/servers/sql/pgpool/pgpool.patch

diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index 3fedf3fa804..3db62aa491c 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }:
 
 stdenv.mkDerivation rec {
-  name = "pgpool-II-3.4.14";
+  pname = "pgpool-II";
+  version = "4.0.5";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
-    sha256 = "1paak83f4lv48xckmf2znryrvhmdz86w4v97mcw2gxm50hcl74sw";
+    sha256 = "0v2g2ksikn10kxsa8i47gv0kbklrsscvlddza3caf522q1k0fic4";
   };
 
-  patches = [ ./pgpool-II-3.4.14-glibc-2.26.patch ];
+  patches = [ ./pgpool.patch ];
 
   buildInputs = [ postgresql openssl pam libmemcached ];
 
diff --git a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch b/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch
deleted file mode 100644
index 6efffff0c6d..00000000000
--- a/pkgs/servers/sql/pgpool/pgpool-II-3.4.14-glibc-2.26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/watchdog/wd_lifecheck.c b/src/watchdog/wd_lifecheck.c
-index 1e72307..5cf68a3 100644
---- a/src/watchdog/wd_lifecheck.c
-+++ b/src/watchdog/wd_lifecheck.c
-@@ -26,6 +26,7 @@
- #include <ctype.h>
- #include <time.h>
- #include <string.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <netdb.h>
diff --git a/pkgs/servers/sql/pgpool/pgpool.patch b/pkgs/servers/sql/pgpool/pgpool.patch
new file mode 100644
index 00000000000..7c9d92a88bf
--- /dev/null
+++ b/pkgs/servers/sql/pgpool/pgpool.patch
@@ -0,0 +1,23 @@
+diff --git a/src/main/main.c b/src/main/main.c
+index eec3c3e4..4169112b 100644
+--- a/src/main/main.c
++++ b/src/main/main.c
+@@ -337,10 +337,14 @@ main(int argc, char **argv)
+ 		char		dirnamebuf[POOLMAXPATHLEN + 1];
+ 		char	   *dirp;
+ 
+-		strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf));
+-		dirp = dirname(dirnamebuf);
+-		snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
+-				 dirp, pool_config->pool_passwd);
++		if (pool_config->pool_passwd[0] != '/') {
++			strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf));
++			dirp = dirname(dirnamebuf);
++			snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s",
++					 dirp, pool_config->pool_passwd);
++		} else
++			strlcpy(pool_passwd, pool_config->pool_passwd,
++				 sizeof(pool_passwd));
+ 		pool_init_pool_passwd(pool_passwd, POOL_PASSWD_R);
+ 	}
+ 

From 0730e81785e3bd4342df9c53d07618659b8249a7 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Wed, 7 Aug 2019 14:17:36 +0300
Subject: [PATCH 460/562] postgresql: running `initdb` from command line now
 works (#65309)

The issue was only with NixOS service, `postgresql` installed through
`nix-env` was not affected.

Fixes https://github.com/NixOS/nixpkgs/issues/23655
---
 .../modules/services/databases/postgresql.nix |  4 +++
 nixos/tests/initdb.nix                        | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 nixos/tests/initdb.nix

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 37d44e30fbe..7ff899970cc 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -251,6 +251,10 @@ in
 
     environment.systemPackages = [ postgresql ];
 
+    environment.pathsToLink = [
+     "/share/postgresql"
+    ];
+
     systemd.services.postgresql =
       { description = "PostgreSQL Server";
 
diff --git a/nixos/tests/initdb.nix b/nixos/tests/initdb.nix
new file mode 100644
index 00000000000..749d7857a13
--- /dev/null
+++ b/nixos/tests/initdb.nix
@@ -0,0 +1,26 @@
+let
+  pkgs = import <nixpkgs> { };
+in
+with import <nixpkgs/nixos/lib/testing.nix> { inherit pkgs; system = builtins.currentSystem; };
+with pkgs.lib;
+
+makeTest {
+    name = "pg-initdb";
+
+    machine = {...}:
+      {
+        documentation.enable = false;
+        services.postgresql.enable = true;
+        services.postgresql.package = pkgs.postgresql_9_6;
+        environment.pathsToLink = [
+          "/share/postgresql"
+        ];
+      };
+
+    testScript = ''
+      $machine->start;
+      $machine->succeed("sudo -u postgres initdb -D /tmp/testpostgres2");
+      $machine->shutdown;
+    '';
+
+  }
\ No newline at end of file

From c805c23239aa230d53a1730c47e0cb2bfd998207 Mon Sep 17 00:00:00 2001
From: John Children <john.a.children@gmail.com>
Date: Wed, 7 Aug 2019 12:48:06 +0100
Subject: [PATCH 461/562] golangci-lint: 1.16.0 -> 1.17.1

Version bump for golangci-lint
---
 pkgs/development/tools/golangci-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index f0870598956..ae7f24a62a5 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   name = "golangci-lint-${version}";
-  version = "1.16.0";
+  version = "1.17.1";
   goPackagePath = "github.com/golangci/golangci-lint";
 
   subPackages = [ "cmd/golangci-lint" ];
@@ -11,10 +11,10 @@ buildGoModule rec {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "1yzcfmrxyrxhq3vx13qm7czvhvdnaqay75v8ry1lgpg0bnh9pakx";
+    sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac";
   };
 
-  modSha256 = "1dsaj6qsac9y4rkssjbmk46vaqbblzdim2rbdh3dgn1m0vdpv505";
+  modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6";
 
   meta = with lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";

From 0a477846af2837752687ced588b71108ff010bb2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 31 Jul 2019 07:18:25 +0000
Subject: [PATCH 462/562] ocamlPackages.findlib: 1.8.0 -> 1.8.1

Also remove unused legacy version 1.7.3
---
 .../tools/ocaml/findlib/default.nix           | 22 +++----------------
 .../tools/ocaml/findlib/install_topfind.patch |  2 +-
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 18b84e2c961..91870a570b0 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,33 +1,17 @@
 { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4"
-  then {
-    version = "1.8.0";
-    sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb";
-  } else {
-    version = "1.7.3";
-    sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni";
-    patches = [ (fetchpatch {
-      url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch";
-      sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3";
-    }) ];
-  };
-in
-
 stdenv.mkDerivation rec {
   name = "ocaml-findlib-${version}";
-  inherit (param) version;
+  version = "1.8.1";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
-    inherit (param) sha256;
+    sha256 = "00s3sfb02pnjmkax25pcnljcnhcggiliccfz69a72ic7gsjwz1cf";
   };
 
   buildInputs = [m4 ncurses ocaml];
 
-  patches = [ ./ldconf.patch ./install_topfind.patch ]
-  ++ (param.patches or []);
+  patches = [ ./ldconf.patch ./install_topfind.patch ];
 
   dontAddPrefix=true;
 
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index 7cd32991d0e..dbdb0edd6cb 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -6,7 +6,7 @@
  	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
 +	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
-	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
+	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
 	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
 

From 509bf5d1cc7bcfebdfe3d8f5a8bb62a67ca3d364 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 31 Jul 2019 23:31:10 +0200
Subject: [PATCH 463/562] pythonPackages.wget: init at 3.2

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

diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix
new file mode 100644
index 00000000000..502c7f64b86
--- /dev/null
+++ b/pkgs/development/python-modules/wget/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "wget";
+  version = "3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "35e630eca2aa50ce998b9b1a127bb26b30dfee573702782aa982f875e3f16061";
+    extension = "zip";
+  };
+
+  meta = {
+    description = "Pure python download utility";
+    homepage = http://bitbucket.org/techtonik/python-wget/;
+    license = with lib.licenses; [ unlicense ];
+    maintainers = with lib.maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d782de82e4d..7c612686530 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6112,6 +6112,8 @@ in {
   stringcase = callPackage ../development/python-modules/stringcase { };
 
   webrtcvad = callPackage ../development/python-modules/webrtcvad { };
+
+  wget = callPackage ../development/python-modules/wget { };
 });
 
 in fix' (extends overrides packages)

From 166a5e04057975f9ef12b75ce7f98a492506908b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 31 Jul 2019 23:31:10 +0200
Subject: [PATCH 464/562] pythonPackages.runway-python: init at 0.3.2

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

diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix
new file mode 100644
index 00000000000..07e39e72bc0
--- /dev/null
+++ b/pkgs/development/python-modules/runway-python/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, flask-cors
+, numpy
+, pillow
+, gevent
+, wget
+, six
+, colorcet
+}:
+
+buildPythonPackage rec {
+  pname = "runway-python";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ef15c0df60cfe7ea26b070bbe2ba522d67d247b157c20f3f191fe545c17d0b85";
+  };
+
+  propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ];
+
+  # tests are not packaged in the released tarball
+  doCheck = false;
+
+  meta = {
+    description = "Helper library for creating Runway models";
+    homepage = https://github.com/runwayml/model-sdk;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c612686530..9cda381632a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6114,6 +6114,8 @@ in {
   webrtcvad = callPackage ../development/python-modules/webrtcvad { };
 
   wget = callPackage ../development/python-modules/wget { };
+
+  runway-python = callPackage ../development/python-modules/runway-python { };
 });
 
 in fix' (extends overrides packages)

From 202399f34e82573ac254e631c413377691b82c60 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 7 Aug 2019 10:33:22 +0200
Subject: [PATCH 465/562] flexibee: init at 2019.2.5

---
 pkgs/applications/office/flexibee/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/office/flexibee/default.nix

diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix
new file mode 100644
index 00000000000..284fdf7a124
--- /dev/null
+++ b/pkgs/applications/office/flexibee/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+let
+  version = "2019.2.5";
+  majorVersion = builtins.substring 0 6 version;
+in
+
+stdenv.mkDerivation rec {
+  pname = "flexibee";
+  inherit version;
+
+  src = fetchurl {
+    url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz";
+    sha256 = "0k94y4x6lj1vcb89a95v9mzl95mkpwp9n4a2gwvq0g90zpbnn493";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    cp -R usr/share/flexibee/ $out/
+    install -Dm755 usr/bin/flexibee $out/bin/flexibee
+    wrapProgram  $out/bin/flexibee --set JAVA_HOME "${jre}"
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client for an accouting economic system";
+    homepage = "https://www.flexibee.eu/";
+    license = licenses.unfree;
+    maintainers = [ maintainers.mmahut ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b1bbb5a7f7..34f261ecb87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9418,6 +9418,8 @@ in
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 
+  flexibee = callPackage ../applications/office/flexibee { };
+
   flexcpp = callPackage ../development/tools/parsing/flexc++ { };
 
   geis = callPackage ../development/libraries/geis {

From 636cef2f03739b34c8e95a4b53138e6e43937e00 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:24:50 -0400
Subject: [PATCH 466/562] linux: 4.14.136 -> 4.14.137

---
 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 57b0585ea4e..97df84f90b0 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.136";
+  version = "4.14.137";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0w6z5fhwqgpqnz2js8vj9j5dl6isx8n7rnzrm0vr9r8njaazz396";
+    sha256 = "0a72pab0zxy28i02glnzj6avzcf0a4gxxnadbdd343rh549yky4k";
   };
 } // (args.argsOverride or {}))

From 5a6c5a819bc90b325ea832f1ddfbc1eee24320a5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:25:01 -0400
Subject: [PATCH 467/562] linux: 4.19.64 -> 4.19.65

---
 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 dc404f0ef6a..d8b5e2ee318 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.64";
+  version = "4.19.65";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gasmcdsrsk81dscslmrsxqsvkfp5xxdx3ay95izggpk7piqnvvs";
+    sha256 = "1pyyhr2airxzk4c6n7140yl723dc7yw7igy5i5i2ih0nd4c3k6g5";
   };
 } // (args.argsOverride or {}))

From 046a1aac01b881529d1d44a2e9c6015fb6396f7a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:25:07 -0400
Subject: [PATCH 468/562] linux: 4.4.187 -> 4.4.188

---
 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 000ba6073a3..2f4bb848aee 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.187";
+  version = "4.4.188";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dlzb5yzcsicd41myj3q4dq2ql8xcc49brs5f7xjmc5ynvvjjgnc";
+    sha256 = "1llxamm62kgqd7dig98n8m16qas8dd8rrkmwpfcdgyf8rag216ff";
   };
 } // (args.argsOverride or {}))

From 16cc4483b419228494d45da5eb76e17aaa2f2b2c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:25:14 -0400
Subject: [PATCH 469/562] linux: 4.9.187 -> 4.9.188

---
 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 de15a2700a9..5ae8743e9ff 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.187";
+  version = "4.9.188";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1iyimwl4ysnk6m66m73sg0cnp4vac56d6yy174shfpnj5h2csjq1";
+    sha256 = "08p2cfc9982b804vmkapfasgipf6969g625ih7z3062xn99rhlr7";
   };
 } // (args.argsOverride or {}))

From 2082dbd9dce48ebd9f03bf367153ef6a9b16a6f7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:25:17 -0400
Subject: [PATCH 470/562] linux: 5.2.6 -> 5.2.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix
index d74f8548b3b..c7980844ed9 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.2.6";
+  version = "5.2.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1whzgdz1wnjzkb78yqz4xs3mad02rv17ksmwaf4ykp4lfgxml45y";
+    sha256 = "1aazhf0v8bv4py0wnqkdmiy80fchnix431l0hda2fkwsdf9njgnv";
   };
 } // (args.argsOverride or {}))

From 6808d00dfa4469145fd6a39174ced13ae2ebf521 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:30:36 -0400
Subject: [PATCH 471/562] oh-my-zsh: 2019-07-31 -> 2019-08-06

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index fa92411cea6..1373d936b0e 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-07-31";
+  version = "2019-08-06";
   name = "oh-my-zsh-${version}";
-  rev = "6d2221e697ea4a2445202b1c32283610f84585ef";
+  rev = "89366be43fd6ceff52a9da2f2edef654ab619514";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0yj2cymh2a74014ng7vyfh1b8qhbk14s0sbcj0426mykvilfd31b";
+    sha256 = "0adql1x28q7i6cg103jfp7wqajq1smwdgbw1cxrsa7qh8ys7kss0";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 83e1d3aa66b6cee2a6dedc5dec1c02ec8b9bdfce Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Aug 2019 07:30:42 -0400
Subject: [PATCH 472/562] slack-theme-black: 2019-07-25 -> 2019-07-26

---
 .../networking/instant-messengers/slack/dark-theme.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
index 8fb92766efa..c24e2c4301e 100644
--- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   rev = "e2a6a9cd9da70175881ab991220c86aa87179509";
-  version = "2019-07-25";
+  version = "2019-07-26";
   name = "slack-theme-black-${version}";
 
   src = fetchgit { inherit rev;

From 514e62d028a18f442a16b4201f73f36d665ccb16 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 7 Aug 2019 12:00:39 +0200
Subject: [PATCH 473/562] calibre: fix build

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6b4ca4e0355..abcbe443450 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -49,8 +49,7 @@ stdenv.mkDerivation rec {
   ]);
 
   qtWrapperArgs = [
-    "--prefix PYTHONPATH: $PYTHONPATH"
-    "--prefix PATH: ${poppler_utils.out}/bin}"
+    "--prefix PATH : ${poppler_utils.out}/bin"
   ];
 
   installPhase = ''
@@ -76,7 +75,7 @@ stdenv.mkDerivation rec {
     sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre
 
     for program in $out/bin/*; do
-      wrapQtApp $program
+      wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH
     done
 
     # Replace @out@ by the output path.

From 6c6276c8aa88fe4e6fb2fb34f649154cca58f0c2 Mon Sep 17 00:00:00 2001
From: Benjamin <BenSchZA@users.noreply.github.com>
Date: Wed, 7 Aug 2019 15:37:03 +0200
Subject: [PATCH 474/562] spotifyd: update cargoSha256 hash (#66233)

When installing, the Cargo package hash is incorrect. This has been updated, and works locally.
---
 pkgs/applications/audio/spotifyd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 5f064cf4e88..3daed9f6350 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
   };
 
-  cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521";
+  cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3";
 
   cargoBuildFlags = [
     "--no-default-features"

From e5340bb5ef150a8a34742c81d1514b8edfd22fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Wed, 7 Aug 2019 12:28:49 +0200
Subject: [PATCH 475/562] ocaml-minisat: init at 0.2

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

diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix
new file mode 100644
index 00000000000..79820b16e6c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/minisat/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, fetchFromGitHub }:
+
+buildDunePackage rec {
+  pname = "minisat";
+  version = "0.2";
+
+  minimumOCamlVersion = "4.05";
+
+  src = fetchFromGitHub {
+    owner  = "c-cube";
+    repo   = "ocaml-minisat";
+    rev    = version;
+    sha256 = "1jibylmb1ww0x42n6wl8bdwicaysgxp0ag244x7w5m3jifq3xs6q";
+  };
+
+  meta = {
+    homepage = https://c-cube.github.io/ocaml-minisat/;
+    description = "Simple bindings to Minisat-C";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5249f848d01..f363d0f1b31 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -444,6 +444,8 @@ let
 
     mezzo = callPackage ../development/compilers/mezzo { };
 
+    minisat = callPackage ../development/ocaml-modules/minisat { };
+
     mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
 
     mlgmpidl =  callPackage ../development/ocaml-modules/mlgmpidl { };

From 2780e0b6cb3a7109e6959497548a220e9850a41c Mon Sep 17 00:00:00 2001
From: Xavier Vello <xavier.vello@gmail.com>
Date: Tue, 6 Aug 2019 22:26:23 +0200
Subject: [PATCH 476/562] kdeFrameworks.ktexteditor: compile with
 editorconfig-core-c

Add one small dependency to ktexteditor to make it
support the .editorconfig configuration format.
---
 pkgs/development/libraries/kde-frameworks/ktexteditor.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index c633aee30a1..98f9b3f82ca 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -2,7 +2,8 @@
   mkDerivation, lib,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
-  qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols
+  qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols,
+  editorconfig-core-c
 }:
 
 mkDerivation {
@@ -12,6 +13,7 @@ mkDerivation {
   buildInputs = [
     karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
     qtxmlpatterns sonnet syntax-highlighting qtquickcontrols
+    editorconfig-core-c
   ];
   propagatedBuildInputs = [ kparts ];
 }

From da178efe898a4e6bcdc24480911f79d0fd91a3b8 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Tue, 6 Aug 2019 14:25:59 -0400
Subject: [PATCH 477/562] kdeconnect: Use qt5's mkDerivation

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

diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index d3905c8d3ea..6bc608ee5d4 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ mkDerivation
 , lib
 , fetchurl
 , extra-cmake-modules
@@ -18,7 +18,7 @@
 , kwayland
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "kdeconnect";
   version = "1.3.4";
 

From 80112a6f2a01cc0fe5dc7c45b291fb7ff3864800 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Wed, 7 Aug 2019 11:22:18 -0400
Subject: [PATCH 478/562] xcbuild: fix darwin build

Bumping the MacOS target version to 10.12 signalled xcbuild that
libcompression is available on Darwin, but libcompression is not
OSS (even though an LZFSE reference implementation is), and it is not
part of a framework for us to make impure, so this patch disables it.
---
 pkgs/development/tools/xcbuild/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 29325fad724..61dd7209fc4 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -36,10 +36,15 @@ in stdenv.mkDerivation rec {
     cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
   '';
 
-  # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
   postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
     sed 1i'#include <sys/sysmacros.h>' \
       -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Apple Open Sourced LZFSE, but not libcompression, and it isn't
+    # part of an impure framework we can add
+    sed '/#define HAVE_LIBCOMPRESSION 1/d' \
+      -i Libraries/libcar/Sources/Rendition.cpp
   '';
 
   enableParallelBuilding = true;

From 1559a3798a29f5aca368aeee6aa1d06223ee0245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Wed, 7 Aug 2019 18:48:33 +0200
Subject: [PATCH 479/562] ocaml-sat-solvers: init at 0.4 (#66275)

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

diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
new file mode 100644
index 00000000000..12f1440118a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildOasisPackage, minisat }:
+
+buildOasisPackage rec {
+  pname = "ocaml-sat-solvers";
+  version = "0.4";
+
+  minimumOCamlVersion = "4.03.0";
+
+  src = fetchFromGitHub {
+    owner  = "tcsprojects";
+    repo   = "ocaml-sat-solvers";
+    rev    = "v${version}";
+    sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938";
+  };
+
+  propagatedBuildInputs = [ minisat ];
+
+  meta = {
+    homepage = https://github.com/tcsprojects/ocaml-sat-solvers;
+    description = "SAT Solvers For OCaml";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f363d0f1b31..525f417a5b4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -519,6 +519,8 @@ let
 
     pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
 
+    ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { };
+
     ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { };
 
     ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { };

From d30080584b33cd681e27e43e9077e3af2279edee Mon Sep 17 00:00:00 2001
From: "EEva (JPotier)" <jpo.contributes.to.nixos@marvid.fr>
Date: Wed, 10 Jul 2019 19:04:23 +0300
Subject: [PATCH 480/562] bitlbee-mastodon: init at 1.4.2

---
 .../bitlbee-mastodon/default.nix              | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
new file mode 100644
index 00000000000..ecd76977eb2
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
@@ -0,0 +1,30 @@
+{ fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  pname = "bitlbee-mastodon";
+  version = "1.4.2";
+
+  src = fetchgit {
+    url = "https://alexschroeder.ch/cgit/bitlbee-mastodon";
+    rev = "v${version}";
+    sha256 = "04rakgr1pfsg1vhfwlfbggbzw249j7dmk88xrsnf3n84c5ccdyas";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ bitlbee glib ];
+
+  preConfigure = ''
+    export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+    export BITLBEE_DATADIR=$out/share/bitlbee
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = "Bitlbee plugin for Mastodon";
+    homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ jpotier ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b72d011d2..1a44f428deb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17072,6 +17072,8 @@ in
 
   bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { };
 
+  bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { };
+
   bitmeter = callPackage ../applications/audio/bitmeter { };
 
   bitscope = recurseIntoAttrs

From 9e36f272f90eb7b0e423559373138a09fbbeb626 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 7 Aug 2019 12:52:43 -0400
Subject: [PATCH 481/562] mixxx: drop custom wrapper

This prevented it from being wrapped
automatically because it wasn't an ELF
header.
---
 pkgs/applications/audio/mixxx/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index d0c8f4d9ebe..6d186cccde3 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint
+{ stdenv, mkDerivation, fetchFromGitHub, chromaprint
 , fftw, flac, faad2, glibcLocales, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
@@ -17,8 +17,6 @@ mkDerivation rec {
     sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
   buildInputs = [
     chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
@@ -34,10 +32,9 @@ mkDerivation rec {
     "opus=1"
   ];
 
-  fixupPhase = ''
-    wrapProgram $out/bin/mixxx \
-      --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive;
-  '';
+  qtWrapperArgs = [
+    "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://mixxx.org;

From 891122697121ac52a250bcfca891fd2bd4b19c70 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 3 Aug 2019 20:42:26 +0100
Subject: [PATCH 482/562] emacs-packages: Allow update script to be called from
 any location

Previously working directory was important
---
 .../editors/emacs-modes/update-melpa          |  8 +--
 .../editors/emacs-modes/updater-emacs.nix     | 65 +++++++++++--------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/update-melpa b/pkgs/applications/editors/emacs-modes/update-melpa
index 2b2af5cb2bb..5c636416a5e 100755
--- a/pkgs/applications/editors/emacs-modes/update-melpa
+++ b/pkgs/applications/editors/emacs-modes/update-melpa
@@ -1,8 +1,6 @@
 #! /usr/bin/env nix-shell
-#! nix-shell --show-trace -i sh -p git nix nix-prefetch-git nix-prefetch-hg "import ./updater-emacs.nix"
+#! nix-shell --show-trace ./updater-emacs.nix -i bash
 
-# "with import ../../../.. {}; emacsWithPackages (epkgs: with epkgs.melpaPackages; [ promise semaphore ])"
+SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
 
-exec emacs --fg-daemon=updater --quick -l update-melpa.el -f run-updater "$@"
-
-# exec emacs update-melpa.el "$@"
+exec emacs --fg-daemon=updater --quick -l $SCRIPT_DIR/update-melpa.el -f run-updater "$@"
diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
index b64a410e7b4..c7e858078e6 100644
--- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix
+++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix
@@ -1,29 +1,40 @@
-with import ../../../.. {};
-(emacsPackagesNgFor emacs26).
-emacsWithPackages (epkgs: let
-  promise = epkgs.trivialBuild {
-    pname = "promise";
-    version = "1";
-    src = fetchFromGitHub {
-      owner = "bendlas";
-      repo = "emacs-promise";
-      rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022";
-      sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy";
-      
+let
+  pkgs = import ../../../.. {};
+
+  emacsEnv = (pkgs.emacsPackagesNgFor pkgs.emacs26).emacsWithPackages (epkgs: let
+
+    promise = epkgs.trivialBuild {
+      pname = "promise";
+      version = "1";
+      src = pkgs.fetchFromGitHub {
+        owner = "bendlas";
+        repo = "emacs-promise";
+        rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022";
+        sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy";
+      };
     };
-  };
-  semaphore = epkgs.trivialBuild {
-    pname = "semaphore";
-    version = "1";
-    packageRequires = [ promise ];
-    src = fetchFromGitHub {
-      owner = "webnf";
-      repo = "semaphore.el";
-      rev = "93802cb093073bc6a6ccd797328dafffcef248e0";
-      sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853";
-      
+
+    semaphore = epkgs.trivialBuild {
+      pname = "semaphore";
+      version = "1";
+      packageRequires = [ promise ];
+      src = pkgs.fetchFromGitHub {
+        owner = "webnf";
+        repo = "semaphore.el";
+        rev = "93802cb093073bc6a6ccd797328dafffcef248e0";
+        sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853";
+      };
     };
-  };
-  in [ promise semaphore ]
-     #  ++ (with epkgs.melpaPackages; [ smex rainbow-delimiters paredit ])
-)
+
+  in [ promise semaphore ]);
+
+in pkgs.mkShell {
+  buildInputs = [
+    pkgs.git
+    pkgs.nix
+    pkgs.bash
+    pkgs.nix-prefetch-git
+    pkgs.nix-prefetch-hg
+    emacsEnv
+  ];
+}

From 47d3b98b4b3f52e862fe62186ec5dcbb0a233202 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 3 Aug 2019 20:48:11 +0100
Subject: [PATCH 483/562] melpa-packages: Add ability to ovveride melpa JSON
 archive location

This enables using the melpa json generator in an overlay
---
 .../editors/emacs-modes/melpa-packages.nix    | 524 ++++++++++--------
 .../emacs-modes/melpa-stable-packages.nix     | 235 --------
 pkgs/top-level/emacs-packages.nix             |  30 +-
 3 files changed, 302 insertions(+), 487 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 7f8ac548653..5f05d3b2695 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -12,124 +12,115 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
 */
 
-{ lib, external }:
+{ lib, external }: variant: self: let
 
-self:
+  dontConfigure = pkg: if pkg != null then pkg.override (args: {
+    melpaBuild = drv: args.melpaBuild (drv // {
+      configureScript = "true";
+    });
+  }) else null;
+
+  markBroken = pkg: if pkg != null then pkg.override (args: {
+    melpaBuild = drv: args.melpaBuild (drv // {
+      meta = (drv.meta or {}) // { broken = true; };
+    });
+  }) else null;
+
+  generateMelpa = lib.makeOverridable ({
+    archiveJson ? ./recipes-archive-melpa.json
+  }: let
 
-  let
     inherit (import ./libgenerated.nix lib self) melpaDerivation;
-    imported = lib.listToAttrs (map (melpaDerivation "unstable")
-                                    (lib.importJSON ./recipes-archive-melpa.json));
-    super = builtins.removeAttrs imported [
-      "swbuff-x" # required dependency swbuff is missing
-    ];
+    super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));
 
-    dontConfigure = pkg: pkg.override (args: {
-      melpaBuild = drv: args.melpaBuild (drv // {
-        configureScript = "true";
-      });
-    });
+    generic = import ./melpa-generic.nix;
 
-    markBroken = pkg: pkg.override (args: {
-      melpaBuild = drv: args.melpaBuild (drv // {
-        meta = (drv.meta or {}) // { broken = true; };
-      });
-    });
+    overrides = rec {
+      shared = {
+        # Expects bash to be at /bin/bash
+        ac-rtags = markBroken super.ac-rtags;
 
-    overrides = {
-      # Expects bash to be at /bin/bash
-      ac-rtags = markBroken super.ac-rtags;
+        airline-themes = super.airline-themes.override {
+          inherit (self.melpaPackages) powerline;
+        };
 
-      # upstream issue: mismatched filename
-      ack-menu = markBroken super.ack-menu;
+        # upstream issue: missing file header
+        bufshow = markBroken super.bufshow;
 
-      airline-themes = super.airline-themes.override {
-        inherit (self.melpaPackages) powerline;
-      };
+        # part of a larger package
+        caml = dontConfigure super.caml;
 
-      # upstream issue: missing file header
-      bufshow = markBroken super.bufshow;
+        # Expects bash to be at /bin/bash
+        company-rtags = markBroken super.company-rtags;
 
-      # part of a larger package
-      caml = dontConfigure super.caml;
+        easy-kill-extras = super.easy-kill-extras.override {
+          inherit (self.melpaPackages) easy-kill;
+        };
 
-      # Expects bash to be at /bin/bash
-      company-rtags = markBroken super.company-rtags;
+        # upstream issue: missing file header
+        elmine = markBroken super.elmine;
 
-      easy-kill-extras = super.easy-kill-extras.override {
-        inherit (self.melpaPackages) easy-kill;
-      };
+        evil-magit = super.evil-magit.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
-      editorconfig = super.editorconfig.overrideAttrs (attrs: {
-        propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
-      });
+        ess-R-data-view = super.ess-R-data-view.override {
+          inherit (self.melpaPackages) ess ctable popup;
+        };
 
-      egg = super.egg.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
+        # Expects bash to be at /bin/bash
+        flycheck-rtags = markBroken super.flycheck-rtags;
 
-      # upstream issue: missing file header
-      elmine = markBroken super.elmine;
+        # build timeout
+        graphene = markBroken super.graphene;
 
-      ess-R-data-view = super.ess-R-data-view.override {
-        inherit (self.melpaPackages) ess ctable popup;
-      };
+        # Build same version as Haskell package
+        hindent = super.hindent.overrideAttrs (attrs: {
+          version = external.hindent.version;
+          src = external.hindent.src;
+          packageRequires = [ self.haskell-mode ];
+          propagatedUserEnvPkgs = [ external.hindent ];
+        });
 
-      evil-magit = super.evil-magit.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
+        # upstream issue: missing file header
+        ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
 
-      # missing dependencies
-      evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: {
-        packageRequires = with self; [ evil highlight ];
-      });
+        # upstream issue: missing file header
+        initsplit = markBroken super.initsplit;
 
-      # Expects bash to be at /bin/bash
-      flycheck-rtags = markBroken super.flycheck-rtags;
+        # tries to write a log file to $HOME
+        insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
+          HOME = "/tmp";
+        });
 
-      forge = super.forge.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
+        # Expects bash to be at /bin/bash
+        ivy-rtags = markBroken super.ivy-rtags;
 
-      # build timeout
-      graphene = markBroken super.graphene;
+        # upstream issue: missing file header
+        jsfmt = markBroken super.jsfmt;
 
-      # upstream issue: mismatched filename
-      helm-lobsters = markBroken super.helm-lobsters;
+        # upstream issue: missing file header
+        maxframe = markBroken super.maxframe;
 
-      # Expects bash to be at /bin/bash
-      helm-rtags = markBroken super.helm-rtags;
+        magit = super.magit.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
-      # Build same version as Haskell package
-      hindent = super.hindent.overrideAttrs (attrs: {
-        version = external.hindent.version;
-        src = external.hindent.src;
-        packageRequires = [ self.haskell-mode ];
-        propagatedUserEnvPkgs = [ external.hindent ];
-      });
+        magit-todos = super.magit-todos.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
-      # upstream issue: missing file header
-      ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
-
-      # upstream issue: missing file header
-      initsplit = super.initsplit;
-
-      # tries to write a log file to $HOME
-      insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
-        HOME = "/tmp";
-      });
-
-      # Expects bash to be at /bin/bash
-      ivy-rtags = markBroken super.ivy-rtags;
-
-      # upstream issue: missing file header
-      jsfmt = markBroken super.jsfmt;
+        magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
       kubernetes = super.kubernetes.overrideAttrs (attrs: {
         # searches for Git at build time
@@ -138,169 +129,224 @@ self:
       });
 
       # upstream issue: missing file header
-      maxframe = markBroken super.maxframe;
+        mhc = super.mhc.override {
+          inherit (self.melpaPackages) calfw;
+        };
 
-      magit =
-        super.magit.overrideAttrs (attrs: {
+        # missing .NET
+        nemerle = markBroken super.nemerle;
+
+        # part of a larger package
+        notmuch = dontConfigure super.notmuch;
+
+        # missing OCaml
+        ocp-indent = markBroken super.ocp-indent;
+
+        # upstream issue: missing file header
+        qiita = markBroken super.qiita;
+
+        # upstream issue: missing file header
+        speech-tagger = markBroken super.speech-tagger;
+
+        # upstream issue: missing file header
+        stgit = markBroken super.stgit;
+
+        # upstream issue: missing file header
+        tawny-mode = markBroken super.tawny-mode;
+
+        # upstream issue: missing file header
+        textmate = markBroken super.textmate;
+
+        # missing OCaml
+        utop = markBroken super.utop;
+
+        vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        # upstream issue: missing file header
+        voca-builder = markBroken super.voca-builder;
+
+        # upstream issue: missing file header
+        window-numbering = markBroken super.window-numbering;
+
+        # Map legacy renames from emacs2nix since code generation was ported to emacs lisp
+        _0blayout = super."0blayout";
+        _0xc = super."0xc";
+        _2048-game = super."2048-game";
+        _4clojure = super."4clojure";
+        at = super."@";
+        desktop-plus = super."desktop+";
+        ghub-plus = super."ghub+";
+        git-gutter-plus = super."git-gutter+";
+        git-gutter-fringe-plus = super."git-gutter-fringe+";
+        ido-completing-read-plus = super."ido-completing-read+";
+        image-plus = super."image+";
+        image-dired-plus = super."image-dired+";
+        markdown-mode-plus = super."markdown-mode+";
+        package-plus = super."package+";
+        rect-plus = super."rect+";
+        term-plus = super."term+";
+        term-plus-key-intercept = super."term+key-intercept";
+        term-plus-mux = super."term+mux";
+        xml-plus = super."xml+";
+      };
+
+      stable = {
+        # part of a larger package
+        # upstream issue: missing package version
+        cmake-mode = markBroken (dontConfigure super.cmake-mode);
+
+        # upstream issue: missing file header
+        connection = markBroken super.connection;
+
+        # upstream issue: missing file header
+        dictionary = markBroken super.dictionary;
+
+        # missing git
+        egg = markBroken super.egg;
+
+        # upstream issue: missing dependency redshank
+        emr = markBroken super.emr;
+
+        # upstream issue: doesn't build
+        eterm-256color = markBroken super.eterm-256color;
+
+        # upstream issue: missing dependency highlight
+        evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
+
+        # upstream issue: missing dependency highlight
+        floobits  = markBroken super.floobits;
+
+        # missing OCaml
+        flycheck-ocaml = markBroken super.flycheck-ocaml;
+
+        # upstream issue: missing dependency
+        fold-dwim-org = markBroken super.fold-dwim-org;
+
+        # build timeout
+        graphene = markBroken super.graphene;
+
+        # Expects bash to be at /bin/bash
+        helm-rtags = markBroken super.helm-rtags;
+
+        # upstream issue: missing file header
+        link = markBroken super.link;
+
+        # missing OCaml
+        merlin = markBroken super.merlin;
+
+        # upstream issue: missing file header
+        po-mode = markBroken super.po-mode;
+
+        # upstream issue: truncated file
+        powershell = markBroken super.powershell;
+      };
+
+      unstable = shared // {
+        # upstream issue: mismatched filename
+        ack-menu = markBroken super.ack-menu;
+
+        editorconfig = super.editorconfig.overrideAttrs (attrs: {
+          propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
+        });
+
+        egg = super.egg.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-      magit-annex = super.magit-annex.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
+        # missing dependencies
+        evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: {
+          packageRequires = with self; [ evil highlight ];
+        });
 
-      magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      magithub = super.magithub.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      magit-svn = super.magit-svn.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      magit-todos = super.magit-todos.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      mhc = super.mhc.override {
-        inherit (self.melpaPackages) calfw;
-      };
-
-      # missing .NET
-      nemerle = markBroken super.nemerle;
-
-      # part of a larger package
-      notmuch = dontConfigure super.notmuch;
-
-      # missing OCaml
-      ocp-indent = markBroken super.ocp-indent;
-
-      orgit =
-        (super.orgit.overrideAttrs (attrs: {
+        forge = super.forge.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
-         }));
+        });
 
-      # tries to write to $HOME
-      php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
-        HOME = "/tmp";
-      });
+        # upstream issue: mismatched filename
+        helm-lobsters = markBroken super.helm-lobsters;
 
-      # upstream issue: mismatched filename
-      processing-snippets = markBroken super.processing-snippets;
+        # Expects bash to be at /bin/bash
+        helm-rtags = markBroken super.helm-rtags;
 
-      # upstream issue: missing file header
-      qiita = markBroken super.qiita;
-
-      racer = super.racer.overrideAttrs (attrs: {
-        postPatch = attrs.postPatch or "" + ''
-          substituteInPlace racer.el \
-            --replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc}
-        '';
-      });
-
-      # upstream issue: missing file footer
-      seoul256-theme = markBroken super.seoul256-theme;
-
-      spaceline = super.spaceline.override {
-        inherit (self.melpaPackages) powerline;
-      };
-
-      # upstream issue: missing file header
-      speech-tagger = markBroken super.speech-tagger;
-
-      # upstream issue: missing file header
-      stgit = markBroken super.stgit;
-
-      # upstream issue: missing file header
-      tawny-mode = markBroken super.tawny-mode;
-
-      # upstream issue: missing file header
-      textmate = markBroken super.textmate;
-
-      treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      # missing OCaml
-      utop = markBroken super.utop;
-
-      vdiff-magit =
-        (super.vdiff-magit.overrideAttrs (attrs: {
+        magit-annex = super.magit-annex.overrideAttrs (attrs: {
+          # searches for Git at build time
           nativeBuildInputs =
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        }));
-
-      # upstream issue: missing file header
-      voca-builder = markBroken super.voca-builder;
-
-      # upstream issue: missing file header
-      window-numbering = markBroken super.window-numbering;
-
-      w3m = super.w3m.override (args: {
-        melpaBuild = drv: args.melpaBuild (drv // {
-          prePatch =
-            let w3m = "${lib.getBin external.w3m}/bin/w3m"; in ''
-              substituteInPlace w3m.el \
-                --replace 'defcustom w3m-command nil' \
-                          'defcustom w3m-command "${w3m}"'
-            '';
         });
-      });
 
-      # Map legacy renames from emacs2nix since code generation was ported to emacs lisp
-      _0blayout = super."0blayout";
-      _0xc = super."0xc";
-      _2048-game = super."2048-game";
-      _4clojure = super."4clojure";
-      at = super."@";
-      desktop-plus = super."desktop+";
-      # filesets-plus = super."filesets+";
-      ghub-plus = super."ghub+";
-      git-gutter-plus = super."git-gutter+";
-      git-gutter-fringe-plus = super."git-gutter-fringe+";
-      ido-completing-read-plus = super."ido-completing-read+";
-      image-plus = super."image+";
-      image-dired-plus = super."image-dired+";
-      markdown-mode-plus = super."markdown-mode+";
-      package-plus = super."package+";
-      rect-plus = super."rect+";
-      term-plus = super."term+";
-      term-plus-key-intercept = super."term+key-intercept";
-      term-plus-mux = super."term+mux";
-      xml-plus = super."xml+";
+        magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
 
+        magithub = super.magithub.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-svn = super.magit-svn.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        orgit =
+          (super.orgit.overrideAttrs (attrs: {
+            # searches for Git at build time
+            nativeBuildInputs =
+              (attrs.nativeBuildInputs or []) ++ [ external.git ];
+           }));
+
+        # tries to write to $HOME
+        php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
+          HOME = "/tmp";
+        });
+
+        # upstream issue: mismatched filename
+        processing-snippets = markBroken super.processing-snippets;
+
+        racer = super.racer.overrideAttrs (attrs: {
+          postPatch = attrs.postPatch or "" + ''
+            substituteInPlace racer.el \
+              --replace /usr/local/src/rust/src ${external.rustPlatform.rustcSrc}
+          '';
+        });
+
+        # upstream issue: missing file footer
+        seoul256-theme = markBroken super.seoul256-theme;
+
+        spaceline = super.spaceline.override {
+          inherit (self.melpaPackages) powerline;
+        };
+
+        treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        w3m = super.w3m.override (args: {
+          melpaBuild = drv: args.melpaBuild (drv // {
+            prePatch =
+              let w3m = "${lib.getBin external.w3m}/bin/w3m"; in ''
+                substituteInPlace w3m.el \
+                  --replace 'defcustom w3m-command nil' \
+                            'defcustom w3m-command "${w3m}"'
+              '';
+          });
+        });
+      };
     };
 
-    melpaPackages =
-      removeAttrs (super // overrides)
-      [
-        "show-marks"  # missing dependency: fm
-        "lenlen-theme"  # missing dependency: color-theme-solarized
-      ];
-  in
-    melpaPackages // { inherit melpaPackages; }
+  in super // overrides."${variant}");
+
+in generateMelpa { }
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
deleted file mode 100644
index 8f52f2d3489..00000000000
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-
-# Updating
-
-To update the list of packages from MELPA,
-
-
-1. Run ./update-melpa
-2. Check for evaluation errors:
-env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaStablePackages
-env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaPackages
-3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
-
-*/
-
-{ lib, external }:
-
-self:
-
-  let
-    inherit (import ./libgenerated.nix lib self) melpaDerivation;
-    imported = lib.listToAttrs (map (melpaDerivation "stable")
-                                    (lib.importJSON ./recipes-archive-melpa.json));
-    super = imported;
-
-    dontConfigure = pkg: pkg.override (args: {
-      melpaBuild = drv: args.melpaBuild (drv // {
-        configureScript = "true";
-      });
-    });
-
-    markBroken = pkg: if pkg != null then pkg.override (args: {
-      melpaBuild = drv: args.melpaBuild (drv // {
-        meta = (drv.meta or {}) // { broken = true; };
-      });
-    }) else null;
-
-    overrides = {
-      # Expects bash to be at /bin/bash
-      ac-rtags = markBroken super.ac-rtags;
-
-      airline-themes = super.airline-themes.override {
-        inherit (self.melpaPackages) powerline;
-      };
-
-      # upstream issue: missing file header
-      bufshow = markBroken super.bufshow;
-
-      # part of a larger package
-      caml = dontConfigure super.caml;
-
-      # part of a larger package
-      # upstream issue: missing package version
-      cmake-mode = markBroken (dontConfigure super.cmake-mode);
-
-      # Expects bash to be at /bin/bash
-      company-rtags = markBroken super.company-rtags;
-
-      # upstream issue: missing file header
-      connection = markBroken super.connection;
-
-      # upstream issue: missing file header
-      dictionary = markBroken super.dictionary;
-
-      easy-kill-extras = super.easy-kill-extras.override {
-        inherit (self.melpaPackages) easy-kill;
-      };
-
-      # missing git
-      egg = markBroken super.egg;
-
-      # upstream issue: missing file header
-      elmine = markBroken super.elmine;
-
-      # upstream issue: missing dependency redshank
-      emr = markBroken super.emr;
-
-      ess-R-data-view = super.ess-R-data-view.override {
-        inherit (self.melpaPackages) ess ctable popup;
-      };
-
-      # upstream issue: doesn't build
-      eterm-256color = markBroken super.eterm-256color;
-
-      # upstream issue: missing dependency highlight
-      evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
-
-      # upstream issue: missing dependency highlight
-      floobits  = markBroken super.floobits;
-
-      # missing OCaml
-      flycheck-ocaml = markBroken super.flycheck-ocaml;
-
-      # Expects bash to be at /bin/bash
-      flycheck-rtags = markBroken super.flycheck-rtags;
-
-      # upstream issue: missing dependency
-      fold-dwim-org = markBroken super.fold-dwim-org;
-
-      # build timeout
-      graphene = markBroken super.graphene;
-
-      # Expects bash to be at /bin/bash
-      helm-rtags = markBroken super.helm-rtags;
-
-      # Build same version as Haskell package
-      hindent = super.hindent.overrideAttrs (attrs: {
-        version = external.hindent.version;
-        src = external.hindent.src;
-        packageRequires = [ self.haskell-mode ];
-        propagatedUserEnvPkgs = [ external.hindent ];
-      });
-
-      # upstream issue: missing file header
-      ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
-
-      # upstream issue: missing file header
-      initsplit = markBroken super.initsplit;
-
-      # upstream issue: recipe fails
-      insert-shebang = markBroken super.insert-shebang;
-
-      # Expects bash to be at /bin/bash
-      ivy-rtags = markBroken super.ivy-rtags;
-
-      # upstream issue: missing file header
-      jsfmt = markBroken super.jsfmt;
-
-      # upstream issue: missing file header
-      link = markBroken super.link;
-
-      # upstream issue: missing file header
-      maxframe = markBroken super.maxframe;
-
-      magit =
-        (super.magit.override {
-          # version of magit-popup needs to match magit
-          # https://github.com/magit/magit/issues/3286
-          inherit (self.melpaStablePackages) magit-popup;
-        }).overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
-      magit-todos = super.magit-todos.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
-        # searches for Git at build time
-        nativeBuildInputs =
-          (attrs.nativeBuildInputs or []) ++ [ external.git ];
-      });
-
-      # missing OCaml
-      merlin = markBroken super.merlin;
-
-      mhc = super.mhc.override {
-        inherit (self.melpaPackages) calfw;
-      };
-
-      # missing .NET
-      nemerle = markBroken super.nemerle;
-
-      # part of a larger package
-      notmuch = dontConfigure super.notmuch;
-
-      # missing OCaml
-      ocp-indent = markBroken super.ocp-indent;
-
-      # upstream issue: missing file header
-      po-mode = markBroken super.po-mode;
-
-      # upstream issue: truncated file
-      powershell = markBroken super.powershell;
-
-      # upstream issue: missing file header
-      qiita = markBroken super.qiita;
-
-      # upstream issue: missing file header
-      speech-tagger = markBroken super.speech-tagger;
-
-      # upstream issue: missing file header
-      stgit = markBroken super.stgit;
-
-      # upstream issue: missing file header
-      tawny-mode = markBroken super.tawny-mode;
-
-      # upstream issue: missing file header
-      textmate = markBroken super.textmate;
-
-      # missing OCaml
-      utop = markBroken super.utop;
-
-      vdiff-magit =
-        (super.vdiff-magit.overrideAttrs (attrs: {
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        }));
-
-      # upstream issue: missing file header
-      voca-builder = markBroken super.voca-builder;
-
-      # upstream issue: missing file header
-      window-numbering = markBroken super.window-numbering;
-
-      # Map legacy renames from emacs2nix since code generation was ported to emacs lisp
-      _0blayout = super."0blayout";
-      _0xc = super."0xc";
-      _2048-game = super."2048-game";
-      _4clojure = super."4clojure";
-      at = super."@";
-      desktop-plus = super."desktop+";
-      ghub-plus = super."ghub+";
-      git-gutter-plus = super."git-gutter+";
-      git-gutter-fringe-plus = super."git-gutter-fringe+";
-      ido-completing-read-plus = super."ido-completing-read+";
-      image-plus = super."image+";
-      image-dired-plus = super."image-dired+";
-      markdown-mode-plus = super."markdown-mode+";
-      package-plus = super."package+";
-      rect-plus = super."rect+";
-      term-plus = super."term+";
-      term-plus-key-intercept = super."term+key-intercept";
-      term-plus-mux = super."term+mux";
-      xml-plus = super."xml+";
-
-    };
-
-    melpaStablePackages = super // overrides;
-  in
-    melpaStablePackages // { inherit melpaStablePackages; }
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index e1b93954448..23e00708949 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -49,13 +49,18 @@ let
     inherit lib stdenv texinfo;
   };
 
-  melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
+  # Contains both melpa stable & unstable
+  melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
     inherit external lib;
   };
 
-  melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
-    inherit external lib;
-  };
+  melpaStablePackages = self: let
+    m = melpaGeneric "stable" self;
+  in {melpaStablePackages = m;} // m;
+
+  melpaPackages = self: let
+    m = melpaGeneric "unstable" self;
+  in {melpaPackages = m;} // m;
 
   orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
 
@@ -455,12 +460,11 @@ let
 
   };
 
-in
-  lib.makeScope newScope (self:
-    {}
-    // elpaPackages self
-    // melpaStablePackages self
-    // melpaPackages self
-    // orgPackages self
-    // packagesFun self
-  )
+in lib.makeScope newScope (self:
+  removeAttrs ({}
+  // elpaPackages self
+  // melpaStablePackages self
+  // melpaPackages self
+  // orgPackages self
+  // packagesFun self) [ "override" "overrideDerivation" ]
+)

From b88c30579a16499ad76ebc333e5d9df625aef854 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 3 Aug 2019 22:55:20 +0100
Subject: [PATCH 484/562] emacs-packages.nix: Fix indent

---
 pkgs/top-level/emacs-packages.nix | 674 +++++++++++++++---------------
 1 file changed, 337 insertions(+), 337 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 23e00708949..900cd3e01ca 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -70,393 +70,393 @@ let
 
   packagesFun = self: with self; {
 
-  inherit emacs melpaBuild trivialBuild;
+    inherit emacs melpaBuild trivialBuild;
 
-  emacsWithPackages = emacsWithPackages self;
+    emacsWithPackages = emacsWithPackages self;
 
-  ## START HERE
+    ## START HERE
 
-  pdf-tools = melpaBuild rec {
-    pname = "pdf-tools";
-    version = "0.90";
-    src = fetchFromGitHub {
-      owner = "politza";
-      repo = "pdf-tools";
-      rev = "v${version}";
-      sha256 = "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9";
+    pdf-tools = melpaBuild rec {
+      pname = "pdf-tools";
+      version = "0.90";
+      src = fetchFromGitHub {
+        owner = "politza";
+        repo = "pdf-tools";
+        rev = "v${version}";
+        sha256 = "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9";
+      };
+      nativeBuildInputs = [ external.pkgconfig ];
+      buildInputs = with external; [ autoconf automake libpng zlib poppler ];
+      preBuild = "make server/epdfinfo";
+      recipe = writeText "recipe" ''
+        (pdf-tools
+        :repo "politza/pdf-tools" :fetcher github
+        :files ("lisp/pdf-*.el" "server/epdfinfo"))
+      '';
+      packageRequires = [ tablist let-alist ];
+      meta = {
+        description = "Emacs support library for PDF files";
+        license = gpl3;
+      };
     };
-    nativeBuildInputs = [ external.pkgconfig ];
-    buildInputs = with external; [ autoconf automake libpng zlib poppler ];
-    preBuild = "make server/epdfinfo";
-    recipe = writeText "recipe" ''
-      (pdf-tools
-       :repo "politza/pdf-tools" :fetcher github
-       :files ("lisp/pdf-*.el" "server/epdfinfo"))
-    '';
-    packageRequires = [ tablist let-alist ];
-    meta = {
-      description = "Emacs support library for PDF files";
-      license = gpl3;
-    };
-  };
 
-  elisp-ffi = melpaBuild rec {
-    pname = "elisp-ffi";
-    version = "1.0.0";
-    src = fetchFromGitHub {
+    elisp-ffi = melpaBuild rec {
+      pname = "elisp-ffi";
+      version = "1.0.0";
+      src = fetchFromGitHub {
         owner = "skeeto";
         repo = "elisp-ffi";
         rev = "${version}";
         sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
-    };
-    buildInputs = [ external.libffi ];
-    preBuild = "make";
-    recipe = writeText "recipe" ''
-      (elisp-ffi
-      :repo "skeeto/elisp-ffi"
-      :fetcher github
-      :files ("ffi-glue" "ffi.el"))
-    '';
-    meta = {
-      description = "Emacs Lisp Foreign Function Interface";
-      longDescription = ''
-      This library provides an FFI for Emacs Lisp so that Emacs
-      programs can invoke functions in native libraries. It works by
-      driving a subprocess to do the heavy lifting, passing result
-      values on to Emacs.
+      };
+      buildInputs = [ external.libffi ];
+      preBuild = "make";
+      recipe = writeText "recipe" ''
+        (elisp-ffi
+        :repo "skeeto/elisp-ffi"
+        :fetcher github
+        :files ("ffi-glue" "ffi.el"))
       '';
-      license = publicDomain;
+      meta = {
+        description = "Emacs Lisp Foreign Function Interface";
+        longDescription = ''
+          This library provides an FFI for Emacs Lisp so that Emacs
+          programs can invoke functions in native libraries. It works by
+          driving a subprocess to do the heavy lifting, passing result
+          values on to Emacs.
+        '';
+        license = publicDomain;
+      };
     };
-  };
 
-  agda2-mode = with external; trivialBuild {
-    pname = "agda-mode";
-    version = Agda.version;
+    agda2-mode = with external; trivialBuild {
+      pname = "agda-mode";
+      version = Agda.version;
 
-    phases = [ "buildPhase" "installPhase" ];
+      phases = [ "buildPhase" "installPhase" ];
 
-    # already byte-compiled by Agda builder
-    buildPhase = ''
-      agda=`${Agda}/bin/agda-mode locate`
-      cp `dirname $agda`/*.el* .
-    '';
-
-    meta = {
-      description = "Agda2-mode for Emacs extracted from Agda package";
-      longDescription = ''
-        Wrapper packages that liberates init.el from `agda-mode locate` magic.
-        Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
+      # already byte-compiled by Agda builder
+      buildPhase = ''
+        agda=`${Agda}/bin/agda-mode locate`
+        cp `dirname $agda`/*.el* .
       '';
-      homepage = Agda.meta.homepage;
-      license = Agda.meta.license;
+
+      meta = {
+        description = "Agda2-mode for Emacs extracted from Agda package";
+        longDescription = ''
+          Wrapper packages that liberates init.el from `agda-mode locate` magic.
+          Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
+        '';
+        homepage = Agda.meta.homepage;
+        license = Agda.meta.license;
+      };
     };
-  };
 
-  emacsql-sqlite = melpaBuild rec {
-    pname = "emacsql-sqlite";
-    ename = "emacsql-sqlite";
-    version = "20180128.1252";
-    src = fetchFromGitHub {
-      owner = "skeeto";
-      repo = "emacsql";
-      rev = "62d39157370219a1680265fa593f90ccd51457da";
-      sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9";
-    };
-    recipe = fetchurl {
-      url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
-      sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
-      name = "recipe";
-    };
-    preBuild = ''
-      cd sqlite
-      make
-    '';
-    stripDebugList = [ "share" ];
-    packageRequires = [ emacs emacsql ];
-    meta = {
-      homepage = "https://melpa.org/#/emacsql-sqlite";
-      license = lib.licenses.free;
-    };
-  };
-
-  elpy = melpaBuild rec {
-    pname   = "elpy";
-    version = external.elpy.version;
-    src = fetchFromGitHub {
-      owner  = "jorgenschaefer";
-      repo   = pname;
-      rev    = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8";
-      sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs";
-    };
-    recipe = writeText "recipe" ''
-      (elpy :repo "jorgenschaefer/elpy" :fetcher github)
-    '';
-
-    patchPhase = ''
-      for file in elpy.el elpy-pkg.el; do
-        substituteInPlace $file \
-            --replace "company \"0.8.2\"" "company \"${company.version}\"" \
-            --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \
-            --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
-            --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
-            --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
-     done
-    '';
-
-    packageRequires = [
-      company find-file-in-project highlight-indentation pyvenv yasnippet
-    ];
-
-    propagatedUserEnvPkgs = [ external.elpy ] ++ packageRequires;
-
-    meta = {
-      description = "Emacs Python Development Environment";
-      longDescription = ''
-        Elpy is an Emacs package to bring powerful Python editing to Emacs.
-        It combines a number of other packages, both written in Emacs Lisp as
-        well as Python.
+    emacsql-sqlite = melpaBuild rec {
+      pname = "emacsql-sqlite";
+      ename = "emacsql-sqlite";
+      version = "20180128.1252";
+      src = fetchFromGitHub {
+        owner = "skeeto";
+        repo = "emacsql";
+        rev = "62d39157370219a1680265fa593f90ccd51457da";
+        sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9";
+      };
+      recipe = fetchurl {
+        url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
+        sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
+        name = "recipe";
+      };
+      preBuild = ''
+        cd sqlite
+        make
       '';
-      license = gpl3Plus;
+      stripDebugList = [ "share" ];
+      packageRequires = [ emacs emacsql ];
+      meta = {
+        homepage = "https://melpa.org/#/emacsql-sqlite";
+        license = lib.licenses.free;
+      };
     };
-  };
 
-  emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
+    elpy = melpaBuild rec {
+      pname   = "elpy";
+      version = external.elpy.version;
+      src = fetchFromGitHub {
+        owner  = "jorgenschaefer";
+        repo   = pname;
+        rev    = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8";
+        sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs";
+      };
+      recipe = writeText "recipe" ''
+        (elpy :repo "jorgenschaefer/elpy" :fetcher github)
+      '';
 
-  evil-jumper = melpaBuild rec {
-    pname   = "evil-jumper";
-    version = "20151017";
-    src = fetchFromGitHub {
-      owner  = "bling";
-      repo   = pname;
-      rev    = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167";
-      sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj";
+      patchPhase = ''
+        for file in elpy.el elpy-pkg.el; do
+          substituteInPlace $file \
+              --replace "company \"0.8.2\"" "company \"${company.version}\"" \
+              --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \
+              --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
+              --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
+              --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
+       done
+      '';
+
+      packageRequires = [
+        company find-file-in-project highlight-indentation pyvenv yasnippet
+      ];
+
+      propagatedUserEnvPkgs = [ external.elpy ] ++ packageRequires;
+
+      meta = {
+        description = "Emacs Python Development Environment";
+        longDescription = ''
+          Elpy is an Emacs package to bring powerful Python editing to Emacs.
+          It combines a number of other packages, both written in Emacs Lisp as
+          well as Python.
+        '';
+        license = gpl3Plus;
+      };
     };
-    recipe = writeText "recipe" ''
-      (evil-jumper :repo "bling/evil-jumper" :fetcher github)
-    '';
-    packageRequires = [ evil ];
-    meta = {
-      description = "Jump across buffer boundaries and revive dead buffers if necessary";
-      license = gpl3Plus;
+
+    emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
+
+    evil-jumper = melpaBuild rec {
+      pname   = "evil-jumper";
+      version = "20151017";
+      src = fetchFromGitHub {
+        owner  = "bling";
+        repo   = pname;
+        rev    = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167";
+        sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj";
+      };
+      recipe = writeText "recipe" ''
+        (evil-jumper :repo "bling/evil-jumper" :fetcher github)
+      '';
+      packageRequires = [ evil ];
+      meta = {
+        description = "Jump across buffer boundaries and revive dead buffers if necessary";
+        license = gpl3Plus;
+      };
     };
-  };
 
-  ess-R-object-popup =
-    callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
+    ess-R-object-popup =
+      callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
 
-  filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { };
+    filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { };
 
-  font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { };
+    font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { };
 
-  ghc-mod = melpaBuild rec {
-    pname = "ghc";
-    version = external.ghc-mod.version;
-    src = external.ghc-mod.src;
-    packageRequires = [ haskell-mode ];
-    propagatedUserEnvPkgs = [ external.ghc-mod ];
-    recipe = writeText "recipe" ''
-      (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
-    '';
-    fileSpecs = [ "elisp/*.el" ];
-    meta = {
-      description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
-      license = bsd3;
+    ghc-mod = melpaBuild rec {
+      pname = "ghc";
+      version = external.ghc-mod.version;
+      src = external.ghc-mod.src;
+      packageRequires = [ haskell-mode ];
+      propagatedUserEnvPkgs = [ external.ghc-mod ];
+      recipe = writeText "recipe" ''
+        (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
+      '';
+      fileSpecs = [ "elisp/*.el" ];
+      meta = {
+        description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
+        license = bsd3;
+      };
     };
-  };
 
-  haskell-unicode-input-method = melpaBuild rec {
-    pname = "emacs-haskell-unicode-input-method";
-    version = "20110905.2307";
-    src = fetchFromGitHub {
-      owner = "roelvandijk";
-      repo = "emacs-haskell-unicode-input-method";
-      rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
-      sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
+    haskell-unicode-input-method = melpaBuild rec {
+      pname = "emacs-haskell-unicode-input-method";
+      version = "20110905.2307";
+      src = fetchFromGitHub {
+        owner = "roelvandijk";
+        repo = "emacs-haskell-unicode-input-method";
+        rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
+        sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
+      };
+      recipe = writeText "recipe" ''
+        (haskell-unicode-input-method
+         :repo "roelvandijk/emacs-haskell-unicode-input-method"
+         :fetcher github)
+      '';
+      packageRequires = [];
+      meta = {
+        homepage = "https://melpa.org/#haskell-unicode-input-method/";
+        license = lib.licenses.free;
+      };
     };
-    recipe = writeText "recipe" ''
-      (haskell-unicode-input-method
-       :repo "roelvandijk/emacs-haskell-unicode-input-method"
-       :fetcher github)
-    '';
-    packageRequires = [];
-    meta = {
-      homepage = "https://melpa.org/#haskell-unicode-input-method/";
-      license = lib.licenses.free;
+
+    hexrgb = callPackage ../applications/editors/emacs-modes/hexrgb { };
+
+    header2 = callPackage ../applications/editors/emacs-modes/header2 { };
+
+    helm-words = callPackage ../applications/editors/emacs-modes/helm-words { };
+
+    icicles = callPackage ../applications/editors/emacs-modes/icicles { };
+
+    irony = melpaBuild rec {
+      pname = "irony";
+      ename = "irony";
+      version = "20190516";
+      src = fetchFromGitHub {
+        owner = "Sarcasm";
+        repo = "irony-mode";
+        rev = "c3ae899b61124a747ebafc705086345e460ac08e";
+        sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
+      };
+      recipe = fetchurl {
+        url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony";
+        sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
+        name = "recipe";
+      };
+      preConfigure = ''
+        cd server
+      '';
+      preBuild = ''
+        make
+      '';
+      postInstall = ''
+        mkdir -p $out
+        mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
+        rm -rf $out/share/emacs/site-lisp/elpa/*/server
+      '';
+      preCheck = ''
+        cd source/server
+      '';
+      dontUseCmakeBuildDir = true;
+      doCheck = true;
+      packageRequires = [ emacs ];
+      nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
+      meta = {
+        homepage = "https://melpa.org/#/irony";
+        license = lib.licenses.gpl3;
+      };
     };
-  };
 
-  hexrgb = callPackage ../applications/editors/emacs-modes/hexrgb { };
+    redshank = callPackage ../applications/editors/emacs-modes/redshank { };
 
-  header2 = callPackage ../applications/editors/emacs-modes/header2 { };
+    rtags = melpaBuild rec {
+      pname = "rtags";
+      version = "2.12";
+      src = external.rtags.src;
 
-  helm-words = callPackage ../applications/editors/emacs-modes/helm-words { };
+      dontConfigure = true;
 
-  icicles = callPackage ../applications/editors/emacs-modes/icicles { };
-
-  irony = melpaBuild rec {
-    pname = "irony";
-    ename = "irony";
-    version = "20190516";
-    src = fetchFromGitHub {
-      owner = "Sarcasm";
-      repo = "irony-mode";
-      rev = "c3ae899b61124a747ebafc705086345e460ac08e";
-      sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
+      propagatedUserEnvPkgs = [ external.rtags ];
+      recipe = writeText "recipe" ''
+        (rtags
+         :repo "andersbakken/rtags" :fetcher github
+         :files ("src/*.el"))
+      '';
+      inherit (external.rtags) meta;
     };
-    recipe = fetchurl {
-      url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony";
-      sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
-      name = "recipe";
+
+    lcs = melpaBuild rec {
+      pname   = "lcs";
+      version = circe.version;
+      src     = circe.src;
+      recipe  = writeText "recipe" ''
+        (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lcs.el"))
+      '';
+      meta = {
+        description = "Longest Common Sequence (LCS) library for Emacs";
+        license = gpl3Plus;
+      };
     };
-    preConfigure = ''
-      cd server
-    '';
-    preBuild = ''
-      make
-    '';
-    postInstall = ''
-      mkdir -p $out
-      mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
-      rm -rf $out/share/emacs/site-lisp/elpa/*/server
-    '';
-    preCheck = ''
-      cd source/server
-    '';
-    dontUseCmakeBuildDir = true;
-    doCheck = true;
-    packageRequires = [ emacs ];
-    nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
-    meta = {
-      homepage = "https://melpa.org/#/irony";
-      license = lib.licenses.gpl3;
+
+    lib-requires =
+      callPackage ../applications/editors/emacs-modes/lib-requires { };
+
+    lui = melpaBuild rec {
+      pname   = "lui";
+      version = circe.version;
+      src     = circe.src;
+      packageRequires = [ tracking ];
+      recipe  = writeText "recipe" ''
+        (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lui*.el"))
+      '';
+      meta = {
+        description = "User interface library for Emacs";
+        license = gpl3Plus;
+      };
     };
-  };
 
-  redshank = callPackage ../applications/editors/emacs-modes/redshank { };
-
-  rtags = melpaBuild rec {
-    pname = "rtags";
-    version = "2.12";
-    src = external.rtags.src;
-
-    dontConfigure = true;
-
-    propagatedUserEnvPkgs = [ external.rtags ];
-    recipe = writeText "recipe" ''
-      (rtags
-       :repo "andersbakken/rtags" :fetcher github
-       :files ("src/*.el"))
-    '';
-    inherit (external.rtags) meta;
-  };
-
-  lcs = melpaBuild rec {
-    pname   = "lcs";
-    version = circe.version;
-    src     = circe.src;
-    recipe  = writeText "recipe" ''
-      (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lcs.el"))
-    '';
-    meta = {
-      description = "Longest Common Sequence (LCS) library for Emacs";
-      license = gpl3Plus;
+    nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
+      inherit lib;
     };
-  };
 
-  lib-requires =
-    callPackage ../applications/editors/emacs-modes/lib-requires { };
+    org-mac-link =
+      callPackage ../applications/editors/emacs-modes/org-mac-link { };
 
-  lui = melpaBuild rec {
-    pname   = "lui";
-    version = circe.version;
-    src     = circe.src;
-    packageRequires = [ tracking ];
-    recipe  = writeText "recipe" ''
-      (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lui*.el"))
-    '';
-    meta = {
-      description = "User interface library for Emacs";
-      license = gpl3Plus;
+    perl-completion =
+      callPackage ../applications/editors/emacs-modes/perl-completion { };
+
+    railgun = callPackage ../applications/editors/emacs-modes/railgun { };
+
+    gn = callPackage ../applications/editors/emacs-modes/gn { };
+
+    shorten = melpaBuild rec {
+      pname   = "shorten";
+      version = circe.version;
+      src     = circe.src;
+      recipe  = writeText "recipe" ''
+        (shorten :repo "jorgenschaefer/circe" :fetcher github :files ("shorten.el"))
+      '';
+      meta = {
+        description = "String shortening to unique prefix library for Emacs";
+        license = gpl3Plus;
+      };
     };
-  };
 
-  nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
-    inherit lib;
-  };
+    stgit = callPackage ../applications/editors/emacs-modes/stgit { };
 
-  org-mac-link =
-    callPackage ../applications/editors/emacs-modes/org-mac-link { };
+    structured-haskell-mode = self.shm;
+    shm = (melpaPackages self).shm.overrideAttrs (attrs: {
+      propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
+    });
 
-  perl-completion =
-    callPackage ../applications/editors/emacs-modes/perl-completion { };
+    thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };
 
-  railgun = callPackage ../applications/editors/emacs-modes/railgun { };
+    tramp = callPackage ../applications/editors/emacs-modes/tramp { };
 
-  gn = callPackage ../applications/editors/emacs-modes/gn { };
+    yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { };
 
-  shorten = melpaBuild rec {
-    pname   = "shorten";
-    version = circe.version;
-    src     = circe.src;
-    recipe  = writeText "recipe" ''
-      (shorten :repo "jorgenschaefer/circe" :fetcher github :files ("shorten.el"))
-    '';
-    meta = {
-      description = "String shortening to unique prefix library for Emacs";
-      license = gpl3Plus;
+    zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { };
+
+    zmq = melpaBuild rec {
+      pname = "zmq";
+      ename = "zmq";
+      version = "0.10.10";
+      src = fetchFromGitHub {
+        owner = "dzop";
+        repo = "emacs-zmq";
+        rev = "v0.10.10";
+        sha256 = "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8";
+      };
+      recipe = fetchurl {
+        url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq";
+        sha256 = "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc";
+        name = "recipe";
+      };
+      stripDebugList = [ "share" ];
+      packageRequires = [ emacs ];
+      nativeBuildInputs = [
+        external.autoconf external.automake external.pkgconfig external.libtool
+        (external.zeromq.override { enableDrafts = true; })
+      ];
+      preBuild = ''
+        make
+      '';
+      postInstall = ''
+        mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-*
+        rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
+        rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
+      '';
+      meta = {
+        homepage = "https://melpa.org/#/zmq";
+        description = "Emacs bindings to ØMQ";
+        license = lib.licenses.gpl2;
+      };
     };
-  };
-
-  stgit = callPackage ../applications/editors/emacs-modes/stgit { };
-
-  structured-haskell-mode = self.shm;
-  shm = (melpaPackages self).shm.overrideAttrs (attrs: {
-    propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
-  });
-
-  thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };
-
-  tramp = callPackage ../applications/editors/emacs-modes/tramp { };
-
-  yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { };
-
-  zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { };
-
-  zmq = melpaBuild rec {
-    pname = "zmq";
-    ename = "zmq";
-    version = "0.10.10";
-    src = fetchFromGitHub {
-      owner = "dzop";
-      repo = "emacs-zmq";
-      rev = "v0.10.10";
-      sha256 = "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8";
-    };
-    recipe = fetchurl {
-      url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq";
-      sha256 = "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc";
-      name = "recipe";
-    };
-    stripDebugList = [ "share" ];
-    packageRequires = [ emacs ];
-    nativeBuildInputs = [
-      external.autoconf external.automake external.pkgconfig external.libtool
-      (external.zeromq.override { enableDrafts = true; })
-    ];
-    preBuild = ''
-      make
-    '';
-    postInstall = ''
-      mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-*
-      rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
-      rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
-    '';
-    meta = {
-      homepage = "https://melpa.org/#/zmq";
-      description = "Emacs bindings to ØMQ";
-      license = lib.licenses.gpl2;
-    };
-  };
 
   };
 

From 6742c9976a57c1bca1a427b02a6c02f3b744068b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 02:26:52 +0100
Subject: [PATCH 485/562] emacs-packages: Move shm

Use autogenerated modules from melpa instead
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++++
 pkgs/top-level/emacs-packages.nix                        | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 5f05d3b2695..c44f302044c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -151,6 +151,10 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         stgit = markBroken super.stgit;
 
+        shm = super.shm.overrideAttrs (attrs: {
+          propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
+        });
+
         # upstream issue: missing file header
         tawny-mode = markBroken super.tawny-mode;
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 900cd3e01ca..920f6757f60 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -410,9 +410,6 @@ let
     stgit = callPackage ../applications/editors/emacs-modes/stgit { };
 
     structured-haskell-mode = self.shm;
-    shm = (melpaPackages self).shm.overrideAttrs (attrs: {
-      propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
-    });
 
     thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };
 

From 1fc89fcad83568ab947f634198b5d1add102fec3 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 02:28:27 +0100
Subject: [PATCH 486/562] emacs-packages: Drop manually created nyan-mode
 derivation

Use autogenerated modules from melpa instead
---
 .../editors/emacs-modes/nyan-mode/default.nix | 30 -------------------
 .../emacs-modes/nyan-mode/directory.patch     | 13 --------
 pkgs/top-level/emacs-packages.nix             |  4 ---
 3 files changed, 47 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch

diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
deleted file mode 100644
index e0057fd30ce..00000000000
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{lib, trivialBuild, fetchFromGitHub}:
-
-trivialBuild rec {
-  pname    = "nyan-mode";
-  version  = "20150128";
-
-  src = fetchFromGitHub {
-    owner  = "TeMPOraL";
-    repo   = pname;
-    rev    = "41faa2c809da7b2cb3e6f8fadefae3f338ced3f2";
-    sha256 = "1idaac7sjc8hhbf5zif61ncg1pvg28c0qfihavdx61albww0ll7f";
-  };
-
-  patches = [ ./directory.patch ];
-
-  preBuild = ''
-    substituteInPlace nyan-mode.el \
-      --replace "@OUT@" "$out/"
-  '';
-
-  postInstall = ''
-    cp -r img $out
-    cp -r mus $out
-  '';
-
-  meta = {
-    description = "An analog indicator of the position in the buffer";
-    license = lib.licenses.gpl3Plus;
-  };
-}
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch b/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch
deleted file mode 100644
index b471531ec34..00000000000
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/directory.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/nyan-mode.el b/nyan-mode.el
-index 939a25a..3d0b983 100644
---- a/nyan-mode.el
-+++ b/nyan-mode.el
-@@ -106,7 +106,7 @@ This can be t or nil."
-   :group 'nyan)
- 
- 
--(defconst +nyan-directory+ (file-name-directory (or load-file-name buffer-file-name)))
-+(defconst +nyan-directory+ "@OUT@")
- 
- (defconst +nyan-cat-size+ 3)
- 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 920f6757f60..69f4fa66d16 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -380,10 +380,6 @@ let
       };
     };
 
-    nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
-      inherit lib;
-    };
-
     org-mac-link =
       callPackage ../applications/editors/emacs-modes/org-mac-link { };
 

From 20ff3edcfa1875f9ab7cd75d0354344e274b2dd9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 02:39:10 +0100
Subject: [PATCH 487/562] emacs-packages: Drop stgit

Use autogenerated modules from melpa instead
---
 .../editors/emacs-modes/melpa-packages.nix    |  3 ---
 .../editors/emacs-modes/stgit/default.nix     | 25 -------------------
 pkgs/top-level/emacs-packages.nix             |  2 --
 3 files changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/stgit/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index c44f302044c..f548b3372b8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -148,9 +148,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         speech-tagger = markBroken super.speech-tagger;
 
-        # upstream issue: missing file header
-        stgit = markBroken super.stgit;
-
         shm = super.shm.overrideAttrs (attrs: {
           propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
         });
diff --git a/pkgs/applications/editors/emacs-modes/stgit/default.nix b/pkgs/applications/editors/emacs-modes/stgit/default.nix
deleted file mode 100644
index b615accd721..00000000000
--- a/pkgs/applications/editors/emacs-modes/stgit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "stgit";
-  name = "${pname}-2009-10-28";
-
-  dontUnpack = true;
-
-  src = fetchurl {
-    url = "https://raw.githubusercontent.com/miracle2k/stgit/master/contrib/stgit.el";
-    sha256 = "0pl8q480633vdkylr85s7cbd4653xpzwklnxrwm8xhsnvw9d501q";
-    name = "stgit.el";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp $src $out/share/emacs/site-lisp/stgit.el
-  '';
-
-  meta = {
-    description = "An emacs mode for Stgit";
-    homepage = http://procode.org/stgit/;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 69f4fa66d16..278ada87e44 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -403,8 +403,6 @@ let
       };
     };
 
-    stgit = callPackage ../applications/editors/emacs-modes/stgit { };
-
     structured-haskell-mode = self.shm;
 
     thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };

From 334d3d90f6043274838b6aa996fde9d3f939df78 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 16:07:51 +0100
Subject: [PATCH 488/562] emacsPackagesNg.evil-jumper: Drop package

It's now merged upstream in evil-mode
---
 pkgs/top-level/emacs-packages.nix | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 278ada87e44..17c0ea50a64 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -222,25 +222,6 @@ let
 
     emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
 
-    evil-jumper = melpaBuild rec {
-      pname   = "evil-jumper";
-      version = "20151017";
-      src = fetchFromGitHub {
-        owner  = "bling";
-        repo   = pname;
-        rev    = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167";
-        sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj";
-      };
-      recipe = writeText "recipe" ''
-        (evil-jumper :repo "bling/evil-jumper" :fetcher github)
-      '';
-      packageRequires = [ evil ];
-      meta = {
-        description = "Jump across buffer boundaries and revive dead buffers if necessary";
-        license = gpl3Plus;
-      };
-    };
-
     ess-R-object-popup =
       callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
 

From 843eae6a51c874bbdf4c70af51168673c9aeeb63 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 16:11:56 +0100
Subject: [PATCH 489/562] emacs-packages: Drop emacsql-sqlite package

Use melpa generated package instead
---
 pkgs/top-level/emacs-packages.nix | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 17c0ea50a64..413090ce5b6 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -152,33 +152,6 @@ let
       };
     };
 
-    emacsql-sqlite = melpaBuild rec {
-      pname = "emacsql-sqlite";
-      ename = "emacsql-sqlite";
-      version = "20180128.1252";
-      src = fetchFromGitHub {
-        owner = "skeeto";
-        repo = "emacsql";
-        rev = "62d39157370219a1680265fa593f90ccd51457da";
-        sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9";
-      };
-      recipe = fetchurl {
-        url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
-        sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
-        name = "recipe";
-      };
-      preBuild = ''
-        cd sqlite
-        make
-      '';
-      stripDebugList = [ "share" ];
-      packageRequires = [ emacs emacsql ];
-      meta = {
-        homepage = "https://melpa.org/#/emacsql-sqlite";
-        license = lib.licenses.free;
-      };
-    };
-
     elpy = melpaBuild rec {
       pname   = "elpy";
       version = external.elpy.version;

From 6551f2aa5b9559566913697512524efcb2a98c3b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 16:14:55 +0100
Subject: [PATCH 490/562] emacs-packages: Drop lcs package

It's in the melpa generated package `circe`
---
 pkgs/top-level/emacs-packages.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 413090ce5b6..4916a226be5 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -304,19 +304,6 @@ let
       inherit (external.rtags) meta;
     };
 
-    lcs = melpaBuild rec {
-      pname   = "lcs";
-      version = circe.version;
-      src     = circe.src;
-      recipe  = writeText "recipe" ''
-        (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lcs.el"))
-      '';
-      meta = {
-        description = "Longest Common Sequence (LCS) library for Emacs";
-        license = gpl3Plus;
-      };
-    };
-
     lib-requires =
       callPackage ../applications/editors/emacs-modes/lib-requires { };
 

From 1236d2d7f53f049a0068477b69baffccf0026077 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 16:15:38 +0100
Subject: [PATCH 491/562] emacs-packages: Drop package `lui`

It's in the melpa generated package `circe`
---
 pkgs/top-level/emacs-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 4916a226be5..32fe0085e4b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -307,20 +307,6 @@ let
     lib-requires =
       callPackage ../applications/editors/emacs-modes/lib-requires { };
 
-    lui = melpaBuild rec {
-      pname   = "lui";
-      version = circe.version;
-      src     = circe.src;
-      packageRequires = [ tracking ];
-      recipe  = writeText "recipe" ''
-        (lcs :repo "jorgenschaefer/circe" :fetcher github :files ("lui*.el"))
-      '';
-      meta = {
-        description = "User interface library for Emacs";
-        license = gpl3Plus;
-      };
-    };
-
     org-mac-link =
       callPackage ../applications/editors/emacs-modes/org-mac-link { };
 

From 7d1c5e84caf3a9bd11981daca014586823a54e49 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 16:17:04 +0100
Subject: [PATCH 492/562] emacs-packages: Drop `redshank` package

Use melpa generated package instead
---
 .../editors/emacs-modes/redshank/default.nix  | 23 -------------------
 pkgs/top-level/emacs-packages.nix             |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/redshank/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/redshank/default.nix b/pkgs/applications/editors/emacs-modes/redshank/default.nix
deleted file mode 100644
index e03d2fdc90f..00000000000
--- a/pkgs/applications/editors/emacs-modes/redshank/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchgit }:
-
-stdenv.mkDerivation rec {
-  pname = "redshank";
-  name = "${pname}-20120510";
-
-  src = fetchgit {
-    url = "http://www.foldr.org/~michaelw/projects/redshank.git";
-    rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb";
-    sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp *.el *.elc $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    description = "Common Lisp Editing Extensions (for Emacs)";
-    homepage = http://www.foldr.org/~michaelw/emacs/redshank/;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 32fe0085e4b..30adef9ff79 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -286,8 +286,6 @@ let
       };
     };
 
-    redshank = callPackage ../applications/editors/emacs-modes/redshank { };
-
     rtags = melpaBuild rec {
       pname = "rtags";
       version = "2.12";

From 48428ce6ec77bc1eba0064e8e5675848bcbf1c82 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 16:18:01 +0100
Subject: [PATCH 493/562] emacs-packages: Drop `shorten` package

It's in the melpa generated package `circe`
---
 pkgs/top-level/emacs-packages.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 30adef9ff79..3b299502fb4 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -315,19 +315,6 @@ let
 
     gn = callPackage ../applications/editors/emacs-modes/gn { };
 
-    shorten = melpaBuild rec {
-      pname   = "shorten";
-      version = circe.version;
-      src     = circe.src;
-      recipe  = writeText "recipe" ''
-        (shorten :repo "jorgenschaefer/circe" :fetcher github :files ("shorten.el"))
-      '';
-      meta = {
-        description = "String shortening to unique prefix library for Emacs";
-        license = gpl3Plus;
-      };
-    };
-
     structured-haskell-mode = self.shm;
 
     thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };

From f7627be84404b4abcf76209e0036506dffb03259 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 17:55:15 +0100
Subject: [PATCH 494/562] emacs-packages: Drop manually packaged pdf-tools

Use autogenerated package from melpa
---
 .../editors/emacs-modes/melpa-packages.nix    | 13 ++++++++-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/emacs-packages.nix             | 27 ++-----------------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f548b3372b8..9d9134e51a9 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -12,7 +12,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
 */
 
-{ lib, external }: variant: self: let
+{ lib, external, pkgs }: variant: self: let
 
   dontConfigure = pkg: if pkg != null then pkg.override (args: {
     melpaBuild = drv: args.melpaBuild (drv // {
@@ -76,6 +76,17 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # build timeout
         graphene = markBroken super.graphene;
 
+        pdf-tools = super.pdf-tools.overrideAttrs(old: {
+          nativeBuildInputs = [ external.pkgconfig ];
+          buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];
+          preBuild = "make server/epdfinfo";
+          recipe = pkgs.writeText "recipe" ''
+            (pdf-tools
+            :repo "politza/pdf-tools" :fetcher github
+            :files ("lisp/pdf-*.el" "server/epdfinfo"))
+          '';
+        });
+
         # Build same version as Haskell package
         hindent = super.hindent.overrideAttrs (attrs: {
           version = external.hindent.version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25515fe593c..cf7ba86af89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17928,7 +17928,7 @@ in
   emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);
 
   emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
-    inherit lib newScope stdenv;
+    inherit lib newScope stdenv pkgs;
     inherit fetchFromGitHub fetchurl;
     inherit emacs texinfo makeWrapper runCommand writeText;
     inherit (xorg) lndir;
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3b299502fb4..5547e01cd15 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -39,6 +39,7 @@
 , melpaBuild
 
 , external
+, pkgs
 }:
 
 with lib.licenses;
@@ -51,7 +52,7 @@ let
 
   # Contains both melpa stable & unstable
   melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
-    inherit external lib;
+    inherit external lib pkgs;
   };
 
   melpaStablePackages = self: let
@@ -76,30 +77,6 @@ let
 
     ## START HERE
 
-    pdf-tools = melpaBuild rec {
-      pname = "pdf-tools";
-      version = "0.90";
-      src = fetchFromGitHub {
-        owner = "politza";
-        repo = "pdf-tools";
-        rev = "v${version}";
-        sha256 = "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9";
-      };
-      nativeBuildInputs = [ external.pkgconfig ];
-      buildInputs = with external; [ autoconf automake libpng zlib poppler ];
-      preBuild = "make server/epdfinfo";
-      recipe = writeText "recipe" ''
-        (pdf-tools
-        :repo "politza/pdf-tools" :fetcher github
-        :files ("lisp/pdf-*.el" "server/epdfinfo"))
-      '';
-      packageRequires = [ tablist let-alist ];
-      meta = {
-        description = "Emacs support library for PDF files";
-        license = gpl3;
-      };
-    };
-
     elisp-ffi = melpaBuild rec {
       pname = "elisp-ffi";
       version = "1.0.0";

From 460e02a9c013697092d37ba86ed201d2bac8a3c2 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 19:08:35 +0100
Subject: [PATCH 495/562] emacs-packages: Drop zmq package

Use generated melpa package instead
---
 .../editors/emacs-modes/melpa-packages.nix    | 16 +++++++++
 pkgs/top-level/emacs-packages.nix             | 36 -------------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 9d9134e51a9..f8ef53e6d21 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -183,6 +183,22 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         window-numbering = markBroken super.window-numbering;
 
+        zmq = super.zmq.overrideAttrs(old: {
+          stripDebugList = [ "share" ];
+          preBuild = ''
+            make
+          '';
+          nativeBuildInputs = [
+            external.autoconf external.automake external.pkgconfig external.libtool
+            (external.zeromq.override { enableDrafts = true; })
+          ];
+          postInstall = ''
+            mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-*
+            rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
+            rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
+          '';
+        });
+
         # Map legacy renames from emacs2nix since code generation was ported to emacs lisp
         _0blayout = super."0blayout";
         _0xc = super."0xc";
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 5547e01cd15..9a232c6899d 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -302,42 +302,6 @@ let
 
     zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { };
 
-    zmq = melpaBuild rec {
-      pname = "zmq";
-      ename = "zmq";
-      version = "0.10.10";
-      src = fetchFromGitHub {
-        owner = "dzop";
-        repo = "emacs-zmq";
-        rev = "v0.10.10";
-        sha256 = "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8";
-      };
-      recipe = fetchurl {
-        url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq";
-        sha256 = "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc";
-        name = "recipe";
-      };
-      stripDebugList = [ "share" ];
-      packageRequires = [ emacs ];
-      nativeBuildInputs = [
-        external.autoconf external.automake external.pkgconfig external.libtool
-        (external.zeromq.override { enableDrafts = true; })
-      ];
-      preBuild = ''
-        make
-      '';
-      postInstall = ''
-        mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-*
-        rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
-        rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
-      '';
-      meta = {
-        homepage = "https://melpa.org/#/zmq";
-        description = "Emacs bindings to ØMQ";
-        license = lib.licenses.gpl2;
-      };
-    };
-
   };
 
 in lib.makeScope newScope (self:

From b00038c151846bb367ad55636bb1bed8627df520 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 19:21:15 +0100
Subject: [PATCH 496/562] emacs-packages: Drop emacs-libvterm package

Use auto-generated melpa package
---
 .../emacs-modes/emacs-libvterm/default.nix    | 57 -------------------
 .../editors/emacs-modes/melpa-packages.nix    | 49 ++++++++++++++++
 pkgs/top-level/emacs-packages.nix             |  2 -
 3 files changed, 49 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
deleted file mode 100644
index ba54b9404a0..00000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }:
-
-let
-  emacsSources = stdenv.mkDerivation {
-    name = emacs.name + "-sources";
-    src = emacs.src;
-
-    dontConfigure = true;
-    dontBuild = true;
-    doCheck = false;
-    fixupPhase = ":";
-
-    installPhase = ''
-      mkdir -p $out
-      cp -a * $out
-    '';
-
-  };
-
-  libvterm = libvterm-neovim.overrideAttrs(old: rec {
-    pname = "libvterm-neovim";
-    version = "2019-04-27";
-    name = pname + "-" + version;
-    src = fetchFromGitHub {
-      owner = "neovim";
-      repo = "libvterm";
-      rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
-      sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
-    };
-  });
-
-
-in stdenv.mkDerivation rec {
-  name = "emacs-libvterm-${version}";
-  version = "unstable-2019-07-22";
-
-  src = fetchFromGitHub {
-    owner = "akermu";
-    repo = "emacs-libvterm";
-    rev = "301fe9fdfd5fb2496c8428a11e0812fd8a4c0820";
-    sha256 = "0i1hn5gcxayqcbjrnpgczvbicq2vsyn59646ary3crs0mz9wlbpr";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ emacs libvterm ];
-
-  cmakeFlags = [
-    "-DEMACS_SOURCE=${emacsSources}"
-    "-DUSE_SYSTEM_LIBVTERM=True"
-  ];
-
-  installPhase = ''
-    install -d $out/share/emacs/site-lisp
-    install ../*.el $out/share/emacs/site-lisp
-    install ../*.so $out/share/emacs/site-lisp
-  '';
-}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f8ef53e6d21..43086bbd1e6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -183,6 +183,55 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         window-numbering = markBroken super.window-numbering;
 
+        vterm = let
+          emacsSources = pkgs.stdenv.mkDerivation {
+            name = self.emacs.name + "-sources";
+            src = self.emacs.src;
+
+            dontConfigure = true;
+            dontBuild = true;
+            doCheck = false;
+            fixupPhase = ":";
+
+            installPhase = ''
+              mkdir -p $out
+              cp -a * $out
+            '';
+
+          };
+
+          libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec {
+            pname = "libvterm-neovim";
+            version = "2019-04-27";
+            name = pname + "-" + version;
+            src = pkgs.fetchFromGitHub {
+              owner = "neovim";
+              repo = "libvterm";
+              rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
+              sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
+            };
+          });
+
+        in pkgs.stdenv.mkDerivation rec {
+          inherit (super.vterm) name version src;
+
+          nativeBuildInputs = [ pkgs.cmake ];
+          buildInputs = [ self.emacs libvterm ];
+
+          cmakeFlags = [
+            "-DEMACS_SOURCE=${emacsSources}"
+            "-DUSE_SYSTEM_LIBVTERM=True"
+          ];
+
+          installPhase = ''
+            install -d $out/share/emacs/site-lisp
+            install ../*.el $out/share/emacs/site-lisp
+            install ../*.so $out/share/emacs/site-lisp
+          '';
+        };
+        # Legacy alias
+        emacs-libvterm = shared.vterm;
+
         zmq = super.zmq.overrideAttrs(old: {
           stripDebugList = [ "share" ];
           preBuild = ''
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 9a232c6899d..22ce1d9120b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -170,8 +170,6 @@ let
       };
     };
 
-    emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
-
     ess-R-object-popup =
       callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
 

From af70adbc892e0b1c548cffa4a05749085dce2cbf Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 19:36:57 +0100
Subject: [PATCH 497/562] emacs-packages: Drop elpy package

Use auto-generated melpa package
---
 .../editors/emacs-modes/melpa-packages.nix    |  4 ++
 pkgs/top-level/emacs-packages.nix             | 41 -------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 43086bbd1e6..47cc7ce1c64 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -60,6 +60,10 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         elmine = markBroken super.elmine;
 
+        elpy = super.elpy.overrideAttrs(old: {
+          propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ];
+        });
+
         evil-magit = super.evil-magit.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 22ce1d9120b..95a3a7d34f4 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -129,47 +129,6 @@ let
       };
     };
 
-    elpy = melpaBuild rec {
-      pname   = "elpy";
-      version = external.elpy.version;
-      src = fetchFromGitHub {
-        owner  = "jorgenschaefer";
-        repo   = pname;
-        rev    = "39ea47c73f040ce8dcc1c2d2639ebc0eb57ab8c8";
-        sha256 = "0q3av1qv4m6aj4bil608f688hjpr5px8zqnnrdqx784nz98rpjrs";
-      };
-      recipe = writeText "recipe" ''
-        (elpy :repo "jorgenschaefer/elpy" :fetcher github)
-      '';
-
-      patchPhase = ''
-        for file in elpy.el elpy-pkg.el; do
-          substituteInPlace $file \
-              --replace "company \"0.8.2\"" "company \"${company.version}\"" \
-              --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \
-              --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
-              --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
-              --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
-       done
-      '';
-
-      packageRequires = [
-        company find-file-in-project highlight-indentation pyvenv yasnippet
-      ];
-
-      propagatedUserEnvPkgs = [ external.elpy ] ++ packageRequires;
-
-      meta = {
-        description = "Emacs Python Development Environment";
-        longDescription = ''
-          Elpy is an Emacs package to bring powerful Python editing to Emacs.
-          It combines a number of other packages, both written in Emacs Lisp as
-          well as Python.
-        '';
-        license = gpl3Plus;
-      };
-    };
-
     ess-R-object-popup =
       callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
 

From 978b34622bccce24f179ffaf4475544dbe2e61dd Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 20:53:10 +0100
Subject: [PATCH 498/562] emacs-packages: Drop irony package

Use auto-generated melpa package
---
 .../editors/emacs-modes/melpa-packages.nix    | 28 +++++++++++++
 pkgs/top-level/emacs-packages.nix             | 39 -------------------
 2 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 47cc7ce1c64..920572198d0 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -105,6 +105,27 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
+        irony = super.irony.overrideAttrs(old: {
+          preConfigure = ''
+            cd server
+          '';
+          preBuild = ''
+            make
+          '';
+          postInstall = ''
+            mkdir -p $out
+            mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
+            rm -rf $out/share/emacs/site-lisp/elpa/*/server
+          '';
+          preCheck = ''
+            cd source/server
+          '';
+          dontUseCmakeBuildDir = true;
+          doCheck = true;
+          packageRequires = [ self.emacs ];
+          nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
+        });
+
         # tries to write a log file to $HOME
         insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
           HOME = "/tmp";
@@ -356,6 +377,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;
 
+        # Fails with "package does not untar cleanly into ..."
+        irony = shared.irony.overrideAttrs(old: {
+          meta = old.meta // {
+            broken = true;
+          };
+        });
+
         magit-annex = super.magit-annex.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 95a3a7d34f4..2b9e21ac13b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -181,45 +181,6 @@ let
 
     icicles = callPackage ../applications/editors/emacs-modes/icicles { };
 
-    irony = melpaBuild rec {
-      pname = "irony";
-      ename = "irony";
-      version = "20190516";
-      src = fetchFromGitHub {
-        owner = "Sarcasm";
-        repo = "irony-mode";
-        rev = "c3ae899b61124a747ebafc705086345e460ac08e";
-        sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
-      };
-      recipe = fetchurl {
-        url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony";
-        sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
-        name = "recipe";
-      };
-      preConfigure = ''
-        cd server
-      '';
-      preBuild = ''
-        make
-      '';
-      postInstall = ''
-        mkdir -p $out
-        mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
-        rm -rf $out/share/emacs/site-lisp/elpa/*/server
-      '';
-      preCheck = ''
-        cd source/server
-      '';
-      dontUseCmakeBuildDir = true;
-      doCheck = true;
-      packageRequires = [ emacs ];
-      nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
-      meta = {
-        homepage = "https://melpa.org/#/irony";
-        license = lib.licenses.gpl3;
-      };
-    };
-
     rtags = melpaBuild rec {
       pname = "rtags";
       version = "2.12";

From d490bcdf0fb5f02499cce77a6b862a4a5ea616a2 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 20:57:42 +0100
Subject: [PATCH 499/562] emacs-packages.rtags: Inherit correct version

---
 pkgs/top-level/emacs-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 2b9e21ac13b..5732e47bf9c 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -182,9 +182,9 @@ let
     icicles = callPackage ../applications/editors/emacs-modes/icicles { };
 
     rtags = melpaBuild rec {
+      inherit (external.rtags) version src meta;
+
       pname = "rtags";
-      version = "2.12";
-      src = external.rtags.src;
 
       dontConfigure = true;
 
@@ -194,7 +194,6 @@ let
          :repo "andersbakken/rtags" :fetcher github
          :files ("src/*.el"))
       '';
-      inherit (external.rtags) meta;
     };
 
     lib-requires =

From 97a069609f16f64a7291933d56d4c5818f4a0e00 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 21:44:07 +0100
Subject: [PATCH 500/562] emacs-packages: Add overriding capability to
 emacsPackagesNg

This allows overriding the individual package sets composing
emacsPackagesNg.

Example:
```
myEmacsPackages = emacsPackagesNg.override {
  melpaPackages = {};
};
```
---
 .../editors/emacs-modes/elpa-packages.nix     |  2 +-
 .../editors/emacs-modes/org-packages.nix      |  2 +-
 pkgs/top-level/emacs-packages.nix             | 47 +++++++++----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 9c08e91af41..e7ed5a32b65 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -50,4 +50,4 @@ self:
 
     elpaPackages = super // overrides;
 
-  in elpaPackages // { inherit elpaBuild elpaPackages; }
+  in elpaPackages // { inherit elpaBuild; }
diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix
index 46b90a52a09..d3ad7fa4093 100644
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@@ -28,4 +28,4 @@ self:
 
     orgPackages = super // overrides;
 
-  in orgPackages // { inherit orgPackages; }
+  in orgPackages
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 5732e47bf9c..f8484793299 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -46,7 +46,7 @@ with lib.licenses;
 
 let
 
-  elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
+  mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
     inherit lib stdenv texinfo;
   };
 
@@ -54,28 +54,16 @@ let
   melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
     inherit external lib pkgs;
   };
+  mkMelpaStablePackages = melpaGeneric "stable";
+  mkMelpaPackages = melpaGeneric "unstable";
 
-  melpaStablePackages = self: let
-    m = melpaGeneric "stable" self;
-  in {melpaStablePackages = m;} // m;
-
-  melpaPackages = self: let
-    m = melpaGeneric "unstable" self;
-  in {melpaPackages = m;} // m;
-
-  orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
+  mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
 
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
     inherit lib lndir makeWrapper stdenv runCommand;
   };
 
-  packagesFun = self: with self; {
-
-    inherit emacs melpaBuild trivialBuild;
-
-    emacsWithPackages = emacsWithPackages self;
-
-    ## START HERE
+  mkManualPackages = self: with self; {
 
     elisp-ffi = melpaBuild rec {
       pname = "elisp-ffi";
@@ -221,11 +209,20 @@ let
 
   };
 
-in lib.makeScope newScope (self:
-  removeAttrs ({}
-  // elpaPackages self
-  // melpaStablePackages self
-  // melpaPackages self
-  // orgPackages self
-  // packagesFun self) [ "override" "overrideDerivation" ]
-)
+in lib.makeScope newScope (self: lib.makeOverridable ({
+  elpaPackages ? mkElpaPackages self
+  , melpaStablePackages ? mkMelpaStablePackages self
+  , melpaPackages ? mkMelpaPackages self
+  , orgPackages ? mkOrgPackages self
+  , manualPackages ? mkManualPackages self
+}: ({}
+  // elpaPackages // { inherit elpaPackages; }
+  // melpaStablePackages // { inherit melpaStablePackages; }
+  // melpaPackages // { inherit melpaPackages; }
+  // orgPackages // { inherit orgPackages; }
+  // manualPackages
+  // {
+    inherit emacs melpaBuild trivialBuild;
+    emacsWithPackages = emacsWithPackages self;
+  })
+) {})

From be74dec846743ab56072903738adf9657343da54 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 5 Aug 2019 00:26:29 +0100
Subject: [PATCH 501/562] emacs-packages: Move manually created packages to
 it's own file

And let emacs-packages.nix only aggregate the attrsets
---
 .../editors/emacs-modes/manual-packages.nix   | 145 +++++++++++++++++
 pkgs/top-level/emacs-packages.nix             | 148 +-----------------
 2 files changed, 147 insertions(+), 146 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-modes/manual-packages.nix

diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
new file mode 100644
index 00000000000..7f75de74ed6
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -0,0 +1,145 @@
+{ lib, external, pkgs }: self: with self; with lib.licenses; {
+
+  elisp-ffi = melpaBuild rec {
+    pname = "elisp-ffi";
+    version = "1.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "skeeto";
+      repo = "elisp-ffi";
+      rev = "${version}";
+      sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
+    };
+    buildInputs = [ external.libffi ];
+    preBuild = "make";
+    recipe = pkgs.writeText "recipe" ''
+      (elisp-ffi
+      :repo "skeeto/elisp-ffi"
+      :fetcher github
+      :files ("ffi-glue" "ffi.el"))
+    '';
+    meta = {
+      description = "Emacs Lisp Foreign Function Interface";
+      longDescription = ''
+        This library provides an FFI for Emacs Lisp so that Emacs
+        programs can invoke functions in native libraries. It works by
+        driving a subprocess to do the heavy lifting, passing result
+        values on to Emacs.
+      '';
+      license = publicDomain;
+    };
+  };
+
+  agda2-mode = with external; trivialBuild {
+    pname = "agda-mode";
+    version = Agda.version;
+
+    phases = [ "buildPhase" "installPhase" ];
+
+    # already byte-compiled by Agda builder
+    buildPhase = ''
+      agda=`${Agda}/bin/agda-mode locate`
+      cp `dirname $agda`/*.el* .
+    '';
+
+    meta = {
+      description = "Agda2-mode for Emacs extracted from Agda package";
+      longDescription = ''
+        Wrapper packages that liberates init.el from `agda-mode locate` magic.
+        Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
+      '';
+      homepage = Agda.meta.homepage;
+      license = Agda.meta.license;
+    };
+  };
+
+  ess-R-object-popup =
+    callPackage ./ess-R-object-popup { };
+
+  filesets-plus = callPackage ./filesets-plus { };
+
+  font-lock-plus = callPackage ./font-lock-plus { };
+
+  ghc-mod = melpaBuild rec {
+    pname = "ghc";
+    version = external.ghc-mod.version;
+    src = external.ghc-mod.src;
+    packageRequires = [ haskell-mode ];
+    propagatedUserEnvPkgs = [ external.ghc-mod ];
+    recipe = pkgs.writeText "recipe" ''
+      (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
+    '';
+    fileSpecs = [ "elisp/*.el" ];
+    meta = {
+      description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
+      license = bsd3;
+    };
+  };
+
+  haskell-unicode-input-method = melpaBuild rec {
+    pname = "emacs-haskell-unicode-input-method";
+    version = "20110905.2307";
+    src = pkgs.fetchFromGitHub {
+      owner = "roelvandijk";
+      repo = "emacs-haskell-unicode-input-method";
+      rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
+      sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
+    };
+    recipe = pkgs.writeText "recipe" ''
+      (haskell-unicode-input-method
+       :repo "roelvandijk/emacs-haskell-unicode-input-method"
+       :fetcher github)
+    '';
+    packageRequires = [];
+    meta = {
+      homepage = "https://melpa.org/#haskell-unicode-input-method/";
+      license = lib.licenses.free;
+    };
+  };
+
+  hexrgb = callPackage ./hexrgb { };
+
+  header2 = callPackage ./header2 { };
+
+  helm-words = callPackage ./helm-words { };
+
+  icicles = callPackage ./icicles { };
+
+  rtags = melpaBuild rec {
+    inherit (external.rtags) version src meta;
+
+    pname = "rtags";
+
+    dontConfigure = true;
+
+    propagatedUserEnvPkgs = [ external.rtags ];
+    recipe = pkgs.writeText "recipe" ''
+      (rtags
+       :repo "andersbakken/rtags" :fetcher github
+       :files ("src/*.el"))
+    '';
+  };
+
+  lib-requires =
+    callPackage ./lib-requires { };
+
+  org-mac-link =
+    callPackage ./org-mac-link { };
+
+  perl-completion =
+    callPackage ./perl-completion { };
+
+  railgun = callPackage ./railgun { };
+
+  gn = callPackage ./gn { };
+
+  structured-haskell-mode = self.shm;
+
+  thingatpt-plus = callPackage ./thingatpt-plus { };
+
+  tramp = callPackage ./tramp { };
+
+  yaoddmuse = callPackage ./yaoddmuse { };
+
+  zeitgeist = callPackage ./zeitgeist { };
+
+}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f8484793299..5719c5a74fe 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -42,8 +42,6 @@
 , pkgs
 }:
 
-with lib.licenses;
-
 let
 
   mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
@@ -63,150 +61,8 @@ let
     inherit lib lndir makeWrapper stdenv runCommand;
   };
 
-  mkManualPackages = self: with self; {
-
-    elisp-ffi = melpaBuild rec {
-      pname = "elisp-ffi";
-      version = "1.0.0";
-      src = fetchFromGitHub {
-        owner = "skeeto";
-        repo = "elisp-ffi";
-        rev = "${version}";
-        sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
-      };
-      buildInputs = [ external.libffi ];
-      preBuild = "make";
-      recipe = writeText "recipe" ''
-        (elisp-ffi
-        :repo "skeeto/elisp-ffi"
-        :fetcher github
-        :files ("ffi-glue" "ffi.el"))
-      '';
-      meta = {
-        description = "Emacs Lisp Foreign Function Interface";
-        longDescription = ''
-          This library provides an FFI for Emacs Lisp so that Emacs
-          programs can invoke functions in native libraries. It works by
-          driving a subprocess to do the heavy lifting, passing result
-          values on to Emacs.
-        '';
-        license = publicDomain;
-      };
-    };
-
-    agda2-mode = with external; trivialBuild {
-      pname = "agda-mode";
-      version = Agda.version;
-
-      phases = [ "buildPhase" "installPhase" ];
-
-      # already byte-compiled by Agda builder
-      buildPhase = ''
-        agda=`${Agda}/bin/agda-mode locate`
-        cp `dirname $agda`/*.el* .
-      '';
-
-      meta = {
-        description = "Agda2-mode for Emacs extracted from Agda package";
-        longDescription = ''
-          Wrapper packages that liberates init.el from `agda-mode locate` magic.
-          Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el.
-        '';
-        homepage = Agda.meta.homepage;
-        license = Agda.meta.license;
-      };
-    };
-
-    ess-R-object-popup =
-      callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
-
-    filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { };
-
-    font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { };
-
-    ghc-mod = melpaBuild rec {
-      pname = "ghc";
-      version = external.ghc-mod.version;
-      src = external.ghc-mod.src;
-      packageRequires = [ haskell-mode ];
-      propagatedUserEnvPkgs = [ external.ghc-mod ];
-      recipe = writeText "recipe" ''
-        (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
-      '';
-      fileSpecs = [ "elisp/*.el" ];
-      meta = {
-        description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
-        license = bsd3;
-      };
-    };
-
-    haskell-unicode-input-method = melpaBuild rec {
-      pname = "emacs-haskell-unicode-input-method";
-      version = "20110905.2307";
-      src = fetchFromGitHub {
-        owner = "roelvandijk";
-        repo = "emacs-haskell-unicode-input-method";
-        rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
-        sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
-      };
-      recipe = writeText "recipe" ''
-        (haskell-unicode-input-method
-         :repo "roelvandijk/emacs-haskell-unicode-input-method"
-         :fetcher github)
-      '';
-      packageRequires = [];
-      meta = {
-        homepage = "https://melpa.org/#haskell-unicode-input-method/";
-        license = lib.licenses.free;
-      };
-    };
-
-    hexrgb = callPackage ../applications/editors/emacs-modes/hexrgb { };
-
-    header2 = callPackage ../applications/editors/emacs-modes/header2 { };
-
-    helm-words = callPackage ../applications/editors/emacs-modes/helm-words { };
-
-    icicles = callPackage ../applications/editors/emacs-modes/icicles { };
-
-    rtags = melpaBuild rec {
-      inherit (external.rtags) version src meta;
-
-      pname = "rtags";
-
-      dontConfigure = true;
-
-      propagatedUserEnvPkgs = [ external.rtags ];
-      recipe = writeText "recipe" ''
-        (rtags
-         :repo "andersbakken/rtags" :fetcher github
-         :files ("src/*.el"))
-      '';
-    };
-
-    lib-requires =
-      callPackage ../applications/editors/emacs-modes/lib-requires { };
-
-    org-mac-link =
-      callPackage ../applications/editors/emacs-modes/org-mac-link { };
-
-    perl-completion =
-      callPackage ../applications/editors/emacs-modes/perl-completion { };
-
-    railgun = callPackage ../applications/editors/emacs-modes/railgun { };
-
-    gn = callPackage ../applications/editors/emacs-modes/gn { };
-
-    structured-haskell-mode = self.shm;
-
-    thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };
-
-    tramp = callPackage ../applications/editors/emacs-modes/tramp { };
-
-    yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { };
-
-    zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { };
-
+  mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix {
+    inherit external lib pkgs;
   };
 
 in lib.makeScope newScope (self: lib.makeOverridable ({

From 2372dc2673cce3d101ea5340ac388794426ff167 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Fri, 2 Aug 2019 04:48:20 +0000
Subject: [PATCH 502/562] bitwarden: init at 1.15.2

---
 pkgs/tools/security/bitwarden/default.nix | 87 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  6 +-
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/security/bitwarden/default.nix

diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
new file mode 100644
index 00000000000..e6874d085d2
--- /dev/null
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -0,0 +1,87 @@
+{ atomEnv
+, autoPatchelfHook
+, dpkg
+, fetchurl
+, libsecret
+, makeDesktopItem
+, makeWrapper
+, stdenv
+, udev
+, wrapGAppsHook
+}:
+
+let
+  inherit (stdenv.hostPlatform) system;
+
+  pname = "bitwarden";
+
+  version = {
+    "x86_64-linux" = "1.15.2";
+  }.${system} or "";
+
+  sha256 = {
+    "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f";
+  }.${system} or "";
+
+  meta = with stdenv.lib; {
+    description = "A secure and free password manager for all of your devices";
+    homepage = "https://bitwarden.com";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ kiwi ];
+    platforms = [ "x86_64-linux" ];
+  };
+
+  linux = stdenv.mkDerivation rec {
+    inherit pname version meta;
+
+    src = fetchurl {
+      url = "https://github.com/bitwarden/desktop/releases/download/"
+      + "v${version}/Bitwarden-${version}-amd64.deb";
+      inherit sha256;
+    };
+
+    desktopItem = makeDesktopItem {
+      name = "bitwarden";
+      exec = "bitwarden %U";
+      icon = "bitwarden";
+      comment = "A secure and free password manager for all of your devices";
+      desktopName = "Bitwarden";
+      categories = "Utility";
+    };
+
+    dontBuild = true;
+    dontConfigure = true;
+    dontPatchElf = true;
+    dontWrapGApps = true;
+
+    buildInputs = [ libsecret ] ++ atomEnv.packages;
+
+    nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
+
+    unpackPhase = "dpkg-deb -x $src .";
+
+    installPhase = ''
+      mkdir -p "$out/bin"
+      cp -R "opt" "$out"
+      cp -R "usr/share" "$out/share"
+      chmod -R g-w "$out"
+
+      # Desktop file
+      mkdir -p "$out/share/applications"
+      cp "${desktopItem}/share/applications/"* "$out/share/applications"
+    '';
+
+    runtimeDependencies = [
+      udev.lib
+    ];
+
+    postFixup = ''
+      makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \
+        --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \
+        "''${gappsWrapperArgs[@]}"
+    '';
+  };
+
+in if stdenv.isDarwin
+then throw "Bitwarden has not been packaged for macOS yet"
+else linux
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c88bce35162..20258f062d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,14 +700,16 @@ in
 
   bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
 
+  bitwarden = callPackage ../tools/security/bitwarden { };
+
+  bitwarden-cli = callPackage ../tools/security/bitwarden-cli { };
+
   bitwarden_rs = callPackage ../tools/security/bitwarden_rs {
     inherit (darwin.apple_sdk.frameworks) Security CoreServices;
   };
 
   bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { };
 
-  bitwarden-cli = callPackage ../tools/security/bitwarden-cli { };
-
   bmap-tools = callPackage ../tools/misc/bmap-tools { };
 
   bonnie = callPackage ../tools/filesystems/bonnie { };

From 7030004ad6e6b895ea557c7bbf31457b5602970d Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Wed, 7 Aug 2019 19:59:32 +0200
Subject: [PATCH 503/562] hedgewars: 0.9.25 -> 1.0.0-beta1

- unbreak build by bumping version to latest beta as that
removes the broken `bytestring-show` dependency

- beta needs to be fetched from Mercurial repo
---
 pkgs/games/hedgewars/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index 6953ac2f57a..ea229db6a74 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,20 +1,21 @@
 { SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut
-, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
+, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
 , zlib, libpng, libGLU_combined, physfs
 }:
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string /* broken: bytestring-show */ random hslogger
+          network vector utf8-string bytestring random hslogger
           SHA entropy pkgs.zlib sandi regex-tdfa
         ]);
 in
 stdenv.mkDerivation rec {
-  version = "0.9.25";
+  version = "1.0.0-beta1";
   name = "hedgewars-${version}";
-  src = fetchurl {
-    url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
-    sha256 = "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk";
+  src = fetchhg {
+    url = "https://hg.hedgewars.org/hedgewars/";
+    rev = "7ab5cf405686";
+    sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -75,6 +76,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ kragniz fpletz ];
     platforms = ghc.meta.platforms;
     hydraPlatforms = [];
-    broken = true;  # depends on broken Haskell package bytestring-show
   };
 }

From a26168ff46e78d308d6024af9c303f1e0d4c5311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 7 Aug 2019 20:32:45 +0200
Subject: [PATCH 504/562] gqrx: use qt5's mkDerivation

Fixes

  qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
  This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

See https://github.com/NixOS/nixpkgs/issues/65399
---
 pkgs/applications/radio/gqrx/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 1258dd32b9f..cd5f8b0db9e 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr
+, mkDerivation
 # drivers (optional):
 , rtl-sdr, hackrf
 , pulseaudioSupport ? true, libpulseaudio
@@ -6,7 +7,7 @@
 
 assert pulseaudioSupport -> libpulseaudio != null;
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "gqrx-${version}";
   version = "2.11.5";
 

From f6763cc130d72e5ce81265a12a82b3171af60a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 7 Aug 2019 20:34:49 +0200
Subject: [PATCH 505/562] v4l-utils: use qt5's mkDerivation

Fixes

  qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
  This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

See https://github.com/NixOS/nixpkgs/issues/65399
---
 pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 3b5b08ff084..ede9fa68280 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl
+{ stdenv, lib, fetchurl, pkgconfig, perl, mkDerivation
 , libjpeg, udev
 , withUtils ? true
 , withGUI ? true, alsaLib, libX11, qtbase, libGLU
@@ -6,7 +6,7 @@
 
 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "v4l-utils-${version}";
   version = "1.16.6";
 

From a920c2aabdc84a73f7ed98b3045f75fa50ccb140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 7 Aug 2019 20:38:12 +0200
Subject: [PATCH 506/562] v4l-utils: align attr with pkg name

---
 pkgs/applications/video/qstopmotion/default.nix | 4 ++--
 pkgs/development/libraries/unicap/default.nix   | 4 ++--
 pkgs/top-level/aliases.nix                      | 1 +
 pkgs/top-level/all-packages.nix                 | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index f2b23fbdea0..ea4816ad6d0 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2
-, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre
+, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre
 , qwt, extra-cmake-modules }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";
   };
 
-  buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
+  buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview
                             qwt qtquickcontrols qtimageformats qtxmlpatterns ];
 
   nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index 1aa5e671702..a902b6f8451 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }:
+{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
 
 stdenv.mkDerivation rec {
   name = "libunicap-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
-  buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ];
+  buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ];
 
   patches = [
     # Debian has a patch that fixes the build.
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a1ad553e048..7283c2ce534 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -362,6 +362,7 @@ mapAliases ({
   ucsFonts = ucs-fonts; # added 2016-07-15
   ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
+  v4l_utils = v4l-utils; # added 2019-08-07
   vimbWrapper = vimb; # added 2015-01
   vimprobable2Wrapper = vimprobable2; # added 2015-01
   virtviewer = virt-viewer; # added 2015-12-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf7ba86af89..be09b4de5ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12281,7 +12281,7 @@ in
     inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
   };
 
-  libv4l = lowPrio (v4l_utils.override {
+  libv4l = lowPrio (v4l-utils.override {
     withUtils = false;
   });
 
@@ -16325,7 +16325,7 @@ in
     systemd = null;
   }) else utillinux;
 
-  v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
+  v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 
   vndr = callPackage ../development/tools/vndr { };
 

From c943ac3f9316ba9b6b936a808cb8f6010ecba011 Mon Sep 17 00:00:00 2001
From: Dave Nicponski <dave.nicponski@gmail.com>
Date: Wed, 7 Aug 2019 16:45:48 -0400
Subject: [PATCH 507/562] maintainers: add virusdave

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dc57313c878..8e9cd964504 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5311,6 +5311,11 @@
     github = "viric";
     name = "Lluís Batlle i Rossell";
   };
+  virusdave = {
+    email = "dave.nicponski@gmail.com";
+    github = "virusdave";
+    name = "Dave Nicponski";
+  };
   vizanto = {
     email = "danny@prime.vc";
     github = "vizanto";

From ccaaef1963d34a98ebc75ed23f473b28efa6f2dc Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Wed, 7 Aug 2019 23:04:48 +0200
Subject: [PATCH 508/562] codespell: init at 1.15.0 (#63673)

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

diff --git a/pkgs/development/python-modules/codespell/default.nix b/pkgs/development/python-modules/codespell/default.nix
new file mode 100644
index 00000000000..dfd0be09fab
--- /dev/null
+++ b/pkgs/development/python-modules/codespell/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonApplication, fetchPypi, pytest, chardet }:
+buildPythonApplication rec {
+  pname = "codespell";
+  version = "1.15.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c211rzfgmwls8ab8fj21xp9bhxk6ys3xw8w7chp4arjlifc26wg";
+  };
+
+  checkInputs = [ pytest chardet ];
+  checkPhase = ''
+    # We don't want to be affected by the presence of these
+    rm -r codespell_lib setup.cfg
+    # test_command assumes too much about the execution environment
+    pytest --pyargs codespell_lib.tests -k "not test_command"
+  '';
+
+  meta = {
+    description = "Fix common misspellings in source code";
+    homepage = "https://github.com/codespell-project/codespell";
+    license = with lib.licenses; [ gpl2 cc-by-sa-30 ];
+    maintainers = with lib.maintainers; [ johnazoidberg ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f97ed6ec56b..31b0622d656 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -747,6 +747,8 @@ in
 
   chkcrontab = callPackage ../tools/admin/chkcrontab { };
 
+  codespell = with python3Packages; toPythonApplication codespell;
+
   cozy = callPackage ../applications/audio/cozy-audiobooks { };
 
   ctrtool = callPackage ../tools/archivers/ctrtool { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d782de82e4d..e8b95115d68 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -476,6 +476,8 @@ in {
 
   cozy = callPackage ../development/python-modules/cozy { };
 
+  codespell = callPackage ../development/python-modules/codespell { };
+
   curio = callPackage ../development/python-modules/curio { };
 
   dendropy = callPackage ../development/python-modules/dendropy { };

From e505a8eee060c482dd99cd240abb45a99a3ee6e7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 7 Aug 2019 18:54:19 -0500
Subject: [PATCH 509/562] pythonPackages.pytest-mpl: fix build on darwin

---
 pkgs/development/python-modules/pytest-mpl/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix
index 0baaa9c5dfc..37ba58977e1 100644
--- a/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
 , buildPythonPackage
 , fetchPypi
 , pytest
@@ -15,6 +15,8 @@ buildPythonPackage rec {
     sha256 = "7006e63bf1ca9c50bea3d189c0f862751a16ce40bb373197b218f57af5b837c0";
   };
 
+  buildInputs = [ pytest ];
+
   propagatedBuildInputs = [
     matplotlib
     nose
@@ -24,6 +26,9 @@ buildPythonPackage rec {
     pytest
   ];
 
+  # disable tests on darwin, because it requires a framework build of Python
+  doCheck = !stdenv.isDarwin;
+
   checkPhase = ''
     export HOME=$(mktemp -d)
     mkdir -p $HOME/.config/matplotlib
@@ -32,7 +37,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Pytest plugin to help with testing figures output from Matplotlib";
     homepage = https://github.com/matplotlib/pytest-mpl;
     license = licenses.bsd3;

From 9a6a055d2fd040cd78dda8b0e2131e8719392c16 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 7 Aug 2019 18:55:04 -0500
Subject: [PATCH 510/562] pythonPackages.colorcet: fix build on darwin

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

diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 6a7328aaf73..f92f8004ac0 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
 , buildPythonPackage
 , fetchPypi
 , param
@@ -35,10 +35,11 @@ buildPythonPackage rec {
     mkdir -p $HOME/.config/matplotlib
     echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
 
-    pytest colorcet
+    # disable matplotlib tests on darwin, because it requires a framework build of Python
+    pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=colorcet/tests/test_matplotlib.py"} colorcet
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Collection of perceptually uniform colormaps";
     homepage = https://colorcet.pyviz.org;
     license = licenses.cc-by-40;

From 58de4286d3eff9979816e3cd781aa0608478b770 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 7 Aug 2019 21:52:01 -0500
Subject: [PATCH 511/562] wasm-pack: fix build on darwin

---
 pkgs/development/tools/wasm-pack/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index 5827844c1b5..d9ff6f673d8 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -3,6 +3,8 @@
 , rustPlatform
 , pkgconfig
 , openssl
+, curl
+, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,7 +22,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
+
 
   # Tests fetch external resources and build artifacts.
   # Disabled to work with sandboxing
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31b0622d656..5f95cafa363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24280,7 +24280,9 @@ in
 
   vttest = callPackage ../tools/misc/vttest { };
 
-  wasm-pack = callPackage ../development/tools/wasm-pack { };
+  wasm-pack = callPackage ../development/tools/wasm-pack {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   wavegain = callPackage ../applications/audio/wavegain { };
 

From edbdbb31e1d97b1819aad7abd5ccf0ae794090bc Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:05:25 +0800
Subject: [PATCH 512/562] eksctl: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index c68a8fc1ae2..a5e2df9ad21 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "0xbvx3rpd97hc49njvc4mx5zm2x08hrg8kpkapa8qigyajjxz9fg";
+    sha256 = "1xinkr9xnbfbr58ci7hprabqv0p292x016knbb7fqxzb8043f9lh";
   };
 
   modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4";

From 639c8c1f6a3317b613e332d194fc292f9d41a2c7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 7 Aug 2019 22:05:26 -0500
Subject: [PATCH 513/562] ghc: use ld.gold only on Linux

partly reverts commit 29f2f04ded458e298e70884c2fd10e05e336f598.
---
 pkgs/development/compilers/ghc/8.2.2.nix | 2 +-
 pkgs/development/compilers/ghc/8.4.4.nix | 2 +-
 pkgs/development/compilers/ghc/8.6.4.nix | 2 +-
 pkgs/development/compilers/ghc/8.6.5.nix | 2 +-
 pkgs/development/compilers/ghc/8.8.1.nix | 2 +-
 pkgs/development/compilers/ghc/head.nix  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index ba4933363c1..a034e4ec8dd 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -166,7 +166,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index a90af60de43..52fb926cdc6 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix
index 97ca95812d6..1534e6d1d08 100644
--- a/pkgs/development/compilers/ghc/8.6.4.nix
+++ b/pkgs/development/compilers/ghc/8.6.4.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index d264cfda2a3..c859a34729d 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 6899ad4fd48..81d1a6f9b8a 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 539d0408681..804edabba0c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation (rec {
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
     # and more generally have a faster linker.
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"

From b9f1e3cdfdb5f31d7a738d01cbedcf4f11f724be Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 08:59:19 +0200
Subject: [PATCH 514/562] pythonPackages.libarcus: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index add1957dd6d..e3ae5626e2c 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "libarcus";
-  version = "4.1.0";
+  version = "4.2.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4";
+    sha256 = "0pk0g80ay9aghzmb8gfpqh0chl9rk47jh0ziicpianhklxx2jb44";
   };
 
   disabled = pythonOlder "3.4.0";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   buildInputs = [ protobuf ];
 
   postPatch = ''
-    sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
+    sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
   '';
 
   meta = with stdenv.lib; {

From c0df1d0b42a52258ae75e0795443d7ec22b72809 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 08:59:42 +0200
Subject: [PATCH 515/562] pythonPackages.libsavitar: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index f0fbcf5f311..93490d6f449 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -2,18 +2,18 @@
 
 buildPythonPackage rec {
   pname = "libsavitar";
-  version = "4.1.0";
+  version = "4.2.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libSavitar";
     rev = version;
-    sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf";
+    sha256 = "0cqskd8rcg7pih8nj3s2i137lwxpibmdmym6f8hii14ashny73i1";
   };
 
   postPatch = ''
-    sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
+    sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake
   '';
 
   nativeBuildInputs = [ cmake ];

From a6ef0a71886de1c419091c750a35a26600fa5638 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 09:00:05 +0200
Subject: [PATCH 516/562] pythonPackages.uranium: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 6365846bd26..c245ac0b565 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -2,7 +2,7 @@
 , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
-  version = "4.1.0";
+  version = "4.2.0";
   pname = "uranium";
   format = "other";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj";
+    sha256 = "1dc3s6zya7bbpvzh4acbs65aj899siwd8jr9snnsrdyl9qh8hhq9";
   };
 
   disabled = pythonOlder "3.5.0";

From 6bd380cb030ede872ed2da4c90966a615d23771d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 09:00:32 +0200
Subject: [PATCH 517/562] curaengine: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index a7339acddee..ae433ebf52e 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8";
+    sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd";
   };
 
   nativeBuildInputs = [ cmake ];

From a62b1c8c804627d8749bd53d68f22e0bd0cdb30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 8 Aug 2019 09:14:09 +0200
Subject: [PATCH 518/562] surf-display: fixup typo from PR #65860

It had weird effects, breaking the metrics job.
---
 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 4a1a7994797..f5b089be81b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20608,7 +20608,7 @@ in
 
   surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
 
-  surf-display = callPackages ../desktops/surf-display { };
+  surf-display = callPackage ../desktops/surf-display { };
 
   sunvox = callPackage ../applications/audio/sunvox { };
 

From 041e8a9739cb83fe8cb014076a7a0d2165606740 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 09:00:41 +0200
Subject: [PATCH 519/562] cura: 4.1.0 -> 4.2.1

---
 pkgs/applications/misc/cura/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 290801ea578..e9366d43ef4 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,21 +1,21 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }:
 
 mkDerivation rec {
-  name = "cura-${version}";
-  version = "4.1.0";
+  pname = "cura";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
     rev = version;
-    sha256 = "1mfpnjrh3splpkadgml3v71k939g56zb9hbmzghwfjwlrf8valmz";
+    sha256 = "1qnai8vmgy5lx3lapw96j41i8mw9p6r99i3qzs709l9yzrix6l86";
   };
 
   materials = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "fdm_materials";
-    rev = version;
-    sha256 = "0yp2162msxfwpixzvassn23p7r3swjpwk4nhsjka5w6fm8pv0wpl";
+    rev = "4.2.0"; # TODO: change back to `version` after 4.2.1
+    sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m";
   };
 
   buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];

From 76f01413bd04fe7ada2045cbb27c21b01c2116bc Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 09:01:10 +0200
Subject: [PATCH 520/562] cura: workaround for #59901

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

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index e9366d43ef4..67e3924ca18 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -29,6 +29,11 @@ mkDerivation rec {
     "-DCURA_VERSION=${version}"
   ];
 
+  makeWrapperArgs = [
+    # hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901
+    "--set OMP_NUM_THREADS 1"
+  ];
+
   postPatch = ''
     sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
     sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py

From 7246d5cfe60b561dd83c43388881798f043c2ddd Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 09:01:29 +0200
Subject: [PATCH 521/562] curaPlugins.octoprint: 3.5.5 -> 3.5.8

---
 pkgs/applications/misc/cura/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index a5a196a7810..bdbf8f24136 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -6,13 +6,13 @@ let
 
     octoprint = stdenv.mkDerivation rec {
       pname = "Cura-OctoPrintPlugin";
-      version = "3.5.5";
+      version = "3.5.8";
 
       src = fetchFromGitHub {
         owner = "fieldOfView";
         repo = pname;
-        rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a";
-        sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x";
+        rev = "46548cbb8d32d10fe3aee12f272d5d8f34271738";
+        sha256 = "0pllba8qx1746pnf5ccbkqn2j6f8hhknpgyrrv244ykvigrlczx0";
       };
 
       nativeBuildInputs = [ cmake ];

From 9e0e36b9d9b84ad97d0dc19e3adf4bc93068ce7b Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 8 Aug 2019 09:09:25 +0200
Subject: [PATCH 522/562] cura: add myself as maintainer

---
 pkgs/applications/misc/cura/default.nix                | 2 +-
 pkgs/applications/misc/curaengine/default.nix          | 2 +-
 pkgs/development/python-modules/libarcus/default.nix   | 2 +-
 pkgs/development/python-modules/libsavitar/default.nix | 2 +-
 pkgs/development/python-modules/uranium/default.nix    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 67e3924ca18..c211879c3e2 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -57,6 +57,6 @@ mkDerivation rec {
     homepage = https://github.com/Ultimaker/Cura;
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar gebner ];
   };
 }
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index ae433ebf52e..823e6d6e2e9 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Ultimaker/CuraEngine;
     license = licenses.agpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar gebner ];
   };
 }
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index e3ae5626e2c..54d9193c25b 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = https://github.com/Ultimaker/libArcus;
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar gebner ];
   };
 }
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index 93490d6f449..657df2dfb7c 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = https://github.com/Ultimaker/libSavitar;
     license = licenses.lgpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ abbradar orivej ];
+    maintainers = with maintainers; [ abbradar orivej gebner ];
   };
 }
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index c245ac0b565..aec0f731554 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = https://github.com/Ultimaker/Uranium;
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar gebner ];
   };
 }

From f6c363f81dbc43e02f16703620cb5315f66559e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= <megoettlinger@gmail.com>
Date: Wed, 7 Aug 2019 19:36:43 +0200
Subject: [PATCH 523/562] pgsolver: init at 4.1

---
 .../ocaml-modules/pgsolver/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pgsolver/default.nix

diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix
new file mode 100644
index 00000000000..5045cb6a0ee
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pgsolver/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, buildOasisPackage, ounit, tcslib, ocaml-sat-solvers }:
+
+buildOasisPackage rec {
+  pname = "pgsolver";
+  version = "4.1";
+
+  src = fetchFromGitHub {
+    owner  = "tcsprojects";
+    repo   = "pgsolver";
+    rev    = "v${version}";
+    sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a";
+  };
+
+  buildInputs = [ ounit ];
+  propagatedBuildInputs = [ tcslib ocaml-sat-solvers ];
+
+  meta = {
+    homepage = https://github.com/tcsprojects/pgsolver;
+    description = "A collection of tools for generating, manipulating and - most of all - solving parity games";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mgttlinger ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 525f417a5b4..b5ec6ed335b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -577,6 +577,8 @@ let
 
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
+    pgsolver = callPackage ../development/ocaml-modules/pgsolver { };
+
     piqi = callPackage ../development/ocaml-modules/piqi {
       base64 = base64_2;
     };

From 460c6a7a595835d2a50aee4cb79eccd730abc8bc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 2 Aug 2019 17:30:44 -0700
Subject: [PATCH 524/562] pythonPackages.jupyter_core: 4.4.0 -> 4.5.0

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

diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index 88679197be1..f682e11bfed 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c6e7c1e9f2ac45b5c2ceea5730bc9008d92fe59d0725eac57b04c0edfba24f7";
+    sha256 = "1xr4pbghwk5hayn5wwnhb7z95380r45p79gf5if5pi1akwg7qvic";
   };
 
   checkInputs = [ pytest mock glibcLocales ];
@@ -23,8 +23,7 @@ buildPythonPackage rec {
   patches = [ ./tests_respect_pythonpath.patch ];
 
   checkPhase = ''
-    mkdir tmp
-    HOME=tmp TMPDIR=tmp LC_ALL=en_US.utf8 py.test
+    HOME=$TMPDIR LC_ALL=en_US.utf8 py.test
   '';
 
   meta = with lib; {

From 40a93cd8b248040c63e70f3bfd5c49088fbfed72 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 2 Aug 2019 17:31:44 -0700
Subject: [PATCH 525/562] pythonPackages.jupyter_client: 5.2.4 -> 5.3.1

---
 .../python-modules/jupyter_client/default.nix | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix
index c3643e674c3..01830514b46 100644
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@@ -7,10 +7,6 @@
 , dateutil
 , isPyPy
 , py
-, ipykernel
-, ipython
-, mock
-, pytest
 , tornado
 }:
 
@@ -20,15 +16,16 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "98e8af5edff5d24e4d31e73bc21043130ae9d955a91aa93fc0bc3b1d0f7b5880";
+    sha256 = "102qgc7isfxwq0zsj6m9apcyj2hk8c8c4fz7656lxlpmvxgazs4q";
   };
 
-  checkInputs = [ ipykernel ipython mock pytest ];
-  propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil tornado ] ++ lib.optional isPyPy py;
-
-  checkPhase = ''
-    py.test
-  '';
+  propagatedBuildInputs = [
+    traitlets
+    jupyter_core
+    pyzmq
+    dateutil
+    tornado
+  ] ++ lib.optional isPyPy py;
 
   # Circular dependency with ipykernel
   doCheck = false;
@@ -39,4 +36,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}

From 1f8221c98e0890aac47c32a1124d41c27fd771f9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 2 Aug 2019 17:35:05 -0700
Subject: [PATCH 526/562] pythonPackages.jupytext: 1.1.7 -> 1.2.1

---
 .../python-modules/jupytext/default.nix       | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 66e79227697..ae6796825f1 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -1,41 +1,33 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, testfixtures
-, pyyaml
+{ lib, buildPythonPackage, fetchPypi, isPy27
 , mock
 , nbformat
 , pytest
+, pyyaml
 }:
 
 buildPythonPackage rec {
   pname = "jupytext";
-  version = "1.1.7";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g365j22gbmq4x60l06id5930aywzy1dx2s25109nqq2l2cxc7ws";
+    sha256 = "05vwxgjh7pzxgdzj0775562bfps8j7w3p7dcf1zfh169whqw9vg8";
   };
 
   propagatedBuildInputs = [
     pyyaml
     nbformat
-    testfixtures
-  ];
+  ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows
+
   checkInputs = [
     pytest
   ];
-  # setup.py checks for those even though they're not needed at runtime (only
-  # for tests), thus not propagated
-  buildInputs = [
-    mock
-    pytest
-  ];
 
   # requires test notebooks which are not shipped with the pypi release
+  # also, pypi no longer includes tests
   doCheck = false;
   checkPhase = ''
-    py.test
+    pytest
   '';
 
   meta = with lib; {

From bb6ef0646a8e4be582a8e45939734deefa1eebf3 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 8 Aug 2019 09:51:37 +0100
Subject: [PATCH 527/562] pulseaudio-modules-bt: 1.1.99 -> 1.2

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

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index f63b828a0a8..737b22c70ef 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -24,13 +24,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "pulseaudio-modules-bt-${version}";
-  version = "1.1.99";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "EHfive";
     repo = "pulseaudio-modules-bt";
     rev = "v${version}";
-    sha256 = "0x670xbd62r3fs9a8pa5p4ppvxn6m64hvlrqa702gvikcvyrmwcg";
+    sha256 = "0h2wcmxpq5ii65898fsjdydjb2sgcvqijrpvazyyj3bvhqdizch1";
   };
 
   patches = [

From ee684213889cae36a7867d9507ef432acf2ce69f Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Wed, 7 Aug 2019 07:45:53 +0200
Subject: [PATCH 528/562] gnome-sharp: mono4 -> mono5

---
 pkgs/development/libraries/gnome-sharp/default.nix  |  2 ++
 .../libraries/gnome-sharp/fix-mono-path.patch       | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                     |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gnome-sharp/fix-mono-path.patch

diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
index f2393a23dfe..5e525ad46af 100644
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ b/pkgs/development/libraries/gnome-sharp/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
   ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
 
+  patches = [ ./fix-mono-path.patch ];
+
   preConfigure = ''
     ./bootstrap-${lib.versions.majorMinor version}
   '';
diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
new file mode 100644
index 00000000000..706f119c8ba
--- /dev/null
+++ b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
@@ -0,0 +1,13 @@
+diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am
+index a0ee802..8260694 100644
+--- a/sample/gconf/Makefile.am
++++ b/sample/gconf/Makefile.am
+@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES)
+	$(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES)
+ 
+ Settings.cs: $(SCHEMA)
+-	MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
++	MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
+ 
+ CLEANFILES = sample.exe Settings.cs
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5b089be81b..a4c800839e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11019,7 +11019,7 @@ in
 
   gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
-  gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
+  gnome-sharp = callPackage ../development/libraries/gnome-sharp { };
 
   gnome-menus = callPackage ../development/libraries/gnome-menus { };
 

From 9175a201bbb28e679d72e9f7d28c84ab7d1f742b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 8 Aug 2019 12:35:53 +0200
Subject: [PATCH 529/562] gitlab-runner: don't bundle prebuilt docker images
 (#66225)

The bundeled images are no longer compiled into the binary. They are
also not strictly required as they will be fetched if not available.

This change removes them as this reduces the closure size and also makes
updates easier.
---
 .../gitlab-runner/default.nix                   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 1aa13a34d12..0f4b6b73de3 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -2,16 +2,6 @@
 
 let
   version = "12.1.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 = "1yx530h5rz7wmd012962f9dfj0hvj1m7zab5vchndna4svzzycch";
-  };
-
-  docker_arm = fetchurl {
-    url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk";
-  };
 in
 buildGoPackage rec {
   inherit version;
@@ -34,13 +24,6 @@ buildGoPackage rec {
 
   patches = [ ./fix-shell-path.patch ];
 
-  postInstall = ''
-    touch $bin/bin/hello
-    install -d $bin/bin/helper-images
-    ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz
-    ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz
-  '';
-
   meta = with lib; {
     description = "GitLab Runner the continuous integration executor of GitLab";
     license = licenses.mit;

From a37c0584223bc4119faf7961f223585bbc605cad Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Thu, 8 Aug 2019 11:44:15 +0100
Subject: [PATCH 530/562] tendermint: init at 0.32.2

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

diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
new file mode 100644
index 00000000000..a884ed0ccd4
--- /dev/null
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "tendermint";
+  version = "0.32.2";
+
+  src = fetchFromGitHub {
+    owner = "tendermint";
+    repo = pname;
+    rev = "d70135ec71979e7588c649c80f2acea65346a99a";
+    sha256 = "062lzc1c96nwg22ql10mwjkxhq68lyak7s0id5y4f9mmj6d4rd69";
+  };
+
+  modSha256 = "0hl8ly2qx0fv9diipqkcrlaz3ncsb2h81i0ccf5gn9cmyl37x0yk";
+
+  meta = with stdenv.lib; {
+    description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
+    homepage = https://tendermint.com/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ alexfmpe ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4c800839e3..3f24944269b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20703,6 +20703,8 @@ in
 
   telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
 
+  tendermint = callPackage ../tools/networking/tendermint {};
+
   termdown = (newScope pythonPackages) ../applications/misc/termdown { };
 
   terminal-notifier = callPackage ../applications/misc/terminal-notifier {};

From c4397b4318ad76debd241cce494d8f58ff68b9b8 Mon Sep 17 00:00:00 2001
From: angristan <angristan@pm.me>
Date: Thu, 8 Aug 2019 13:16:05 +0200
Subject: [PATCH 531/562] solargraph: 0.35.1 -> 0.35.2

---
 pkgs/development/ruby-modules/solargraph/Gemfile.lock | 4 ++--
 pkgs/development/ruby-modules/solargraph/gemset.nix   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index 0770eea4ad4..042c0366ffb 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    backport (1.1.1)
+    backport (1.1.2)
     htmlentities (4.3.4)
     jaro_winkler (1.5.3)
     kramdown (1.17.0)
@@ -23,7 +23,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    solargraph (0.35.1)
+    solargraph (0.35.2)
       backport (~> 1.1)
       bundler (>= 1.17.2)
       htmlentities (~> 4.3, >= 4.3.4)
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 7fa679fc162..2f0c60404bc 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -14,10 +14,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03j5w2a3qmjnqqqp9i1k8cla7rxfwk8r8j45pl8ndpwcx1hgrnjr";
+      sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.1.2";
   };
   htmlentities = {
     groups = ["default"];
@@ -139,10 +139,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00pq74a3zvb7x333mwcz7m73p7g4sjwzxmci94jwasl0h35fapzg";
+      sha256 = "1r0a7nfb0cwg2d7awbmvzk14594w7vkx844sshl9jpzkjx1asa9n";
       type = "gem";
     };
-    version = "0.35.1";
+    version = "0.35.2";
   };
   thor = {
     groups = ["default"];

From da346db5de32364465c28f1b5de46fc0e7beb6d9 Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Thu, 8 Aug 2019 20:15:50 +1000
Subject: [PATCH 532/562] qtpass: use qt5's mkDerivation

See #65399
---
 pkgs/applications/misc/qtpass/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 15cd426f1b3..462114ed272 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
+{ stdenv, mkDerivation, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "qtpass";
   version = "1.2.3";
 
@@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  qtWrapperArgs = [
+    "--suffix PATH : ${git}/bin"
+    "--suffix PATH : ${gnupg}/bin"
+    "--suffix PATH : ${pass}/bin"
+  ];
+
   postInstall = ''
     install -D qtpass.desktop $out/share/applications/qtpass.desktop
     install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
-    wrapProgram $out/bin/qtpass \
-      --suffix PATH : ${git}/bin \
-      --suffix PATH : ${gnupg}/bin \
-      --suffix PATH : ${pass}/bin
   '';
 
   meta = with stdenv.lib; {

From 9081eefb9aaf391a3571e32d9ea8ec36fd5163da Mon Sep 17 00:00:00 2001
From: Chris Rendle-Short <chris@killred.net>
Date: Thu, 8 Aug 2019 21:01:09 +1000
Subject: [PATCH 533/562] golden-cheetah: use qt5's mkDerivation

See #65399
---
 pkgs/applications/misc/golden-cheetah/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index edf16f806a6..d4ff7269987 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, mkDerivation, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
 }:
@@ -13,7 +13,7 @@ let
     comment = "Performance software for cyclists, runners and triathletes";
     categories = "Application;Utility;";
   };
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "golden-cheetah-${version}";
   version = "3.4";
   src = fetchurl {
@@ -29,6 +29,9 @@ in stdenv.mkDerivation rec {
   NIX_LDFLAGS = [
     "-lz"
   ];
+
+  qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];
+
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
@@ -40,7 +43,6 @@ in stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
-    wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
     install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
     install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
 

From 88f21d63a24948043cb2cfceee1f413bf7233cec Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 8 Aug 2019 15:13:54 +0200
Subject: [PATCH 534/562] python37Packages.asgiref: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 0e779a284df..295bc750f82 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
 buildPythonPackage rec {
-  version = "3.2.0";
+  version = "3.2.1";
   pname = "asgiref";
 
   disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "1rzglzdf0v9gcmjmrb7h843z1kcmz1pbbn1h40h8a7b910gxvq82";
+    sha256 = "16wb137dvnjmbmshy4r9vgsfjc4g8d6l527aj9d5vszyk5x5fm7d";
   };
 
   propagatedBuildInputs = [ async-timeout ];

From dba881e30e2a0e0123ac8922830aecaa94128a34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2019 16:18:19 +0200
Subject: [PATCH 535/562] chromedriver: 2.46 -> 76.0.3809.68

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

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 178bfc2dc17..f9128582092 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,12 +6,12 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "0iq015nyhdn1z50aj6k2d38cf1vbp59x7qi48aikb4z1h3h1j6a6";
+      sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv";
     };
 
     "x86_64-darwin" = {
       system = "mac64";
-      sha256 = "0bf59g7vx7qbz9lx6wgk82zjbf8isag1n3lbi0gw4b2bgv8md8ia";
+      sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09";
     };
   };
 
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.46";
+  version = "76.0.3809.68";
 
   src = fetchurl {
     url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From cacc355f617beb7de6c92f8533fd513c9ee4a257 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 8 Aug 2019 09:59:47 -0400
Subject: [PATCH 536/562] oh-my-zsh: 2019-08-06 -> 2019-08-07

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1373d936b0e..6afe6d286ee 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2019-08-06";
+  version = "2019-08-07";
   name = "oh-my-zsh-${version}";
-  rev = "89366be43fd6ceff52a9da2f2edef654ab619514";
+  rev = "40fafe0f59371d1a9d83b83c614acfd1d740aabb";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    sha256 = "0adql1x28q7i6cg103jfp7wqajq1smwdgbw1cxrsa7qh8ys7kss0";
+    sha256 = "0vk78dkrgbj51jvbpn337d7dnsb3p7cdj4bk92m6xqby5lmk4q01";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From aaf6f0971794d3ea0b7f9ec8717c488793a679d9 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Thu, 8 Aug 2019 11:34:44 -0400
Subject: [PATCH 537/562] weechat: prevent impure use of system Python (#64262)

---
 pkgs/applications/networking/irc/weechat/wrapper.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix
index 6dcd9a31e5e..c773aecf289 100644
--- a/pkgs/applications/networking/irc/weechat/wrapper.nix
+++ b/pkgs/applications/networking/irc/weechat/wrapper.nix
@@ -15,8 +15,10 @@ let
     availablePlugins = let
         simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
       in rec {
-        python = {
-          pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+        python = (simplePlugin "python") // {
+          extraEnv = ''
+            export PATH="${pythonPackages.python}/bin:$PATH"
+          '';
           withPackages = pkgsFun: (python // {
             extraEnv = ''
               export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"

From e80b0b2b228fb89efdc92c4abb1695f42925b025 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 8 Aug 2019 21:47:19 +0200
Subject: [PATCH 538/562] prometheus-wireguard-exporter: 3.0.0 -> 3.0.1

https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.0.1
---
 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 52620478339..1b4ffd61ec7 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wireguard-exporter";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
     rev = version;
-    sha256 = "1vgwsg81xcxh7pcdc667mfviwwpzsm4lpllykf78vfahi9qmwffn";
+    sha256 = "0wfv54ny557mjajjdf0lyq5sbf9m7y50ggm7s2v30c639i0swyrc";
   };
 
   cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw";

From 41b9c5f1da020762f559e8a11c79fa7604d6c058 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 8 Aug 2019 21:54:49 +0200
Subject: [PATCH 539/562] nixos/prometheus-wireguard-exporter: add support for
 `-r` switch

With this switch activated, the exporter also exposes the remote IP of
each active WireGuard peer.
---
 .../monitoring/prometheus/exporters/wireguard.nix        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index aee7cba2638..8ae2c927b58 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
@@ -34,6 +34,14 @@ in {
         <literal>allowed_ip_1</literal> and so on.
       '';
     };
+
+    withRemoteIp = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether or not the remote IP of a WireGuard peer should be exposed via prometheus.
+      '';
+    };
   };
   serviceOpts = {
     path = [ pkgs.wireguard-tools ];
@@ -45,6 +53,7 @@ in {
           -p ${toString cfg.port} \
           ${optionalString cfg.verbose "-v"} \
           ${optionalString cfg.singleSubnetPerField "-s"} \
+          ${optionalString cfg.withRemoteIp "-r"} \
           ${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"}
       '';
     };

From d81a46364fb06155eb6186d8c75663a7eb2721f0 Mon Sep 17 00:00:00 2001
From: Sam Willis <gh@mail.samw.cc>
Date: Thu, 8 Aug 2019 20:33:45 +0100
Subject: [PATCH 540/562] qbittorrent: use qt5's mkDerivation

Fixes #66339

See: #65399
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 9d2ac8ed384..7ffd79edba4 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig
 , boost, libtorrentRasterbar, qtbase, qttools, qtsvg
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus ? null # GUI (disable to run headless)
@@ -6,9 +6,9 @@
 }:
 
 assert guiSupport -> (dbus != null);
-with stdenv.lib;
+with lib;
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "qbittorrent-${version}";
   version = "4.1.7";
 

From 63fa75e34c12a296f2468e533407bca7c726b034 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 7 Aug 2019 13:48:26 +0200
Subject: [PATCH 541/562] pythonPackages.scapy: 2.4.2 -> 2.4.3

---
 .../python-modules/scapy/default.nix          |  7 ++--
 .../python-modules/scapy/fix-version.patch    | 33 ++++++-------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 7ca3fc0f94b..8f51b1eda21 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "scapy";
-  version = "2.4.2";
+  version = "2.4.3";
 
   disabled = isPyPy;
 
@@ -21,15 +21,14 @@ buildPythonPackage rec {
     owner = "secdev";
     repo = "scapy";
     rev = "v${version}";
-    sha256 = "03xzjklvc6y4d87k0rqpx5h112ld5nvgfldrbd8c4mx6f9mmd11n";
+    sha256 = "08ypdzp0p3gvmz3pwi0i9q5f7hz9cq8yn6gawia49ynallwnv4zy";
   };
 
   # TODO: Temporary workaround
   patches = [ ./fix-version.patch ];
 
   postPatch = ''
-    sed -i "s/NIXPKGS_SCAPY_VERSION/${version}/" \
-      setup.py scapy/__init__.py
+    sed -i "s/NIXPKGS_SCAPY_VERSION/${version}/" scapy/__init__.py
   '' + lib.optionalString withManufDb ''
     substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}"
   '';
diff --git a/pkgs/development/python-modules/scapy/fix-version.patch b/pkgs/development/python-modules/scapy/fix-version.patch
index 7ecb16c3b7c..c39458e9fea 100644
--- a/pkgs/development/python-modules/scapy/fix-version.patch
+++ b/pkgs/development/python-modules/scapy/fix-version.patch
@@ -1,26 +1,13 @@
---- a/setup.py	2018-02-15 22:14:08.531591678 +0100
-+++ b/setup.py	2018-03-27 17:15:38.617315539 +0200
-@@ -47,7 +47,7 @@
+diff --git a/scapy/__init__.py b/scapy/__init__.py
+index d5ad6164..245ce2fb 100644
+--- a/scapy/__init__.py
++++ b/scapy/__init__.py
+@@ -90,7 +90,7 @@ def _version():
+                 return 'unknown.version'
  
- setup(
-     name='scapy',
--    version=__import__('scapy').VERSION,
-+    version='NIXPKGS_SCAPY_VERSION',
-     packages=[
-         'scapy',
-         'scapy/arch',
---- a/scapy/__init__.py	2018-03-27 17:38:52.706481269 +0200
-+++ b/scapy/__init__.py	2018-03-27 17:39:56.576688890 +0200
-@@ -82,9 +82,10 @@
-             if match:
-                 return "git-archive.dev" + match.group(1)
-             elif sha1:
--                return "git-archive.dev" + sha1
-+                return 'NIXPKGS_SCAPY_VERSION'
-             else:
--                return 'unknown.version'
-+                return 'NIXPKGS_SCAPY_VERSION'
-+
  
- VERSION = _version()
+-VERSION = __version__ = _version()
++VERSION = __version__ = "NIXPKGS_SCAPY_VERSION"
+ VERSION_MAIN = re.search(r"[0-9.]+", VERSION).group()
  
+ if __name__ == "__main__":

From 7c398bda52c8d232f7e11b1c45304ce8df02f1cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 8 Aug 2019 22:15:24 +0100
Subject: [PATCH 542/562] pythonPackages.spacy: 2.1.7 -> 2.1.8

Changelog:

https://github.com/explosion/spaCy/releases/tag/v2.1.8
---
 pkgs/development/python-modules/spacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 1529d2ededb..cdef1b2a9bd 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -25,11 +25,11 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.1.7";
+  version = "2.1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k4kh9jnpdawaqjxwcdi2h01s85s5r338ajgv9kkq59iha4hichh";
+    sha256 = "1dja0crbai2n1l19m0hkv2fkj9r6zzy5ijd6dffp60v7lrch8lcw";
   };
 
   prePatch = ''

From e4032cae0adb13ab44b4ed81adf47177b483d233 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 8 Aug 2019 18:36:09 -0500
Subject: [PATCH 543/562] dsvpn: 0.1.2 -> 0.1.3

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

diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/applications/networking/dsvpn/default.nix
index dd564fc754c..4958d290529 100644
--- a/pkgs/applications/networking/dsvpn/default.nix
+++ b/pkgs/applications/networking/dsvpn/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dsvpn";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = pname;
     rev = version;
-    sha256 = "0vvvm664lkhnqyc03ylz8acz24dgpzyhwdlci5bc68s6wzsba549";
+    sha256 = "1jl9b23s2glims09mb1sq01kaf10bfjsd3qsgk68mp5kvy9f3gj2";
   };
 
   installPhase = ''

From 18b2a7d8ca7910c3681960975f9f726f572a558a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 9 Aug 2019 07:51:34 +0300
Subject: [PATCH 544/562] emacsPackages: make magit-annex a shared override

---
 .../editors/emacs-modes/melpa-packages.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 920572198d0..2dbff238ab6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -146,6 +146,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        magit-annex = super.magit-annex.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         magit-todos = super.magit-todos.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
@@ -384,12 +390,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           };
         });
 
-        magit-annex = super.magit-annex.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =

From d8a91b568f75104cd9e94072dcc056a008f1920d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 9 Aug 2019 07:52:15 +0300
Subject: [PATCH 545/562] emacsPackages: make magit-gitflow a shared override

---
 .../editors/emacs-modes/melpa-packages.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 2dbff238ab6..17f2898b2d4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -164,6 +164,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
       kubernetes = super.kubernetes.overrideAttrs (attrs: {
         # searches for Git at build time
         nativeBuildInputs =
@@ -390,12 +396,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           };
         });
 
-        magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         magithub = super.magithub.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =

From fb1ee7dbfc5124a1f8b587c5b1c39da741383b5d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 9 Aug 2019 07:52:38 +0300
Subject: [PATCH 546/562] emacsPackages: make magithub a shared override

---
 .../editors/emacs-modes/melpa-packages.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 17f2898b2d4..d8586d5d490 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -170,6 +170,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        magithub = super.magithub.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
       kubernetes = super.kubernetes.overrideAttrs (attrs: {
         # searches for Git at build time
         nativeBuildInputs =
@@ -396,12 +402,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           };
         });
 
-        magithub = super.magithub.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         magit-svn = super.magit-svn.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =

From f311b89ca7faf577a3845551af3a0168eeda15cf Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 9 Aug 2019 07:53:05 +0300
Subject: [PATCH 547/562] emacsPackages: make magit-svn a shared override

---
 .../editors/emacs-modes/melpa-packages.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d8586d5d490..2112d625185 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -176,6 +176,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        magit-svn = super.magit-svn.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
       kubernetes = super.kubernetes.overrideAttrs (attrs: {
         # searches for Git at build time
         nativeBuildInputs =
@@ -402,12 +408,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           };
         });
 
-        magit-svn = super.magit-svn.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         orgit =
           (super.orgit.overrideAttrs (attrs: {
             # searches for Git at build time

From 02e13a04787a102435764220eec427fdd358c0a4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 9 Aug 2019 07:53:30 +0300
Subject: [PATCH 548/562] emacsPackages: include shared overrides in the stable
 package set

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 2112d625185..24e541f2695 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -319,7 +319,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         xml-plus = super."xml+";
       };
 
-      stable = {
+      stable = shared // {
         # part of a larger package
         # upstream issue: missing package version
         cmake-mode = markBroken (dontConfigure super.cmake-mode);

From 15672693c1bf6f9169b7e279f201bbc5a2d41272 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 9 Aug 2019 00:26:15 -0500
Subject: [PATCH 549/562] bazelisk: 0.0.8 -> 1.0 (#66353)

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

diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 27db701ef54..6c0532eac48 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "bazelisk";
-  version = "0.0.8";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16jiy71x8zr3x94p3qms3xbl8632avhwi66i82wv03n4ahkyb6qr";
+    sha256 = "0516rx3qx6nxavy0a1qxjx2rcvdfb2ggig0q4n7fkmrxbnwxh2c9";
   };
 
   modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";

From 62a916defd4c650b87fdef07c9a8d937d1069cfe Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Thu, 8 Aug 2019 23:40:59 -0700
Subject: [PATCH 550/562] ocamlPackages_latest.camlp4: init at 4.08+1 (#66343)

---
 pkgs/development/tools/ocaml/camlp4/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index 2974ca965fd..a83959fba39 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -19,6 +19,9 @@ let param = {
   "4.07" = {
      version = "4.07+1";
      sha256 = "0cxl4hkqcvspvkx4f2k83217rh6051fll9i2yz7cw6m3bq57mdvl"; };
+  "4.08" = {
+     version = "4.08+1";
+     sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; };
   }."${ocaml.meta.branch}";
 in
 

From 95dec03601c003c372ea077ae359cb87ad89ce52 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 3 Aug 2019 19:41:52 +0200
Subject: [PATCH 551/562] [throttled] Enable custom config

---
 nixos/modules/services/hardware/throttled.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix
index cd5b01450e4..13fc5e4792e 100644
--- a/nixos/modules/services/hardware/throttled.nix
+++ b/nixos/modules/services/hardware/throttled.nix
@@ -8,6 +8,12 @@ in {
   options = {
     services.throttled = {
       enable = mkEnableOption "fix for Intel CPU throttling";
+
+      extraConfig = mkOption {
+        type = types.str;
+        default = "";
+        description = "Alternative configuration";
+      };
     };
   };
 
@@ -16,6 +22,9 @@ in {
     # The upstream package has this in Install, but that's not enough, see the NixOS manual
     systemd.services."lenovo_fix".wantedBy = [ "multi-user.target" ];
 
-    environment.etc."lenovo_fix.conf".source = "${pkgs.throttled}/etc/lenovo_fix.conf";
+    environment.etc."lenovo_fix.conf".source =
+      if cfg.extraConfig != ""
+      then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig
+      else "${pkgs.throttled}/etc/lenovo_fix.conf";
   };
 }

From 28d69007311ca272ca18766d32bccaec7ce3ec07 Mon Sep 17 00:00:00 2001
From: toon <toon@c3d2.de>
Date: Sun, 4 Aug 2019 17:03:54 +0200
Subject: [PATCH 552/562] profanity: 0.6.0 -> 0.7.0

---
 .../networking/instant-messengers/profanity/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index fbbf6204971..4a4ad84fc0a 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -20,13 +20,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "profanity-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
-    owner = "boothj5";
+    owner = "profanity-im";
     repo = "profanity";
     rev = "${version}";
-    sha256 = "0f5kfzy22wzyj7rnd2nbj93q96ga87b53wlg8lfg83qdphx1ymz9";
+    sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z";
   };
 
   patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];

From 4640287f318727f5f864226e5c21d22f453ed554 Mon Sep 17 00:00:00 2001
From: toon <toon@c3d2.de>
Date: Mon, 5 Aug 2019 18:00:24 +0200
Subject: [PATCH 553/562] profanity: Add optional omemo support (enabled by
 default)

---
 .../networking/instant-messengers/profanity/default.nix   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 4a4ad84fc0a..79a197d1a7a 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -8,6 +8,7 @@
 , traySupport ? true,           gnome2 ? null
 , pgpSupport ? true,            gpgme ? null
 , pythonPluginSupport ? true,   python ? null
+, omemoSupport ? true,          libsignal-protocol-c ? null, libgcrypt ? null
 }:
 
 assert autoAwaySupport     -> libXScrnSaver != null && libX11 != null;
@@ -15,6 +16,7 @@ assert notifySupport       -> libnotify != null && gdk-pixbuf != null;
 assert traySupport         -> gnome2 != null;
 assert pgpSupport          -> gpgme != null;
 assert pythonPluginSupport -> python != null;
+assert omemoSupport        -> libsignal-protocol-c != null && libgcrypt != null;
 
 with stdenv.lib;
 
@@ -44,14 +46,16 @@ stdenv.mkDerivation rec {
     ++ optionals notifySupport       [ libnotify gdk-pixbuf ]
     ++ optionals traySupport         [ gnome2.gtk ]
     ++ optionals pgpSupport          [ gpgme ]
-    ++ optionals pythonPluginSupport [ python ];
+    ++ optionals pythonPluginSupport [ python ]
+    ++ optionals omemoSupport        [ libsignal-protocol-c libgcrypt ];
 
   # Enable feature flags, so that build fail if libs are missing
   configureFlags = [ "--enable-c-plugins" "--enable-otr" ]
     ++ optionals notifySupport       [ "--enable-notifications" ]
     ++ optionals traySupport         [ "--enable-icons" ]
     ++ optionals pgpSupport          [ "--enable-pgp" ]
-    ++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
+    ++ optionals pythonPluginSupport [ "--enable-python-plugins" ]
+    ++ optionals omemoSupport        [ "--enable-omemo" ];
 
   preAutoreconf = ''
     mkdir m4

From 52f3c28df2300c60ca015fc39d48c10f09b8c5ef Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Tue, 6 Aug 2019 11:15:37 +0200
Subject: [PATCH 554/562] elpi: 1.4.1 -> 1.6.0, and coq-elpi

---
 maintainers/maintainer-list.nix               |  5 +++
 .../coq-modules/coq-elpi/default.nix          | 38 +++++++++++++++++++
 .../ocaml-modules/elpi/default.nix            |  4 +-
 pkgs/top-level/coq-packages.nix               |  1 +
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/coq-modules/coq-elpi/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af6fc10f0f8..65095e78596 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1083,6 +1083,11 @@
     github = "codyopel";
     name = "Cody Opel";
   };
+  cohencyril = {
+    email = "cyril.cohen@inria.fr";
+    github = "CohenCyril";
+    name = "Cyril Cohen";
+  };
   colemickens = {
     email = "cole.mickens@gmail.com";
     github = "colemickens";
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
new file mode 100644
index 00000000000..04fc428b409
--- /dev/null
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, which, coq }:
+
+let params = {
+  "8.10" = {
+    version = "master";
+    rev = "bc7134deba1aacc7ecd2f5d1032bdf05b125c568";
+    sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk";
+  };
+};
+  param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+  name = "coq${coq.coq-version}-elpi-${param.version}";
+
+  src = fetchFromGitHub {
+    owner = "LPCIC";
+    repo = "coq-elpi";
+    inherit (param) rev sha256;
+  };
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]);
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = {
+    description = "Coq plugin embedding ELPI.";
+    maintainers = [ stdenv.lib.maintainers.cohencyril ];
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (coq.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+
+  passthru = {
+    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index c00af00b859..2542b5dd913 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "elpi";
-  version = "1.4.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "LPCIC";
     repo = "elpi";
     rev = "v${version}";
-    sha256 = "0sj2jbimg3jqwz4bsfcdqbrh45bb1dbgxj5g234pg1xjy9kxzl2w";
+    sha256 = "0740a9bg33g7r3injpalmn2jd0h586481vrrkdw46nsaspwcjhza";
   };
 
   minimumOCamlVersion = "4.04";
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 1cbdb6a9f21..3ac7b9413d9 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -16,6 +16,7 @@ let
       category-theory = callPackage ../development/coq-modules/category-theory { };
       Cheerios = callPackage ../development/coq-modules/Cheerios {};
       CoLoR = callPackage ../development/coq-modules/CoLoR {};
+      coq-elpi = callPackage ../development/coq-modules/coq-elpi {};
       coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
       coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {};
       coq-haskell = callPackage ../development/coq-modules/coq-haskell { };

From 63ea6e95f792a192bb8220781126438ef39fa743 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 9 Aug 2019 11:16:37 +0200
Subject: [PATCH 555/562] fcitx-qt5: fix build

---
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index ad5b4669498..3fd1efcc343 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -21,15 +21,15 @@ mkDerivation rec {
 
   buildInputs = [ fcitx qtbase ];
 
-  preInstall = ''
-    substituteInPlace platforminputcontext/cmake_install.cmake \
-      --replace ${qtbase.bin} $out
-    substituteInPlace quickphrase-editor/cmake_install.cmake \
-      --replace ${fcitx} $out
+  preConfigure = ''
+    substituteInPlace platforminputcontext/CMakeLists.txt \
+      --replace \$"{CMAKE_INSTALL_QTPLUGINDIR}" $out/${qtbase.qtPluginPrefix}
+    substituteInPlace quickphrase-editor/CMakeLists.txt \
+      --replace \$"{FCITX4_ADDON_INSTALL_DIR}" $out/lib/fcitx
   '';
 
   meta = with lib; {
-    homepage    = https://gitlab.com/fcitx/fcitx-qt5;
+    homepage    = "https://gitlab.com/fcitx/fcitx-qt5";
     description = "Qt5 IM Module for Fcitx";
     license     = licenses.gpl2;
     platforms   = platforms.linux;

From d568509a0fd05d6aefaf573d68ae87765a2cd387 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Fri, 2 Aug 2019 23:49:46 +0200
Subject: [PATCH 556/562] steam chrootenv: add lsb-release

Fixes issue with operating system detection
sh: lsb_release: command not found
---
 pkgs/games/steam/chrootenv.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 9e6bfc7bab8..9f0ac916751 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -16,6 +16,9 @@ let
   commonTargetPkgs = pkgs: with pkgs;
     [
       steamPackages.steam-fonts
+      # Needed for operating system detection until
+      # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved
+      lsb-release
       # Errors in output without those
       pciutils
       python2

From 157c3ad9f0ac575f934e2cad76c0edec230b2a3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 16:51:54 -0700
Subject: [PATCH 557/562] cppzmq: 4.3.0 -> 4.4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cppzmq/versions
---
 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 4c63e93e5c4..5bffda607ee 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cppzmq-${version}";
-  version = "4.3.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
     rev = "v${version}";
-    sha256 = "1g45cdny1m08zw4l261bqcqfdb825mnwjwqcf35bkyc03fr4213l";
+    sha256 = "15dgkv51csfkafplf0n0vqbjdr4pxqxq44dln0dcizhsn1p0a57q";
   };
 
   nativeBuildInputs = [ cmake ];

From aeb5d5eee1a9b5eacef0da740804d150fa2deb01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 3 Aug 2019 22:15:08 -0700
Subject: [PATCH 558/562] folly: 2019.06.17.00 -> 2019.07.22.00

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

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 78e32192fb4..3fba3db7a33 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2019.06.17.00";
+  version = "2019.07.22.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "0v639yqk029c585x3140rdfbz3xrdjwc858bqfy4yv31pyrn608l";
+    sha256 = "1vh5jrqz0lp6rc5fr6vk3yqss5vaycdsyap12mcr0cniv419fdxa";
   };
 
   nativeBuildInputs = [ cmake ];

From c0e56afddbcf6002e87a5ab0e8e17f381e3aa9bd Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 9 Aug 2019 11:24:23 +0100
Subject: [PATCH 559/562] pulseaudio-modules-bt: 1.2 -> 1.3

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

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 737b22c70ef..9989f75c0bd 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -24,13 +24,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "pulseaudio-modules-bt-${version}";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "EHfive";
     repo = "pulseaudio-modules-bt";
     rev = "v${version}";
-    sha256 = "0h2wcmxpq5ii65898fsjdydjb2sgcvqijrpvazyyj3bvhqdizch1";
+    sha256 = "00xmidcw4fvpbmg0nsm2gk5zw26fpyjbc0pjk6mzr570zbnyqqbn";
   };
 
   patches = [

From 965d908ac5d8937336bae6e2fb466336fbeed85e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2019 19:44:10 -0700
Subject: [PATCH 560/562] rabbitmq-server: 3.7.16 -> 3.7.17

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

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 00f83cba8db..9538747da6d 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -6,12 +6,12 @@
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
 
-  version = "3.7.16";
+  version = "3.7.17";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "12s1s4zz3fxvb5ah5v6gmaq1kgd41pv9nahsdswa7svbgdc8lykz";
+    sha256 = "1ychgvjbi6ikapfcp4rgwa0vihhs1f34c2advb7833jym8alazrr";
   };
 
   buildInputs =

From bae6ce3b6c983567a557d5c91adce7c3ce95924a Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 9 Aug 2019 13:30:33 +0200
Subject: [PATCH 561/562] postgresql: fix CVE-2019-10208, CVE-2019-10209
 (#66347)

---
 pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index ba4fd8e3d38..711ad35bcc1 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -168,41 +168,41 @@ let
 in self: {
 
   postgresql_9_4 = self.callPackage generic {
-    version = "9.4.23";
+    version = "9.4.24";
     psqlSchema = "9.4";
-    sha256 = "16qx4gfq7i2nnxm0i3zxpb3z1mmzx05a3fsh95414ay8n049q00d";
+    sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj";
     this = self.postgresql_9_4;
     inherit self;
   };
 
   postgresql_9_5 = self.callPackage generic {
-    version = "9.5.18";
+    version = "9.5.19";
     psqlSchema = "9.5";
-    sha256 = "1pgkz794wmp4f40843sbin49k5lgl59jvl6nazvdbb6mgr441jfz";
+    sha256 = "1cqvbsyfs9048wbvdv0vhhaksjyjqv2vvh6ij4vqmjibc4kal34n";
     this = self.postgresql_9_5;
     inherit self;
   };
 
   postgresql_9_6 = self.callPackage generic {
-    version = "9.6.14";
+    version = "9.6.15";
     psqlSchema = "9.6";
-    sha256 = "08hsqczy1ixkjyf2vr3s9x69agfz9yr8lh31fir4z0dfr5jw421z";
+    sha256 = "02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w";
     this = self.postgresql_9_6;
     inherit self;
   };
 
   postgresql_10 = self.callPackage generic {
-    version = "10.9";
+    version = "10.10";
     psqlSchema = "10.0"; # should be 10, but changing it is invasive
-    sha256 = "0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm";
+    sha256 = "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd";
     this = self.postgresql_10;
     inherit self;
   };
 
   postgresql_11 = self.callPackage generic {
-    version = "11.4";
+    version = "11.5";
     psqlSchema = "11.1"; # should be 11, but changing it is invasive
-    sha256 = "12ycjlqncijgmd5z078ybwda8ilas96lc7nxxmdq140mzpgjv002";
+    sha256 = "106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz";
     this = self.postgresql_11;
     inherit self;
   };

From 246c223e877989c5763ce905bfa42b3f32fe2c18 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 9 Aug 2019 03:49:59 -0500
Subject: [PATCH 562/562] dune: 1.11.0 -> 1.11.1

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

diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index 61637027386..570edd8223b 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -6,10 +6,10 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "1.11.0";
+  version = "1.11.1";
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
-    sha256 = "11jl2vavypbgvwblch25q10hsd16myik9b3cd4d64zhxk1fzbzdw";
+    sha256 = "0hizfaidl1bxl614i65yvyfhsjbp93y7y9qy1a8zw448w1js5bsp";
   };
 
   buildInputs = [ ocaml findlib ];