From 757c7f377326205f3e04afe5d053c371600457f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 27 Nov 2019 15:44:32 -0600
Subject: [PATCH 001/183] docker-container: Remove /etc symlink

The system output usually contains a symlink from /etc to the static
configuration for the benefit of the stage-1 script in the initrd. The stage-2
script is usually started in the real root without such a symlink. In a
container, there is no stage-1 and the system output is used directly as a real
root. If the symlink is present, setup-etc.pl will create a symlink cycle and
the system cannot boot. There is no reason for the /etc link to exist in a
container because setup-etc.pl will create the necessary files. The container
module will now remove the /etc symlink and create an empty directory. The empty
/etc is for container managers to populate it with site-specific settings; for
example, to set the hostname. This is required to boot NixOS in an LXC container
on another host.

See also: #9735
---
 nixos/modules/profiles/docker-container.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix
index 5d6b11498b52..183645de36fb 100644
--- a/nixos/modules/profiles/docker-container.nix
+++ b/nixos/modules/profiles/docker-container.nix
@@ -2,6 +2,8 @@
 
 with lib;
 
+let inherit (pkgs) writeScript; in
+
 let
  pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l;
 
@@ -30,7 +32,12 @@ in {
     ];
 
     # Some container managers like lxc need these
-    extraCommands = "mkdir -p proc sys dev";
+    extraCommands =
+      let script = writeScript "extra-commands.sh" ''
+            rm etc
+            mkdir -p proc sys dev etc
+          '';
+      in script;
   };
 
   boot.isContainer = true;

From 7ebfcc1d4d847c8d67fe53b9f043701769f205a9 Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Wed, 11 Mar 2020 16:17:29 +0530
Subject: [PATCH 002/183] rescuetime: 2.14.5.2 -> 2.14.5.3

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

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 13ae1f1ba7d3..7212563816b8 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,15 +5,15 @@ let
     if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay";
+      sha256 = "0rc744infrvs5l1c8qpsd1x2y40bpbxlwnmyj6nyli8fnqcnzh5l";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10";
+      sha256 = "1cjsgqcv76b798rpdn72fkbm79shlqnxyh1741isi8gcp1gnimji";
     };
 in mkDerivation {
   # https://www.rescuetime.com/updates/linux_release_notes.html
-  name = "rescuetime-2.14.5.2";
+  name = "rescuetime-2.14.5.3";
   inherit src;
   nativeBuildInputs = [ dpkg ];
   # avoid https://github.com/NixOS/patchelf/issues/99

From 33b8f5dd21c140c1e5f0f0f66b8ef98c4677873e Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine@chikhaoui.org>
Date: Thu, 12 Mar 2020 11:32:24 -0400
Subject: [PATCH 003/183] ec2 amis: update 19.09 AMIs

this adds support for ap-east-1 and eu-north-1 regions as well.
Fixes: https://github.com/NixOS/nixos-org-configurations/issues/105
---
 nixos/modules/virtualisation/ec2-amis.nix | 33 ++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 3b4e55d39d7b..630c35bd08fc 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -291,21 +291,24 @@ let self = {
   "19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
   "19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878";
 
-  # 19.09.981.205691b7cbe
-  "19.09".eu-west-1.hvm-ebs = "ami-0ebd3156e21e9642f";
-  "19.09".eu-west-2.hvm-ebs = "ami-02a2b5480a79084b7";
-  "19.09".eu-west-3.hvm-ebs = "ami-09aa175c7588734f7";
-  "19.09".eu-central-1.hvm-ebs = "ami-00a7fafd7e237a330";
-  "19.09".us-east-1.hvm-ebs = "ami-00a8eeaf232a74f84";
-  "19.09".us-east-2.hvm-ebs = "ami-093efd3a57a1e03a8";
-  "19.09".us-west-1.hvm-ebs = "ami-0913e9a2b677fac30";
-  "19.09".us-west-2.hvm-ebs = "ami-02d9a19f77b47882a";
-  "19.09".ca-central-1.hvm-ebs = "ami-0627dd3f7b3627a29";
-  "19.09".ap-southeast-1.hvm-ebs = "ami-083614e4d08f2164d";
-  "19.09".ap-southeast-2.hvm-ebs = "ami-0048c704185ded6dc";
-  "19.09".ap-northeast-1.hvm-ebs = "ami-0329e7fc2d7f60bd0";
-  "19.09".ap-northeast-2.hvm-ebs = "ami-03d4ae7d0b5fc364f";
-  "19.09".ap-south-1.hvm-ebs = "ami-0b599690b35aeef23";
+  # 19.09.2243.84af403f54f
+  "19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f";
+  "19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
+  "19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed";
+  "19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79";
+  "19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed";
+  "19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f";
+  "19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f";
+  "19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6";
+  "19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e";
+  "19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d";
+  "19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95";
+  "19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210";
+  "19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b";
+  "19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93";
+  "19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1";
+  "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1";
+  "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06";
 
   latest = self."19.09";
 }; in self

From df495e3a9f93df2f71e0e8842cf565d94b170434 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2020 07:06:30 +0000
Subject: [PATCH 004/183] pwsafe: 1.09.0 -> 3.52.0

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

diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 91845abc8b21..6abfdc3c21dc 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pwsafe";
-  version = "1.09.0";
+  version = "3.52.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "${version}";
-    sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b";
+    sha256 = "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh";
   };
 
   nativeBuildInputs = [ 

From d7df6591263a954fefe0e074c96e02ea3317f578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Apr 2020 07:10:49 +0200
Subject: [PATCH 005/183] jetbrains: 2019.3.5 -> 2020.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index b98acae2a8f1..282d950c85d5 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2019.3.5"; /* updated by script */
+    version = "2020.1"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */
+      sha256 = "18mbw72vgrzkvjykc23h17qxrxfvhjzhy9rxpi2asw196qalavzp"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2019.3.4"; /* updated by script */
+    version = "2020.1"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "01dik4ppn4a6m1bmz6cmdnyrilh2v190lrys65n4nps03sjy2v0b"; /* updated by script */
+      sha256 = "1qlpx3vfqwpyyxjsknhxvbdhyciwihhl0hkinrpdky6bza1yfgf6"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand RELEASE";
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2019.3.4"; /* updated by script */
+    version = "2020.1"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */
+      sha256 = "1yvqljjv6004kw2nkpddrsgnigb56rapgs3f1pcvl20h6hj08qj8"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";
@@ -354,12 +354,12 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2019.3.4"; /* updated by script */
+    version = "2020.1.0"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */
+      sha256 = "1allpdr7k48nvl8vbvzyn6h81jpklzaqdqivrqqyh8hy9l98w4ws"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
     update-channel = "Rider RELEASE";
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2019.3.4"; /* updated by script */
+    version = "2020.1"; /* 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 = "13lwrqrkg5vk0azqfhr67psgv1idvkxwjxly2xawr6cy5vnrcd8s"; /* updated by script */
+      sha256 = "1hk6k4f24infw9qj9mxp305nl0bxif6ymdsqg005pskvnyi8v5fi"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";

From 441f5d5d267a805c921fcb65c7a41ea4db4e9a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Apr 2020 07:16:14 +0200
Subject: [PATCH 006/183] jetbrains: remove deprecated value "Application" from
 desktop file

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

diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index bca85c01016a..cb732d076f2a 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -19,7 +19,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
     comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
     desktopName = product;
     genericName = meta.description;
-    categories = "Application;Development;";
+    categories = "Development;";
     icon = execName;
     extraEntries = ''
       StartupWMClass=${wmClass}

From dc80c4962d8e9b99ce1f0248f1d6dab71c73dd7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 21 Apr 2020 08:41:14 -0300
Subject: [PATCH 007/183] yaru-theme: 20.04.1 -> 20.04.6, unmark as broken

---
 pkgs/data/themes/yaru/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix
index 6033d64d79bc..385f7afa3e4f 100644
--- a/pkgs/data/themes/yaru/default.nix
+++ b/pkgs/data/themes/yaru/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yaru";
-  version = "20.04.1";
+  version = "20.04.6";
 
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
     rev = version;
-    sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1";
+    sha256 = "04z16bcv1xdq4acnchd6cq9a8j46zl2bjp50cj90qmd6plpiiz50";
   };
 
   nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
@@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
     license = with licenses; [ cc-by-sa-40 gpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.jD91mZM2 ];
-    broken = true; # since libsass 3.6.3
   };
 }

From 20f37a443089628fb7fd9d5f941bdabbdd4fecc2 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 11 Apr 2020 19:58:24 -0400
Subject: [PATCH 008/183] nixos/httpd: run as non root user

---
 .../services/web-servers/apache-httpd/default.nix   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 832c8b30ee9d..1094ed93e68c 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -453,7 +453,13 @@ in
         type = types.str;
         default = "wwwrun";
         description = ''
-          User account under which httpd runs.
+          User account under which httpd children processes run.
+
+          If you require the main httpd process to run as
+          <literal>root</literal> add the following configuration:
+          <programlisting>
+          systemd.services.httpd.serviceConfig.User = lib.mkForce "root";
+          </programlisting>
         '';
       };
 
@@ -461,7 +467,7 @@ in
         type = types.str;
         default = "wwwrun";
         description = ''
-          Group under which httpd runs.
+          Group under which httpd children processes run.
         '';
       };
 
@@ -724,7 +730,7 @@ in
           ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}";
           ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop";
           ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful";
-          User = "root";
+          User = cfg.user;
           Group = cfg.group;
           Type = "forking";
           PIDFile = "${runtimeDir}/httpd.pid";
@@ -732,6 +738,7 @@ in
           RestartSec = "5s";
           RuntimeDirectory = "httpd httpd/runtime";
           RuntimeDirectoryMode = "0750";
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
         };
       };
 

From ee030b121b3e963c753968f34678a89c4f2f006c Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 11 Apr 2020 20:03:33 -0400
Subject: [PATCH 009/183] nixos/httpd: set modern default values for mpm and
 http2

---
 .../web-servers/apache-httpd/default.nix      | 24 +++++++++----------
 .../apache-httpd/vhost-options.nix            |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 1094ed93e68c..0ab7942e46b5 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -41,9 +41,9 @@ let
       "mime" "autoindex" "negotiation" "dir"
       "alias" "rewrite"
       "unixd" "slotmem_shm" "socache_shmcb"
-      "mpm_${cfg.multiProcessingModule}"
+      "mpm_${cfg.mpm}"
     ]
-    ++ (if cfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
+    ++ (if cfg.mpm == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableHttp2 "http2"
     ++ optional enableSSL "ssl"
     ++ optional enableUserDir "userdir"
@@ -264,7 +264,7 @@ let
 
     PidFile ${runtimeDir}/httpd.pid
 
-    ${optionalString (cfg.multiProcessingModule != "prefork") ''
+    ${optionalString (cfg.mpm != "prefork") ''
       # mod_cgid requires this.
       ScriptSock ${runtimeDir}/cgisock
     ''}
@@ -349,6 +349,7 @@ in
   imports = [
     (mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.")
     (mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.")
+    (mkRenamedOptionModule [ "services" "httpd" "multiProcessingModule" ] [ "services" "httpd" "mpm" ])
 
     # virtualHosts options
     (mkRemovedOptionModule [ "services" "httpd" "documentRoot" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
@@ -544,20 +545,19 @@ in
         '';
       };
 
-      multiProcessingModule = mkOption {
+      mpm = mkOption {
         type = types.enum [ "event" "prefork" "worker" ];
-        default = "prefork";
+        default = "event";
         example = "worker";
         description =
           ''
             Multi-processing module to be used by Apache. Available
-            modules are <literal>prefork</literal> (the default;
-            handles each request in a separate child process),
-            <literal>worker</literal> (hybrid approach that starts a
-            number of child processes each running a number of
-            threads) and <literal>event</literal> (a recent variant of
-            <literal>worker</literal> that handles persistent
-            connections more efficiently).
+            modules are <literal>prefork</literal> (handles each
+            request in a separate child process), <literal>worker</literal>
+            (hybrid approach that starts a number of child processes
+            each running a number of threads) and <literal>event</literal>
+            (the default; a recent variant of <literal>worker</literal>
+            that handles persistent connections more efficiently).
           '';
       };
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
index 2e806afb42c5..173c0f8561c0 100644
--- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
@@ -137,7 +137,7 @@ in
 
     http2 = mkOption {
       type = types.bool;
-      default = false;
+      default = true;
       description = ''
         Whether to enable HTTP 2. HTTP/2 is supported in all multi-processing modules that come with httpd. <emphasis>However, if you use the prefork mpm, there will
         be severe restrictions.</emphasis> Refer to <link xlink:href="https://httpd.apache.org/docs/2.4/howto/http2.html#mpm-config"/> for details.

From d0de9702795d33d6c3c72ea663256b9a743435e1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 11 Apr 2020 20:06:24 -0400
Subject: [PATCH 010/183] nixos/httpd: some mod_php cleanup

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 0ab7942e46b5..6f37974fde1b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -657,7 +657,7 @@ in
     services.httpd.phpOptions =
       ''
         ; Needed for PHP's mail() function.
-        sendmail_path = sendmail -t -i
+        sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i
 
         ; Don't advertise PHP
         expose_php = off
@@ -708,9 +708,7 @@ in
         wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME);
         after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME;
 
-        path =
-          [ pkg pkgs.coreutils pkgs.gnugrep ]
-          ++ optional cfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function.
+        path = [ pkg pkgs.coreutils pkgs.gnugrep ];
 
         environment =
           optionalAttrs cfg.enablePHP { PHPRC = phpIni; }

From 7bc9f24fb646f7b538f84e829427c8d16272e9d8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 11 Apr 2020 20:47:24 -0400
Subject: [PATCH 011/183] nixos/httpd: update release notes

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

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 3e29c19af8fb..40b5ca240aa6 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -261,6 +261,25 @@ environment.systemPackages = [
 </programlisting>
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The httpd web server previously started its main process as root
+     privileged, then ran worker processes as a less privileged identity user.
+     This was changed to start all of httpd as a less privileged user (defined by
+     <xref linkend="opt-services.httpd.user"/> and
+     <xref linkend="opt-services.httpd.group"/>). As a consequence, all files that
+     are needed for httpd to run (included configuration fragments, SSL
+     certificates and keys, etc.) must now be readable by this less privileged
+     user/group.
+    </para>
+    <para>
+     The default value for <xref linkend="opt-services.httpd.mpm"/>
+     has been changed from <literal>prefork</literal> to <literal>event</literal>. Along with
+     this change the default value for
+     <link linkend="opt-services.httpd.virtualHosts">services.httpd.virtualHosts.&lt;name&gt;.http2</link>
+     has been set to <literal>true</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From c1f5ac41a360812a7a14c717cd4e3a3b97d1e07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 22 Apr 2020 07:24:35 +0100
Subject: [PATCH 012/183] python3.pkgs.snitun: fix port binding conflicts in
 test

---
 .../python-modules/snitun/default.nix            | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix
index 8212379e3d48..901987fbff66 100644
--- a/pkgs/development/python-modules/snitun/default.nix
+++ b/pkgs/development/python-modules/snitun/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }:
+{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub
+, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "snitun";
@@ -13,12 +15,14 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ attrs cryptography async-timeout ];
 
-  checkInputs = [ pytest pytest-aiohttp ];
+  checkInputs = [ pytestCheckHook pytest-aiohttp ];
 
-  checkPhase = ''
-    # https://github.com/NabuCasa/snitun/issues/61
-    pytest ${lib.optionalString stdenv.isDarwin "-k 'not test_multiplexer_data_channel_abort_full'"} tests/
-  '';
+  disabledTests = lib.optionals stdenv.isDarwin [
+    "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61
+    # port binding conflicts
+    "test_snitun_single_runner_timeout"
+    "test_snitun_single_runner_throttling"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/nabucasa/snitun";

From 9bb6948317a895915f74bf9a31bc178862b6cfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 14 Apr 2020 12:19:33 +0100
Subject: [PATCH 013/183] home-assistant: 0.108.2 -> 0.108.7

---
 .../0001-setup.py-relax-dependencies.patch      | 17 +++++++++++------
 .../home-assistant/component-packages.nix       |  2 +-
 pkgs/servers/home-assistant/default.nix         |  4 ++--
 pkgs/servers/home-assistant/frontend.nix        |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
index 52d2daf80b08..e18842f49aaf 100644
--- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
+++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch
@@ -1,4 +1,4 @@
-From 80f39643bb4d25f8ffcbd92804844961b303f4d0 Mon Sep 17 00:00:00 2001
+From 679364e1cd95dc7179dbd3114ec35b282fbcb0af Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Thu, 9 Apr 2020 07:20:46 +0100
 Subject: [PATCH] setup.py: relax dependencies
@@ -8,11 +8,11 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
 ---
- setup.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ setup.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index f53af0ee1..ff4227487 100755
+index e0daacd98b..7166f1f228 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -32,10 +32,10 @@ PROJECT_URLS = {
@@ -28,7 +28,12 @@ index f53af0ee1..ff4227487 100755
      "bcrypt==3.1.7",
      "certifi>=2019.11.28",
      "ciso8601==2.1.3",
-@@ -47,9 +47,9 @@ REQUIRES = [
+@@ -43,13 +43,13 @@ REQUIRES = [
+     "jinja2>=2.11.1",
+     "PyJWT==1.7.1",
+     # PyJWT has loose dependency. We want the latest one.
+-    "cryptography==2.8",
++    "cryptography>=2.8",
      "pip>=8.0.3",
      "python-slugify==4.0.0",
      "pytz>=2019.03",
@@ -42,5 +47,5 @@ index f53af0ee1..ff4227487 100755
      "voluptuous-serialize==2.3.0",
  ]
 -- 
-2.25.1
+2.26.1
 
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d19b70c426ea..0ae33cd48952 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.108.2";
+  version = "0.108.7";
   components = {
     "abode" = ps: with ps; [ ]; # missing inputs: abodepy
     "acer_projector" = ps: with ps; [ pyserial];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 51b6d94860cc..d04c2fa5c96a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.108.2";
+  hassVersion = "0.108.7";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0v4i1ak7pkpycas0mzdmxgc42xgfymwx2b0a2a4h13c4z46pbs2l";
+    sha256 = "0nk1615ms6nlmhgmsgsknc6m7b19baan8m4kr4s97njngiardxm7";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 9e12016320c9..6ca763768eaa 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20200407.2";
+  version = "20200418.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0krwn67bkybjb69daik6dki5hm36xs4nbfwqkh0q7ami1xr1f56d";
+    sha256 = "12px8znc6nw5ndg4f28lvfpqsnzi00b5qgpdj9jwny0fss4aglnb";
   };
 
   # no Python tests implemented

From bbbc41918634c2388f1fd39db1c8f162e3ab4b95 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 22 Apr 2020 09:48:05 +0200
Subject: [PATCH 014/183] srcOnly: fix invocation and document

Previously, callPackage would try and fill the arguments such as `name`
and `src` which would cause problems if those existed as top-level
attributes. This also makes it clearer what part is the function
signature.

Then document the derivation inline in the code to explain the ellipsis
and various use-cases.
---
 pkgs/build-support/src-only/default.nix | 17 ++++++++++++++++-
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index a93b36480908..8ca262a998b2 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -1,4 +1,19 @@
-{stdenv, name, src, patches ? [], buildInputs ? [], ...}: 
+{ stdenv }@orig:
+# srcOnly is a utility builder that only fetches and unpacks the given `src`,
+# maybe pathings it in the process with the optional `patches` and
+# `buildInputs` attributes.
+#
+# It can be invoked directly, or be used to wrap an existing derivation. Eg:
+#
+# > srcOnly pkgs.hello
+#
+{ name
+, src
+, stdenv ? orig.stdenv
+, patches ? []
+, buildInputs ? []
+, ... # needed when passing an existing derivation
+}:
 stdenv.mkDerivation {
   inherit src buildInputs patches name;
   installPhase = "cp -r . $out";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index febca8418674..7e61b0103161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -450,7 +450,7 @@ in
 
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
-  srcOnly = args: callPackage ../build-support/src-only args;
+  srcOnly = callPackage ../build-support/src-only { };
 
   substituteAll = callPackage ../build-support/substitute/substitute-all.nix { };
 

From a33ce7e4fb6774dfc280b5ccd9451297804bc7c5 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Wed, 22 Apr 2020 14:40:38 +0200
Subject: [PATCH 015/183] spike: add test to nixosTests

---
 nixos/tests/all-tests.nix                          | 1 +
 pkgs/applications/virtualization/spike/default.nix | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index cbfdf3ad9c20..38e8980b7482 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -287,6 +287,7 @@ in
   snapper = handleTest ./snapper.nix {};
   solr = handleTest ./solr.nix {};
   spacecookie = handleTest ./spacecookie.nix {};
+  spike = handleTest ./spike.nix {};
   sonarr = handleTest ./sonarr.nix {};
   strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
   sudo = handleTest ./sudo.nix {};
diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix
index 4dbb7fbe4a52..0f397bc272a9 100644
--- a/pkgs/applications/virtualization/spike/default.nix
+++ b/pkgs/applications/virtualization/spike/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, dtc }:
+{ stdenv, fetchgit, dtc, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "spike";
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru.tests = {
+    can-run-hello-world = nixosTests.spike;
+  };
+
   meta = with stdenv.lib; {
     description = "A RISC-V ISA Simulator";
     homepage = "https://github.com/riscv/riscv-isa-sim";

From 6a4b7e51b0fe9d1c351a60c7733771a3c4bb50e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 22 Apr 2020 23:01:16 -0300
Subject: [PATCH 016/183] xfce.xfce4-whiskermenu-plugin: 2.4.3 -> 2.4.4

---
 .../xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index 262093af69f1..0d9f6916e1cd 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-whiskermenu-plugin";
-  version = "2.4.3";
+  version = "2.4.4";
   rev-prefix = "v";
-  sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn";
+  sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw";
 
   nativeBuildInputs = [ cmake ];
 

From 41a95b1b7d88f45fb536640d8d8d482d89e8bce1 Mon Sep 17 00:00:00 2001
From: John Axel Eriksson <john@insane.se>
Date: Wed, 22 Apr 2020 23:00:14 +0200
Subject: [PATCH 017/183] The systemd unit for k3s should differ between agents
 and servers

---
 nixos/modules/services/cluster/k3s/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix
index ccdf54d128e2..2e8bf20a68fc 100644
--- a/nixos/modules/services/cluster/k3s/default.nix
+++ b/nixos/modules/services/cluster/k3s/default.nix
@@ -81,8 +81,8 @@ in
       after = mkIf cfg.docker [ "docker.service" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        # Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2
-        Type = "notify";
+        # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
+        Type = if cfg.role == "agent" then "exec" else "notify";
         KillMode = "process";
         Delegate = "yes";
         Restart = "always";

From a4adb1f75b5ee41e8efcf0e2401aaee0aadbc4b9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Apr 2020 18:00:47 +0200
Subject: [PATCH 018/183] =?UTF-8?q?coqPackages.equations:=201.2=20?=
 =?UTF-8?q?=E2=86=92=201.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coq-modules/equations/default.nix          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index c1177dc9789f..060fa3b4c81e 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -21,15 +21,21 @@ let
     };
 
     "8.9" = {
-      version = "1.2";
-      rev = "v1.2-8.9";
-      sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj";
+      version = "1.2.1";
+      rev = "v1.2.1-8.9";
+      sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij";
     };
 
     "8.10" = {
-      version = "1.2";
-      rev = "v1.2-8.10";
-      sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd";
+      version = "1.2.1";
+      rev = "v1.2.1-8.10-2";
+      sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68";
+    };
+
+    "8.11" = {
+      version = "1.2.1";
+      rev = "v1.2.1-8.11";
+      sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17";
     };
   };
   param = params.${coq.coq-version};

From 59cea9da66cb3672fc1bcb2ad66329e6df2fb723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 23 Apr 2020 15:34:41 -0300
Subject: [PATCH 019/183] xfce.xfce4-whiskermenu-plugin: fix gettext path in
 script

---
 .../panel-plugins/xfce4-whiskermenu-plugin/default.nix   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index 0d9f6916e1cd..859a580bb70b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
 
 mkXfceDerivation {
   category = "panel-plugins";
@@ -9,7 +9,12 @@ mkXfceDerivation {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ];
+  buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+  postPatch = ''
+    substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \
+      --replace gettext ${gettext}/bin/gettext
+  '';
 
   postInstall = ''
     substituteInPlace $out/bin/xfce4-popup-whiskermenu \

From 2d8ee2676c43dc46656deea84148b17f182b97a0 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Fri, 24 Apr 2020 11:11:23 -0600
Subject: [PATCH 020/183] tut: 0.0.2 -> 0.0.7

---
 pkgs/applications/misc/tut/default.nix |  4 +-
 pkgs/applications/misc/tut/deps.nix    | 69 +++++++++++++++++++++-----
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix
index 586766e5456c..e9b09d68da60 100644
--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "tut";
-  version = "0.0.2";
+  version = "0.0.7";
 
   goPackagePath = "github.com/RasmusLindroth/tut";
   goDeps = ./deps.nix;
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "RasmusLindroth";
     repo = pname;
     rev = version;
-    sha256 = "0c44mgkmjnfpf06cj63i6mscxcsm5cipm0l4n6pjxhc7k3qhgsfw";
+    sha256 = "1v1cvdsrxz1yj2vibx3iapw17ngfihjkr62zhxsn1msb77xyd7lb";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/tut/deps.nix b/pkgs/applications/misc/tut/deps.nix
index 89453f121a9e..9264153e5030 100644
--- a/pkgs/applications/misc/tut/deps.nix
+++ b/pkgs/applications/misc/tut/deps.nix
@@ -72,6 +72,15 @@
       sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r";
     };
   }
+  {
+    goPackagePath = "github.com/gopherjs/gopherjs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/gopherjs";
+      rev = "0766667cb4d1";
+      sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+    };
+  }
   {
     goPackagePath = "github.com/gorilla/websocket";
     fetch = {
@@ -81,6 +90,15 @@
       sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv";
     };
   }
+  {
+    goPackagePath = "github.com/jtolds/gls";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jtolds/gls";
+      rev = "v4.20.0";
+      sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
+    };
+  }
   {
     goPackagePath = "github.com/kyoh86/xdg";
     fetch = {
@@ -158,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "v1.6.0";
-      sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
+      rev = "v1.7.0";
+      sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla";
     };
   }
   {
@@ -167,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/rivo/tview";
-      rev = "cd38d7432498";
-      sha256 = "1rs048gf1jip0p20qir99vy5k0f3m54h7bh56l1sh8lxij5qj406";
+      rev = "ca37f83cb2e7";
+      sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021";
     };
   }
   {
@@ -180,6 +198,24 @@
       sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5";
     };
   }
+  {
+    goPackagePath = "github.com/smartystreets/assertions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/assertions";
+      rev = "b2de0cb4f26d";
+      sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/goconvey";
+      rev = "v1.6.4";
+      sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
+    };
+  }
   {
     goPackagePath = "github.com/tomnomnom/linkheader";
     fetch = {
@@ -212,8 +248,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "118fecf932d8";
-      sha256 = "1rwrqfwh2yhnnhy7x0mbmlmk0rg1mi2jjad476y45i259a0c2ym6";
+      rev = "d3edc9973b7e";
+      sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7";
     };
   }
   {
@@ -230,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "12a6c2dcc1e4";
-      sha256 = "0z1g49d36kh459dz0xhnss2f88vw7n5b3l3637v46f7daddvln67";
+      rev = "85ca7c5b95cd";
+      sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l";
     };
   }
   {
@@ -248,8 +284,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "90fa682c2a6e";
-      sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
+      rev = "ab21143f2384";
+      sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178";
     };
   }
   {
@@ -261,13 +297,22 @@
       sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
     };
   }
+  {
+    goPackagePath = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ini.v1";
+      rev = "v1.55.0";
+      sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j";
+    };
+  }
   {
     goPackagePath = "gopkg.in/yaml.v2";
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.4";
-      sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2";
+      rev = "v2.2.8";
+      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
     };
   }
 ]

From 07f69d4e379d02c2d814afdbde4b839c7339fe91 Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Fri, 24 Apr 2020 19:44:19 +0200
Subject: [PATCH 021/183] babashka: 0.0.78 -> 0.0.89

---
 pkgs/development/interpreters/clojure/babashka.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index db849bb542de..6d75ec17a758 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -3,17 +3,17 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "babashka";
-  version = "0.0.78";
+  version = "0.0.89";
 
   reflectionJson = fetchurl {
     name = "reflection.json";
     url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
-    sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf";
+    sha256 = "0bc5rbizd2lg7qfh733yiip8m9zqrwgjf5ca09sdibxp7nhhsjby";
   };
 
   src = fetchurl {
     url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if";
+    sha256 = "11jhqbm3svvikr9glz8wwps1267y25g3384ijw6avn267s7d7l8c";
   };
 
   dontUnpack = true;
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
       --no-fallback \
       --no-server \
       --report-unsupported-elements-at-runtime \
+      "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \
       "-J-Xmx3g"
   '';
 

From a7f59a59469ffc4644db48bd12eade410501f9aa Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Wed, 22 Apr 2020 00:07:41 +0200
Subject: [PATCH 022/183] babashka: utf8 + nativeBuildinputs fix

utf8: see borkdude/babashka/issues/359
nativeBuildinputs: this PR's review
---
 pkgs/development/interpreters/clojure/babashka.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index 6d75ec17a758..7f94a0695d4e 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, graalvm8 }:
+{ stdenv, fetchurl, graalvm8, glibcLocales }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
 
   dontUnpack = true;
 
-  buildInputs = [ graalvm8 ];
+  LC_ALL = "en_US.UTF-8";
+  nativeBuildInputs = [ graalvm8 glibcLocales ];
 
   buildPhase = ''
     native-image \

From 5ae928e18fe5b4093d96c6c4bf006ff2eb05109e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 24 Apr 2020 19:57:31 +0200
Subject: [PATCH 023/183] lapack: fix darwin library identifiers

The build system already sets these properly to the absolute path so no
need to patch the libraries on darwin.

    $ otool -D result/lib/liblapacke.dylib
    result/lib/liblapacke.dylib:
    /nix/store/k88gy5s765yn3dc5ws3jbykyvklm7z96-openblas-0.3.8/lib/libopenblasp-r0.3.8.dylib

Fixes #85713
---
 pkgs/build-support/alternatives/lapack/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix
index 5a19916f83e4..98b458b778a7 100644
--- a/pkgs/build-support/alternatives/lapack/default.nix
+++ b/pkgs/build-support/alternatives/lapack/default.nix
@@ -54,10 +54,6 @@ stdenv.mkDerivation {
 '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
   patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension}
   patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension}
-'' else if stdenv.hostPlatform.isDarwin then ''
-  install_name_tool -id liblapack${canonicalExtension} \
-                    -add_rpath ${lib.getLib lapackProvider}/lib \
-                    $out/lib/liblapack${canonicalExtension}
 '' else "") + ''
 
   if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then
@@ -87,10 +83,6 @@ EOF
 '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then ''
   patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension}
   patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension}
-'' else if stdenv.hostPlatform.isDarwin then ''
-  install_name_tool -id liblapacke${canonicalExtension} \
-                    -add_rpath ${lib.getLib lapackProvider}/lib \
-                    $out/lib/liblapacke${canonicalExtension}
 '' else "") + ''
 
   if [ -f "$out/lib/liblapacke.so.3" ]; then

From ea59fe7aa6d966d9c9d47da39823642f9e7b7074 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Apr 2020 22:03:30 +0200
Subject: [PATCH 024/183] neomutt: 20200417 -> 20200424

https://github.com/neomutt/neomutt/releases/tag/20200424
---
 .../networking/mailreaders/neomutt/default.nix  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 612af14b87f4..73aef9d17c77 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,29 +1,20 @@
 { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
 , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
 , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
-, fetchpatch
+, glibcLocales
 }:
 
 stdenv.mkDerivation rec {
-  version = "20200417";
+  version = "20200424";
   pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = version;
-    sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5";
+    sha256 = "055hxlfrpn5a50vnh31faskcdkcjyzzr02gj5x2dizpf7vd67162";
   };
 
-  patches = [
-    # Remove on next release. Fixes the `change-folder`
-    # macro (https://github.com/neomutt/neomutt/issues/2268)
-    (fetchpatch {
-      url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch";
-      sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv";
-    })
-  ];
-
   buildInputs = [
     cyrus_sasl gss gpgme kerberos libidn ncurses
     notmuch openssl perl lmdb
@@ -95,8 +86,10 @@ stdenv.mkDerivation rec {
     (cd test-files && ./setup.sh)
 
     export NEOMUTT_TEST_DIR=$(pwd)/test-files
+    export LC_ALL="en_US.UTF-8"
   '';
 
+  checkInputs = [ glibcLocales ];
   checkTarget = "test";
   postCheck = "unset NEOMUTT_TEST_DIR";
 

From fc9ae0457543557828757667072c2576c28a798a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 24 Apr 2020 17:51:40 -0400
Subject: [PATCH 025/183] gnome3.mutter334: 3.34.4 -> 3.34.5, backports

Backports gnome-3-34 patches as well
---
 pkgs/desktops/gnome-3/core/mutter/3.34/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
index 51d3c4115d9c..876969878506 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
@@ -43,13 +43,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.34.4";
+  version = "3.34.5";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01";
+    sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi";
   };
 
   mesonFlags = [
@@ -111,6 +111,13 @@ stdenv.mkDerivation rec {
       sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
     })
 
+    # gnome-3-34 2020-04-24
+    # also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html
+    (fetchpatch {
+      url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch";
+      sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi";
+    })
+
     # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
     # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
     ./drop-inheritable.patch

From 9a66afc5d0620aff2f68a5608058f7972eea7ced Mon Sep 17 00:00:00 2001
From: peelz <LouisTakePILLz@users.noreply.github.com>
Date: Fri, 24 Apr 2020 19:25:48 -0400
Subject: [PATCH 026/183] obs-v4l2sink: add peelz to maintainers

---
 pkgs/applications/video/obs-studio/v4l2sink.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix
index 19cfbf14076e..1a1a48f11edc 100644
--- a/pkgs/applications/video/obs-studio/v4l2sink.nix
+++ b/pkgs/applications/video/obs-studio/v4l2sink.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "obs studio output plugin for Video4Linux2 device";
     homepage = "https://github.com/CatxFish/obs-v4l2sink";
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with maintainers; [ colemickens peelz ];
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" ];
   };

From 35ee9b6d94991ea06afffb1195cddbc437593b40 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 24 Apr 2020 20:13:43 -0400
Subject: [PATCH 027/183] aspell, tla: use pname

---
 .../version-management/arch/default.nix             | 13 +++++++------
 pkgs/development/libraries/aspell/default.nix       |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix
index d41040f49a06..c161d8446acf 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/pkgs/applications/version-management/arch/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, which, diffutils, gnupatch, gnutar }:
 
 stdenv.mkDerivation rec {
-  name = "tla-1.3.5";
-  
+  pname = "tla";
+  version = "1.3.5";
+
   src = fetchurl {
-    url = "https://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz";
+    url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz";
     sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
   };
 
   patches = [ ./configure-tmpdir.patch ];
 
-  buildInputs = [which];
-  
-  propagatedBuildInputs = [diffutils gnupatch gnutar];
+  buildInputs = [ which ];
+
+  propagatedBuildInputs = [ diffutils gnupatch gnutar ];
 
   # Instead of GNU Autoconf, tla uses Tom Lord's now
   # defunct `package-framework'.
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 91fd83bf9165..68faef7e7862 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -15,10 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "aspell-0.60.8";
+  pname = "aspell";
+  version = "0.60.8";
 
   src = fetchurl {
-    url = "mirror://gnu/aspell/${name}.tar.gz";
+    url = "mirror://gnu/aspell/aspell-${version}.tar.gz";
     sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
   };
 

From de9866e38cdf0b7d59e2ba2d7239533b8a2d85c1 Mon Sep 17 00:00:00 2001
From: Renato Florentino Garcia <fgarcia.renato@gmail.com>
Date: Fri, 24 Apr 2020 22:21:36 -0300
Subject: [PATCH 028/183] asttokens: 1.1.13 -> 2.0.4

---
 .../python-modules/asttokens/default.nix      | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix
index c6e4f3752ef9..0f090d14abad 100644
--- a/pkgs/development/python-modules/asttokens/default.nix
+++ b/pkgs/development/python-modules/asttokens/default.nix
@@ -1,27 +1,19 @@
-{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage
-, lazy-object-proxy, nose, wrapt
+{ lib, fetchPypi, buildPythonPackage,
+  setuptools_scm, toml, six, astroid, pytest
 }:
 
 buildPythonPackage rec {
   pname = "asttokens";
-  version = "1.1.13";
+  version = "2.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m";
+    sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4";
   };
 
-  patches = [
-    # Fix tests for astroid 2.2 in python 3. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch";
-      sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv";
-    })
-  ];
+  propagatedBuildInputs = [ setuptools_scm toml six astroid ];
 
-  propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ];
-
-  checkInputs = [ coverage nose ];
+  checkInputs = [ pytest ];
 
   meta = with lib; {
     homepage = "https://github.com/gristlabs/asttokens";

From 71171b3225a7cf4073a9519852791eb4c94e7ff0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Apr 2020 18:50:27 +0200
Subject: [PATCH 029/183] Python tests: test venv from a nix env with Python
 3.8

This test was disabled because it did not function yet, however,
apparently it does with 3.8.
---
 pkgs/development/interpreters/python/tests.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index 55065c45d576..f2fb6b95c37d 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -38,17 +38,18 @@ let
       is_nixenv = "False";
     };
 
+  } // lib.optionalAttrs (python.pythonAtLeast "3.8") {
     # Venv built using Python Nix environment (python.buildEnv)
     # TODO: Cannot create venv from a  nix env
     # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
-    # nixenv-venv = rec {
-    #   env = runCommand "${python.name}-venv" {} ''
-    #     ${pythonEnv.interpreter} -m venv $out
-    #   '';
-    #   interpreter = "${env}/bin/${pythonEnv.executable}";
-    #   is_venv = "True";
-    #   is_nixenv = "True";
-    # };
+    nixenv-venv = rec {
+      env = runCommand "${python.name}-venv" {} ''
+        ${pythonEnv.interpreter} -m venv $out
+      '';
+      interpreter = "${env}/bin/${pythonEnv.executable}";
+      is_venv = "True";
+      is_nixenv = "True";
+    };
   };
 
   # All PyPy package builds are broken at the moment

From 6f873e98f4405b6085f67e2baad67d925cd2a23b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Apr 2020 18:51:16 +0200
Subject: [PATCH 030/183] Python integration tests: disable for older python 3
 versions

because the package that is used as part of the test does not support
older versions.
---
 pkgs/development/interpreters/python/tests.nix                | 2 +-
 .../python/tests/test_nix_pythonprefix/typeddep/default.nix   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
index f2fb6b95c37d..f7ec06ce4ff7 100644
--- a/pkgs/development/interpreters/python/tests.nix
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -53,7 +53,7 @@ let
   };
 
   # All PyPy package builds are broken at the moment
-  integrationTests = lib.optionalAttrs (python.isPy3k  && (!python.isPyPy)) rec {
+  integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7"  && (!python.isPyPy)) rec {
     # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
     nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix {
       interpreter = python;
diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix
index 06219a69fcaf..8d330fcdbfc9 100644
--- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix
+++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage }:
+{ buildPythonPackage, pythonOlder }:
 
 
 buildPythonPackage {
@@ -8,4 +8,6 @@ buildPythonPackage {
 
   src = ./.;
 
+  disabled = pythonOlder "3.7";
+
 }

From 93a9ac696bad1b3afe072af85ae595686a5b7408 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 21 Apr 2020 10:51:15 +0200
Subject: [PATCH 031/183] playonlinux: fix build

---
 .../applications/misc/playonlinux/default.nix | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index fe9838fe0d97..e3b7c48d2b4b 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -9,7 +9,7 @@
 , imagemagick
 , netcat-gnu
 , p7zip
-, python2Packages
+, python2
 , unzip
 , wget
 , wine
@@ -27,25 +27,25 @@
 let
   version = "4.3.4";
 
-  binpath = stdenv.lib.makeBinPath
-    [ cabextract
-      python2Packages.python
-      gettext
-      glxinfo
-      gnupg
-      icoutils
-      imagemagick
-      netcat-gnu
-      p7zip
-      unzip
-      wget
-      wine
-      xdg-user-dirs
-      xterm
-      which
-      curl
-      jq
-    ];
+  binpath = stdenv.lib.makeBinPath [ 
+    cabextract
+    python
+    gettext
+    glxinfo
+    gnupg
+    icoutils
+    imagemagick
+    netcat-gnu
+    p7zip
+    unzip
+    wget
+    wine
+    xdg-user-dirs
+    xterm
+    which
+    curl
+    jq
+  ];
 
   ld32 =
     if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
@@ -54,6 +54,11 @@ let
   ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
   libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
 
+  python = python2.withPackages(ps: with ps; [
+    wxPython
+    setuptools
+  ]);
+
 in stdenv.mkDerivation {
   pname = "playonlinux";
   inherit version;
@@ -65,15 +70,13 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs =
-    [ python2Packages.python
-      python2Packages.wxPython
-      python2Packages.setuptools
-      xorg.libX11
-      libGL
-    ];
+  buildInputs = [ 
+    xorg.libX11
+    libGL
+    python
+  ];
 
-  patchPhase = ''
+  postPatch = ''
     patchShebangs python tests/python
     sed -i "s/ %F//g" etc/PlayOnLinux.desktop
   '';
@@ -85,7 +88,6 @@ in stdenv.mkDerivation {
     install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
 
     makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \
-      --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
       --prefix PATH : ${binpath}
 
     bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2

From bc8e1f3ad5fe633a3ca33550a35d99806db1e8d3 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sat, 25 Apr 2020 08:23:41 +0200
Subject: [PATCH 032/183] pipewire: patch for SIGILL in fmt-ops

Hydra run tests are failing with SIGILL, see [1] , import the upstream
patch to fix the issue. Presumably not all hydra runners have the same
instruction extensions, this should fix the tests on those without AVX2.

[1]: https://hydra.nixos.org/build/117012754
---
 pkgs/development/libraries/pipewire/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 197282c5ac11..d873555c0fa4 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitLab
+, fetchpatch
 , meson
 , ninja
 , pkgconfig
@@ -72,6 +73,13 @@ stdenv.mkDerivation rec {
     vulkan-loader
     xorg.libX11
   ];
+  patches = [
+      # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch";
+        sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x";
+      })
+  ];
 
   mesonFlags = [
     "-Ddocs=true"

From 79e6d13a4adae7e82595b89e5149b002ab2bf16e Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Tue, 14 Apr 2020 11:39:02 +0200
Subject: [PATCH 033/183] ocamlPackages.cow: 2.2.0 -> 2.4.0

---
 .../development/ocaml-modules/cow/default.nix | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index 2a4d7004faa0..787854f8e416 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -1,30 +1,29 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib
-, ocamlbuild, topkg
+{ lib, fetchurl, buildDunePackage, alcotest
 , uri, xmlm, omd, ezjsonm }:
 
-stdenv.mkDerivation rec {
-  version = "2.2.0";
-  pname = "ocaml-cow";
+buildDunePackage rec {
+  minimumOCamlVersion = "4.02.3";
 
-  src = fetchFromGitHub {
-    owner  = "mirage";
-    repo   = "ocaml-cow";
-    rev    = "v${version}";
-    sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2";
+  version = "2.4.0";
+  pname = "cow";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-cow/releases/download/v${version}/cow-v${version}.tbz";
+    sha256 = "1x77lwpskda4zyikwxh500xjn90pgdwz6jm7ca7f36pyav4vl6zx";
   };
 
-  buildInputs = [ ocaml ocamlbuild findlib topkg ];
   propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
+  checkInputs = [ alcotest ];
+  doCheck = true;
 
-  inherit (topkg) buildPhase installPhase;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Caml on the Web";
     longDescription = ''
-      Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code.
+      Writing web-applications requires a lot of skills: HTML, XML, JSON and
+      Markdown, to name but a few! This library provides OCaml combinators
+      for these web formats.
     '';
     license = licenses.isc;
     maintainers = [ maintainers.sternenseemann ];
-    inherit (ocaml.meta) platforms;
   };
 }

From 05db4f4fb9ba55662783bae84f7d936326141f30 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Apr 2020 09:46:24 +0200
Subject: [PATCH 034/183] ocamlPackages.async_shell: remove at 109.28.03

This is a legacy version for OCaml 4.02
---
 .../ocaml-modules/async_shell/default.nix     | 22 -------------------
 pkgs/top-level/ocaml-packages.nix             |  5 -----
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/async_shell/default.nix

diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix
deleted file mode 100644
index 62b64a492d6f..000000000000
--- a/pkgs/development/ocaml-modules/async_shell/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}:
-
-buildOcaml rec {
-  name = "async_shell";
-  version = "109.28.03";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchurl {
-    url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz";
-    sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
-  };
-
-  propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/async_shell";
-    description = "Shell helpers for Async";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3cbb0a7df33f..68e8c97825a6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -45,11 +45,6 @@ let
 
     async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
 
-    async_shell =
-      if lib.versionOlder "4.03" ocaml.version
-      then janeStreet.async_shell
-      else callPackage ../development/ocaml-modules/async_shell { };
-
     async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
 
     async_p4 =

From 6478e659da101280347734f645cc6248aa2100bc Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 25 Apr 2020 03:51:28 -0400
Subject: [PATCH 035/183] httplz: 1.8.0 -> 1.9.2

---
 pkgs/tools/networking/httplz/cargo-lock.patch | 862 +++++++++---------
 pkgs/tools/networking/httplz/default.nix      |   6 +-
 2 files changed, 437 insertions(+), 431 deletions(-)

diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch
index 5ded54799a78..293d65f7a238 100644
--- a/pkgs/tools/networking/httplz/cargo-lock.patch
+++ b/pkgs/tools/networking/httplz/cargo-lock.patch
@@ -1,1269 +1,1275 @@
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..4b798fc
+index 0000000..722bfbd
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,1263 @@
+@@ -0,0 +1,1269 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +[[package]]
 +name = "adler32"
 +version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 +
 +[[package]]
 +name = "aho-corasick"
-+version = "0.7.6"
++version = "0.7.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 +dependencies = [
-+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr",
 +]
 +
 +[[package]]
 +name = "ansi_term"
 +version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 +dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "antidote"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
 +
 +[[package]]
 +name = "atty"
 +version = "0.2.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 +dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi",
++ "libc",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "autocfg"
 +version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 +
 +[[package]]
 +name = "autocfg"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 +
 +[[package]]
 +name = "base64"
 +version = "0.9.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 +dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "safemem",
 +]
 +
 +[[package]]
 +name = "base64"
 +version = "0.10.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 +dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
 +]
 +
 +[[package]]
 +name = "bitflags"
 +version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "bitstring"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d"
 +
 +[[package]]
 +name = "brotli-sys"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 +dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
 +]
 +
 +[[package]]
 +name = "brotli2"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 +dependencies = [
-+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "brotli-sys",
++ "libc",
 +]
 +
 +[[package]]
 +name = "byteorder"
-+version = "1.3.2"
++version = "1.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 +
 +[[package]]
 +name = "bzip2"
 +version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
 +dependencies = [
-+ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bzip2-sys",
++ "libc",
 +]
 +
 +[[package]]
 +name = "bzip2-sys"
-+version = "0.1.7"
++version = "0.1.8+1.0.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05305b41c5034ff0e93937ac64133d109b5a2660114ec45e9760bc6816d83038"
 +dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "c2-chacha"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
 +]
 +
 +[[package]]
 +name = "cc"
-+version = "1.0.50"
++version = "1.0.52"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d"
 +
 +[[package]]
 +name = "cfg-if"
 +version = "0.1.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cidr"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2da1cf0f275bb8dc1867a7f40cdb3b746951db73a183048e6e37fa89ed81bd01"
++dependencies = [
++ "bitstring",
++]
 +
 +[[package]]
 +name = "clap"
 +version = "2.33.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 +dependencies = [
-+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ansi_term",
++ "atty",
++ "bitflags",
++ "strsim",
++ "textwrap",
++ "unicode-width",
++ "vec_map",
 +]
 +
 +[[package]]
 +name = "cloudabi"
 +version = "0.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 +dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
 +]
 +
 +[[package]]
 +name = "core-foundation"
-+version = "0.6.4"
++version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 +dependencies = [
-+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "core-foundation-sys",
++ "libc",
 +]
 +
 +[[package]]
 +name = "core-foundation-sys"
-+version = "0.6.2"
++version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 +
 +[[package]]
 +name = "crc32fast"
 +version = "1.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
 +]
 +
 +[[package]]
 +name = "ctrlc"
-+version = "3.1.3"
++version = "3.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7"
 +dependencies = [
-+ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nix",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "dtoa"
-+version = "0.4.4"
++version = "0.4.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3"
 +
 +[[package]]
 +name = "either"
 +version = "1.5.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 +
 +[[package]]
 +name = "embed-resource"
-+version = "1.3.1"
++version = "1.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d"
 +dependencies = [
-+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vswhom",
++ "winreg",
 +]
 +
 +[[package]]
 +name = "flate2"
-+version = "1.0.13"
++version = "1.0.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "crc32fast",
++ "libc",
++ "miniz_oxide",
 +]
 +
 +[[package]]
 +name = "foreign-types"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 +dependencies = [
-+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "foreign-types-shared",
 +]
 +
 +[[package]]
 +name = "foreign-types-shared"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 +
 +[[package]]
 +name = "fuchsia-cprng"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 +
 +[[package]]
 +name = "gcc"
 +version = "0.3.55"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 +
 +[[package]]
 +name = "getrandom"
 +version = "0.1.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "libc",
++ "wasi",
 +]
 +
 +[[package]]
 +name = "hermit-abi"
-+version = "0.1.6"
++version = "0.1.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
 +]
 +
 +[[package]]
 +name = "httparse"
 +version = "1.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 +
 +[[package]]
 +name = "https"
-+version = "1.8.0"
++version = "1.9.2"
 +dependencies = [
-+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.10.1",
++ "brotli2",
++ "bzip2",
++ "cc",
++ "cidr",
++ "clap",
++ "ctrlc",
++ "embed-resource",
++ "flate2",
++ "hyper-native-tls",
++ "iron",
++ "itertools",
++ "lazy_static",
++ "lazysort",
++ "libc",
++ "md6",
++ "mime_guess",
++ "os-str-generic",
++ "percent-encoding 2.1.0",
++ "rand 0.7.3",
++ "regex",
++ "rfsapi",
++ "serde",
++ "serde_json",
++ "tabwriter",
++ "time",
++ "trivial_colours",
++ "unicase 2.6.0",
++ "walkdir",
++ "winapi",
++ "xml-rs",
 +]
 +
 +[[package]]
 +name = "hyper"
 +version = "0.10.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
 +dependencies = [
-+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.9.3",
++ "httparse",
++ "language-tags",
++ "log 0.3.9",
++ "mime",
++ "num_cpus",
++ "time",
++ "traitobject",
++ "typeable",
++ "unicase 1.4.2",
++ "url",
 +]
 +
 +[[package]]
 +name = "hyper-native-tls"
 +version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068"
 +dependencies = [
-+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "antidote",
++ "hyper",
++ "native-tls",
 +]
 +
 +[[package]]
 +name = "idna"
 +version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 +dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
 +]
 +
 +[[package]]
 +name = "iron"
 +version = "0.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8"
 +dependencies = [
-+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hyper",
++ "hyper-native-tls",
++ "log 0.3.9",
++ "mime_guess",
++ "modifier",
++ "num_cpus",
++ "plugin",
++ "typemap",
++ "url",
 +]
 +
 +[[package]]
 +name = "itertools"
 +version = "0.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
 +dependencies = [
-+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "either",
 +]
 +
 +[[package]]
 +name = "itoa"
 +version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
 +
 +[[package]]
 +name = "language-tags"
 +version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 +
 +[[package]]
 +name = "lazy_static"
 +version = "1.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 +
 +[[package]]
 +name = "lazysort"
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.66"
++version = "0.2.69"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
 +
 +[[package]]
 +name = "log"
 +version = "0.3.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 +dependencies = [
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8",
 +]
 +
 +[[package]]
 +name = "log"
 +version = "0.4.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
 +]
 +
 +[[package]]
 +name = "matches"
 +version = "0.1.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 +
 +[[package]]
 +name = "md6"
-+version = "2.0.0"
++version = "2.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "21baf112ff708069b0d0544843236583c9c18675cc1af78ba4ace0f60f63fb31"
 +dependencies = [
-+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gcc",
++ "libc",
 +]
 +
 +[[package]]
 +name = "memchr"
-+version = "2.3.0"
++version = "2.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 +
 +[[package]]
 +name = "mime"
 +version = "0.2.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 +dependencies = [
-+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.3.9",
 +]
 +
 +[[package]]
 +name = "mime_guess"
-+version = "1.8.7"
++version = "1.8.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3"
 +dependencies = [
-+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mime",
++ "phf",
++ "phf_codegen",
++ "unicase 1.4.2",
 +]
 +
 +[[package]]
 +name = "miniz_oxide"
-+version = "0.3.5"
++version = "0.3.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
 +dependencies = [
-+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "adler32",
 +]
 +
 +[[package]]
 +name = "modifier"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
 +
 +[[package]]
 +name = "native-tls"
-+version = "0.2.3"
++version = "0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
++ "libc",
++ "log 0.4.8",
++ "openssl",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "security-framework",
++ "security-framework-sys",
++ "tempfile",
 +]
 +
 +[[package]]
 +name = "nix"
-+version = "0.14.1"
++version = "0.17.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
 +dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "cc",
++ "cfg-if",
++ "libc",
++ "void",
 +]
 +
 +[[package]]
 +name = "num-traits"
 +version = "0.1.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 +dependencies = [
-+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11",
 +]
 +
 +[[package]]
 +name = "num-traits"
 +version = "0.2.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 +dependencies = [
-+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
 +]
 +
 +[[package]]
 +name = "num_cpus"
-+version = "1.12.0"
++version = "1.13.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
 +dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi",
++ "libc",
 +]
 +
 +[[package]]
 +name = "openssl"
-+version = "0.10.26"
++version = "0.10.29"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
 +dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "cfg-if",
++ "foreign-types",
++ "lazy_static",
++ "libc",
++ "openssl-sys",
 +]
 +
 +[[package]]
 +name = "openssl-probe"
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 +
 +[[package]]
 +name = "openssl-sys"
-+version = "0.9.53"
++version = "0.9.55"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
 +]
 +
 +[[package]]
 +name = "os-str-generic"
 +version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e"
 +
 +[[package]]
 +name = "percent-encoding"
 +version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 +
 +[[package]]
 +name = "percent-encoding"
 +version = "2.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 +
 +[[package]]
 +name = "phf"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 +dependencies = [
-+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "phf_shared",
 +]
 +
 +[[package]]
 +name = "phf_codegen"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 +dependencies = [
-+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "phf_generator",
++ "phf_shared",
 +]
 +
 +[[package]]
 +name = "phf_generator"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 +dependencies = [
-+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "phf_shared",
++ "rand 0.6.5",
 +]
 +
 +[[package]]
 +name = "phf_shared"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 +dependencies = [
-+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "siphasher",
++ "unicase 1.4.2",
 +]
 +
 +[[package]]
 +name = "pkg-config"
 +version = "0.3.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 +
 +[[package]]
 +name = "plugin"
 +version = "0.2.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
 +dependencies = [
-+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "typemap",
 +]
 +
 +[[package]]
 +name = "ppv-lite86"
 +version = "0.2.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 +
 +[[package]]
 +name = "quote"
 +version = "0.3.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 +
 +[[package]]
 +name = "rand"
 +version = "0.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "libc",
++ "rand_chacha 0.1.1",
++ "rand_core 0.4.2",
++ "rand_hc 0.1.0",
++ "rand_isaac",
++ "rand_jitter",
++ "rand_os",
++ "rand_pcg",
++ "rand_xorshift",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand"
 +version = "0.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 +dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom",
++ "libc",
++ "rand_chacha 0.2.2",
++ "rand_core 0.5.1",
++ "rand_hc 0.2.0",
 +]
 +
 +[[package]]
 +name = "rand_chacha"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rand_chacha"
-+version = "0.2.1"
++version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 +dependencies = [
-+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86",
++ "rand_core 0.5.1",
 +]
 +
 +[[package]]
 +name = "rand_core"
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 +dependencies = [
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2",
 +]
 +
 +[[package]]
 +name = "rand_core"
 +version = "0.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 +
 +[[package]]
 +name = "rand_core"
 +version = "0.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 +dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom",
 +]
 +
 +[[package]]
 +name = "rand_hc"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rand_hc"
 +version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 +dependencies = [
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1",
 +]
 +
 +[[package]]
 +name = "rand_isaac"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rand_jitter"
 +version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "rand_core 0.4.2",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand_os"
 +version = "0.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 +dependencies = [
-+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.4.2",
++ "rdrand",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand_pcg"
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "rand_core 0.4.2",
 +]
 +
 +[[package]]
 +name = "rand_xorshift"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rdrand"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "redox_syscall"
 +version = "0.1.56"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 +
 +[[package]]
 +name = "regex"
-+version = "1.3.3"
++version = "1.3.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
 +dependencies = [
-+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
 +]
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.6.13"
++version = "0.6.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
 +
 +[[package]]
 +name = "remove_dir_all"
 +version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 +dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rfsapi"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49"
 +dependencies = [
-+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hyper",
++ "mime",
++ "serde",
++ "serde_derive",
++ "time",
 +]
 +
 +[[package]]
 +name = "safemem"
 +version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 +
 +[[package]]
 +name = "same-file"
 +version = "1.0.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 +dependencies = [
-+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util",
 +]
 +
 +[[package]]
 +name = "schannel"
-+version = "0.1.16"
++version = "0.1.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "security-framework"
-+version = "0.3.4"
++version = "0.4.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620"
 +dependencies = [
-+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "core-foundation",
++ "core-foundation-sys",
++ "libc",
++ "security-framework-sys",
 +]
 +
 +[[package]]
 +name = "security-framework-sys"
-+version = "0.3.3"
++version = "0.4.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
 +dependencies = [
-+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "core-foundation-sys",
++ "libc",
 +]
 +
 +[[package]]
 +name = "serde"
 +version = "0.9.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
 +
 +[[package]]
 +name = "serde_codegen_internals"
 +version = "0.14.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
 +dependencies = [
-+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn",
 +]
 +
 +[[package]]
 +name = "serde_derive"
 +version = "0.9.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
 +dependencies = [
-+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote",
++ "serde_codegen_internals",
++ "syn",
 +]
 +
 +[[package]]
 +name = "serde_json"
 +version = "0.9.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
 +dependencies = [
-+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dtoa",
++ "itoa",
++ "num-traits 0.1.43",
++ "serde",
 +]
 +
 +[[package]]
 +name = "siphasher"
 +version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 +
 +[[package]]
 +name = "smallvec"
-+version = "1.1.0"
++version = "1.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
 +
 +[[package]]
 +name = "strsim"
 +version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 +
 +[[package]]
 +name = "syn"
 +version = "0.11.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 +dependencies = [
-+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote",
++ "synom",
++ "unicode-xid",
 +]
 +
 +[[package]]
 +name = "synom"
 +version = "0.11.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
 +dependencies = [
-+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid",
 +]
 +
 +[[package]]
 +name = "tabwriter"
 +version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111"
 +dependencies = [
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width",
 +]
 +
 +[[package]]
 +name = "tempfile"
 +version = "3.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "libc",
++ "rand 0.7.3",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "textwrap"
 +version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 +dependencies = [
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width",
 +]
 +
 +[[package]]
 +name = "thread_local"
 +version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
 +]
 +
 +[[package]]
 +name = "time"
-+version = "0.1.42"
++version = "0.1.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "traitobject"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 +
 +[[package]]
 +name = "trivial_colours"
 +version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458"
 +
 +[[package]]
 +name = "typeable"
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
 +
 +[[package]]
 +name = "typemap"
 +version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
 +dependencies = [
-+ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unsafe-any",
 +]
 +
 +[[package]]
 +name = "unicase"
 +version = "1.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 +dependencies = [
-+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check 0.1.5",
 +]
 +
 +[[package]]
 +name = "unicase"
 +version = "2.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 +dependencies = [
-+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check 0.9.1",
 +]
 +
 +[[package]]
 +name = "unicode-bidi"
 +version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 +dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
 +]
 +
 +[[package]]
 +name = "unicode-normalization"
 +version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 +dependencies = [
-+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec",
 +]
 +
 +[[package]]
 +name = "unicode-width"
 +version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 +
 +[[package]]
 +name = "unicode-xid"
 +version = "0.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
 +
 +[[package]]
 +name = "unsafe-any"
 +version = "0.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
 +dependencies = [
-+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "traitobject",
 +]
 +
 +[[package]]
 +name = "url"
 +version = "1.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 +dependencies = [
-+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "idna",
++ "matches",
++ "percent-encoding 1.0.1",
 +]
 +
 +[[package]]
 +name = "vcpkg"
 +version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 +
 +[[package]]
 +name = "vec_map"
 +version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 +
 +[[package]]
 +name = "version_check"
 +version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 +
 +[[package]]
 +name = "version_check"
 +version = "0.9.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 +
 +[[package]]
 +name = "void"
 +version = "1.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 +
 +[[package]]
 +name = "vswhom"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "vswhom-sys",
 +]
 +
 +[[package]]
 +name = "vswhom-sys"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
 +dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
 +]
 +
 +[[package]]
 +name = "walkdir"
 +version = "2.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 +dependencies = [
-+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "same-file",
++ "winapi",
++ "winapi-util",
 +]
 +
 +[[package]]
 +name = "wasi"
 +version = "0.9.0+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 +
 +[[package]]
 +name = "winapi"
 +version = "0.3.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 +dependencies = [
-+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
 +]
 +
 +[[package]]
 +name = "winapi-i686-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 +
 +[[package]]
 +name = "winapi-util"
-+version = "0.1.3"
++version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 +dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "winapi-x86_64-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 +
 +[[package]]
 +name = "winreg"
 +version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
 +dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "xml-rs"
-+version = "0.8.0"
++version = "0.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[metadata]
-+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
-+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
-+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
-+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-+"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b"
-+"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f"
-+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-+"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f"
-+"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
-+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-+"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c"
-+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
-+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
-+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-+"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-+"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068"
-+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-+"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8"
-+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c"
-+"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
-+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-+"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d"
-+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
-+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
-+"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
-+"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
-+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
-+"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
-+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
-+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
-+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
-+"checksum os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e"
-+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-+"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
-+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
-+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
-+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-+"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49"
-+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
-+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
-+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
-+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
-+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400"
-+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba"
-+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1"
-+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
-+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
-+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-+"checksum tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111"
-+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-+"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458"
-+"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
-+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
-+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
-+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
-+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
-+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-+"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
-+"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
-+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
-+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
-+"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
++checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23"
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index c4f003f884fc..bf0a5b903888 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httplz";
-  version = "1.8.0";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "thecoshman";
     repo = "http";
     rev = "v${version}";
-    sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw";
+    sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--bin httplz" ];
   cargoPatches = [ ./cargo-lock.patch ];
-  cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl";
+  cargoSha256 = "1rpwzrr9bvw375vn97y5fqhraqz35d3ani9kfflvn2758x3g8gwf";
 
   postInstall = ''
     wrapProgram $out/bin/httplz \

From b9c221ccd89026af2e5b5b92344c9a465c374d2c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Apr 2020 04:20:00 -0500
Subject: [PATCH 036/183] awsweeper: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix
index 661747c2fd0d..fda773b48cd7 100644
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/pkgs/tools/admin/awsweeper/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "awsweeper";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "cloudetc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0sbd1jgzz3rxxwgbni885zvvcznfc51imaxwv7f064290iqlbrv4";
+    sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28";
   };
 
-  modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs";
+  modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491";
 
   meta = with lib; {
     description = "A tool to clean out your AWS account";

From 69bb53604e38f233492e34e57bbde19795ca41a1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Apr 2020 04:20:00 -0500
Subject: [PATCH 037/183] cloud-nuke: 0.1.7 -> 0.1.18

---
 pkgs/development/tools/cloud-nuke/default.nix |  4 +-
 pkgs/development/tools/cloud-nuke/deps.nix    | 93 +++++++++++++++++--
 2 files changed, 89 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index f452b24cf079..6e070f3cc5f2 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "cloud-nuke";
-  version = "0.1.7";
+  version = "0.1.18";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "054z6v13x55x9l5xnixxxszj8k2wa09b5ld2wq4gm4hc273s2m4k";
+    sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1";
   };
 
   goPackagePath = "github.com/gruntwork-io/cloud-nuke";
diff --git a/pkgs/development/tools/cloud-nuke/deps.nix b/pkgs/development/tools/cloud-nuke/deps.nix
index ffd50762ee2e..c354bd985fd3 100644
--- a/pkgs/development/tools/cloud-nuke/deps.nix
+++ b/pkgs/development/tools/cloud-nuke/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev =  "180cc10e5ff368b86dee226b034af7d1672baec6";
-      sha256 = "0xphkjqhcn8zq7gali0v32kq2xpbnnw1g7r5vr5p763q2z5c436w";
+      rev =  "1f4898f67806740d2a91c9dfe9a8be8a61523eb4";
+      sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc";
     };
   }
   {
@@ -18,6 +18,15 @@
       sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
     };
   }
+  {
+    goPackagePath  = "github.com/boombuler/barcode";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boombuler/barcode";
+      rev =  "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d";
+      sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd";
+    };
+  }
   {
     goPackagePath  = "github.com/davecgh/go-spew";
     fetch = {
@@ -45,6 +54,33 @@
       sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw";
     };
   }
+  {
+    goPackagePath  = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
+      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev =  "b48cb6623c04dae64c28537143aca42d16561daf";
+      sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev =  "064e2069ce9c359c118179501254f67d7d37ba24";
+      sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
+    };
+  }
   {
     goPackagePath  = "github.com/gruntwork-io/gruntwork-cli";
     fetch = {
@@ -54,13 +90,22 @@
       sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74";
     };
   }
+  {
+    goPackagePath  = "github.com/gruntwork-io/terratest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gruntwork-io/terratest";
+      rev =  "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4";
+      sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby";
+    };
+  }
   {
     goPackagePath  = "github.com/jmespath/go-jmespath";
     fetch = {
       type = "git";
       url = "https://github.com/jmespath/go-jmespath";
-      rev =  "0b12d6b5";
-      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+      rev =  "c2b33e84";
+      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
     };
   }
   {
@@ -90,6 +135,15 @@
       sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
     };
   }
+  {
+    goPackagePath  = "github.com/pquerna/otp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pquerna/otp";
+      rev =  "43bebefda392017900e7a7b237b4c914c6a55b50";
+      sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l";
+    };
+  }
   {
     goPackagePath  = "github.com/sirupsen/logrus";
     fetch = {
@@ -104,8 +158,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev =  "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c";
-      sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl";
+      rev =  "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9";
+      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
     };
   }
   {
@@ -126,6 +180,15 @@
       sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33";
     };
   }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "ca1201d0de80cfde86cb01aea620983605dfe99b";
+      sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i";
+    };
+  }
   {
     goPackagePath  = "golang.org/x/sys";
     fetch = {
@@ -135,4 +198,22 @@
       sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz";
     };
   }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880";
+      sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "53403b58ad1b561927d19068c655246f2db79d48";
+      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
+    };
+  }
 ]
\ No newline at end of file

From ccfdcf16f40e2e01a6183b591315d4da9fe8dcdd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Apr 2020 04:20:00 -0500
Subject: [PATCH 038/183] bat: 0.14.0 -> 0.15.0

Changelog: https://github.com/sharkdp/bat/releases/tag/v0.15.0
---
 pkgs/tools/misc/bat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 201ad5ed03ff..d08a609735f2 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname   = "bat";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0wxmn3ifrgpfq44xs747qqik2p2vazdw5zi4imxqap2krha4k2ms";
+    sha256 = "07yng5bwhin7yqj1hihmxgi8w0n45nks05a8795zwsw92k373ib4";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0bs6pqrg0vdam2h2ddikmgmksqlfjljqacc52rh6p546is6jcp2s";
+  cargoSha256 = "1xqbpij6lr0bqyi0cfwgp3d4hcjhibpdc4dfm9gb39mmbgradrzf";
 
   nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
 

From 3acee227915c2f4b9aba5ecf5e6eb668ba47acee Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 24 Apr 2020 19:29:46 +0200
Subject: [PATCH 039/183] tartube: init at 2.0.016

---
 pkgs/applications/video/tartube/default.nix | 68 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/video/tartube/default.nix

diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix
new file mode 100644
index 000000000000..ae222ae05a79
--- /dev/null
+++ b/pkgs/applications/video/tartube/default.nix
@@ -0,0 +1,68 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, gdk-pixbuf
+, gobject-introspection
+, gtk3
+, libnotify
+, pango
+, python3Packages
+, wrapGAppsHook
+, youtube-dl
+, glib
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "tartube";
+  version = "2.0.016";
+
+  src = fetchFromGitHub {
+    owner = "axcore";
+    repo = "tartube";
+    rev = "v${version}";
+    sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9";
+  };
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook
+  ];
+
+  strictDeps = false;
+
+  propagatedBuildInputs = with python3Packages; [
+    moviepy
+    pygobject3
+    pyxdg
+    requests
+  ];
+
+  buildInputs = [
+    gdk-pixbuf
+    gtk3
+    glib
+    libnotify
+    pango
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share/{man/man1,applications,pixmaps}
+    cp pack/tartube.1 $out/share/man/man1
+    cp pack/tartube.desktop $out/share/applications
+    cp pack/tartube.{png,xpm} $out/share/pixmaps
+  '';
+
+  doCheck = false;
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}"
+  ];
+
+  meta = with lib; {
+    description = "A GUI front-end for youtube-dl";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mkg20001 luc65r ];
+    homepage = "https://tartube.sourceforge.io/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0562f885708..f3e9568e8a2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6870,6 +6870,8 @@ in
 
   tarsnapper = callPackage ../tools/backup/tarsnapper { };
 
+  tartube = callPackage ../applications/video/tartube { };
+
   tayga = callPackage ../tools/networking/tayga { };
 
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };

From aefb4d3dc94ccf219f01c27c856b078bbe573727 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Apr 2020 01:04:50 +0200
Subject: [PATCH 040/183] dmenu-wayland: 2020-02-28 -> 2020-04-03

---
 pkgs/applications/misc/dmenu/wayland.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
index 7b17d4847718..ca2e6f56e841 100644
--- a/pkgs/applications/misc/dmenu/wayland.nix
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dmenu-wayland-unstable";
-  version = "2020-02-28";
+  version = "2020-04-03";
 
   src = fetchFromGitHub {
     owner = "nyyManni";
     repo = "dmenu-wayland";
-    rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238";
-    sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm";
+    rev = "550a7c39f3f925b803d51c616609c8cb6c0ea543";
+    sha256 = "0az3w1csn4x6mjyacg6lf70kykdfqamic3hbr57mj83i5jjv0jlv";
   };
 
   outputs = [ "out" "man" ];

From a194de9a9d36fdbe5da26f622968afe3c9878e9e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Apr 2020 01:26:01 +0200
Subject: [PATCH 041/183] diffoscope: 138 -> 142

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

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 0ce0e1be3256..02d9c504070b 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,13 +9,15 @@
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "138";
+  version = "142";
 
   src = fetchurl {
     url    = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997";
+    sha256 = "0c6lvppghw9ynjg2radr8z3fc6lpgmgwr6kxyih7q4rxqf4gfv6i";
   };
 
+  outputs = [ "out" "man" ];
+
   patches = [
     ./ignore_links.patch
   ];

From 74fcd4f2d61c0d93bb59ed1b1e12c60f7a530969 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Apr 2020 12:12:54 +0200
Subject: [PATCH 042/183] ell: 0.30 -> 0.31

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

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 69c1f8de2ea9..cb971d452d61 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.30";
+  version = "0.31";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
      url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
      rev = version;
-     sha256 = "0kiglgc02a6hqi1nhnl4d8lxax8b1fljp50pvqswrnbh7pgb5676";
+     sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa";
   };
 
   patches = [

From 61c95a2eec3691a3f494ffaf8b3c187f9e5e7634 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Apr 2020 12:13:01 +0200
Subject: [PATCH 043/183] iwd: 1.6 -> 1.7

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 02bd83d9da63..be2a4ff3e56a 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx";
+    sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2";
   };
 
   nativeBuildInputs = [

From 77dc7ef908142a11d507c034e33edc1112be7187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Apr 2020 11:03:30 +0100
Subject: [PATCH 044/183] wireguard-tools: reference tests

---
 .../networking/wireguard-tools/default.nix    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 0a86d7dec8f9..82e74f1a4fdc 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,12 +1,12 @@
-{
-  stdenv, fetchzip,
-
-  iptables ? null,
-  iproute ? null,
-  makeWrapper ? null,
-  openresolv ? null,
-  procps ? null,
-  wireguard-go ? null,
+{ stdenv
+, fetchzip
+, nixosTests
+, iptables ? null
+, iproute ? null
+, makeWrapper ? null
+, openresolv ? null
+, procps ? null
+, wireguard-go ? null
 }:
 
 with stdenv.lib;
@@ -47,7 +47,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  passthru.updateScript = ./update.sh;
+  passthru = {
+    updateScript = ./update.sh;
+    tests = {
+      inherit (nixosTests) wg-quick wireguard-generated wireguard-namespaces;
+    };
+  };
 
   meta = {
     description = "Tools for the WireGuard secure network tunnel";

From 21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Apr 2020 07:19:26 +0100
Subject: [PATCH 045/183] wireguard: 1.0.20200401 -> 1.0.20200413

---
 pkgs/os-specific/linux/wireguard/default.nix | 28 +++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 890c774081bb..6edbb1aa4d7b 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, kernel, perl, wireguard-tools }:
+{ stdenv, fetchzip, kernel, perl, wireguard-tools, bc }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
@@ -7,29 +7,31 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "1.0.20200401";
+  version = "1.0.20200413";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "1q4gfpbvbyracnl219xqfz5yqfc08i6g41z6bn2skx5x8jbll3aq";
+    sha256 = "11dpw1inszbc3qjcfnap74kgjxkyyrx90vxv6wmsgkbp8lsl4p66";
   };
 
-  preConfigure = ''
-    cd src
-    sed -i '/depmod/,+1d' Makefile
-  '';
-
   hardeningDisable = [ "pic" ];
 
   KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-  INSTALL_MOD_PATH = "\${out}";
 
-  NIX_CFLAGS = ["-Wno-error=cpp"];
-
-  nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies;
+  nativeBuildInputs = [ perl bc ] ++ kernel.moduleBuildDependencies;
 
+  preBuild = "cd src";
   buildFlags = [ "module" ];
-  installTargets = [ "module-install" ];
+
+  INSTALL_MOD_PATH = placeholder "out";
+  installFlags = [ "DEPMOD=true" ];
+  enableParallelBuilding = true;
+
+  passthru = {
+    # remove this when our kernel comes with native wireguard support
+    # and our tests no longer tests this package
+    inherit (wireguard-tools) tests;
+  };
 
   meta = with stdenv.lib; {
     inherit (wireguard-tools.meta) homepage license maintainers;

From 3e9f3a3ebd8c2925f28efa91cafa56948ecab021 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 25 Apr 2020 14:35:20 +0200
Subject: [PATCH 046/183] hostapd: apply patch for CVE-2019-16275

AP mode PMF disconnection protection bypass

Published: September 11, 2019
Identifiers:
- CVE-2019-16275
Latest version available from: https://w1.fi/security/2019-7/

Vulnerability

hostapd (and wpa_supplicant when controlling AP mode) did not perform
sufficient source address validation for some received Management frames
and this could result in ending up sending a frame that caused
associated stations to incorrectly believe they were disconnected from
the network even if management frame protection (also known as PMF) was
negotiated for the association. This could be considered to be a denial
of service vulnerability since PMF is supposed to protect from this type
of issues. It should be noted that if PMF is not enabled, there would be
no protocol level protection against this type of denial service
attacks.

An attacker in radio range of the access point could inject a specially
constructed unauthenticated IEEE 802.11 frame to the access point to
cause associated stations to be disconnected and require a reconnection
to the network.

Vulnerable versions/configurations

All hostapd and wpa_supplicants versions with PMF support
(CONFIG_IEEE80211W=y) and a runtime configuration enabled AP mode with
PMF being enabled (optional or required). In addition, this would be
applicable only when using user space based MLME/SME in AP mode, i.e.,
when hostapd (or wpa_supplicant when controlling AP mode) would process
authentication and association management frames. This condition would
be applicable mainly with drivers that use mac80211.

Possible mitigation steps

- Merge the following commit to wpa_supplicant/hostapd and rebuild:

  AP: Silently ignore management frame from unexpected source address

  This patch is available from https://w1.fi/security/2019-7/

- Update to wpa_supplicant/hostapd v2.10 or newer, once available
---
 pkgs/os-specific/linux/hostapd/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 869a394cefb4..8152655d457d 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -17,7 +17,13 @@ stdenv.mkDerivation rec {
       # Note: fetchurl seems to be unhappy with openwrt git
       # server's URLs containing semicolons. Using the github mirror instead.
       url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
-      sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";})
+      sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
+    })
+    (fetchurl {
+      name = "CVE-2019-16275.patch";
+      url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch";
+      sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz";
+    })
   ];
 
   outputs = [ "out" "man" ];

From b5f9eb06b5a2e6513944283ecef97be1d4c92509 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 23 Apr 2020 18:23:25 +0200
Subject: [PATCH 047/183] ocamlPackages.mirage-time(-unix): init at 2.0.1

---
 .../ocaml-modules/mirage-time/default.nix     | 22 +++++++++++++++++++
 .../ocaml-modules/mirage-time/unix.nix        | 13 +++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 ++++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mirage-time/default.nix
 create mode 100644 pkgs/development/ocaml-modules/mirage-time/unix.nix

diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix
new file mode 100644
index 000000000000..b98fd3b6279c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-time/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, fetchurl, ocaml_lwt }:
+
+buildDunePackage rec {
+  minimumOCamlVersion = "4.06";
+
+  pname = "mirage-time";
+  version = "2.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz";
+    sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0";
+  };
+
+  propagatedBuildInputs = [ ocaml_lwt ];
+
+  meta = with lib; {
+    homepage = "https://github.com/mirage/mirage-time";
+    description = "Time operations for MirageOS";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/mirage-time/unix.nix b/pkgs/development/ocaml-modules/mirage-time/unix.nix
new file mode 100644
index 000000000000..da5326bc0751
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-time/unix.nix
@@ -0,0 +1,13 @@
+{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }:
+
+buildDunePackage {
+  pname = "mirage-time-unix";
+
+  inherit (mirage-time) src version minimumOCamlVersion;
+
+  propagatedBuildInputs = [ mirage-time ocaml_lwt duration ];
+
+  meta = mirage-time.meta // {
+    description = "Time operations for MirageOS on Unix";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3cbb0a7df33f..cef4e9130260 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -562,6 +562,10 @@ let
 
     mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { };
 
+    mirage-time = callPackage ../development/ocaml-modules/mirage-time { };
+
+    mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { };
+
     mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
 
     mlgmpidl =  callPackage ../development/ocaml-modules/mlgmpidl { };

From 0c4386bf0a55a7332c0948abcd9c875e8627847f Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 23 Apr 2020 18:24:15 +0200
Subject: [PATCH 048/183] ocamlPackages.dns(-client): 4.4.1 -> 4.5.0

jackline: 2020-03-22 -> 2020-04-24

Dependency mtime is no longer needed
---
 .../networking/instant-messengers/jackline/default.nix    | 8 ++++----
 pkgs/development/ocaml-modules/dns/client.nix             | 8 ++++++--
 pkgs/development/ocaml-modules/dns/default.nix            | 4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 92857aa1a667..f2b026e79dac 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -4,19 +4,19 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07";
 
 stdenv.mkDerivation {
   pname = "jackline";
-  version = "unstable-2020-03-22";
+  version = "unstable-2020-04-24";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev    = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa";
-    sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c";
+    rev    = "885b97b90d565f5f7c2b5f66f5edf14a82251b87";
+    sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj";
   };
 
   buildInputs = with ocamlPackages; [
                   ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving
                   erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name
-                  ocaml_lwt otr astring ptime mtime notty sexplib hex uutf
+                  ocaml_lwt otr astring ptime notty sexplib hex uutf
                   dns-client base64
                 ];
 
diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix
index d007533fe45b..0dd0541138c8 100644
--- a/pkgs/development/ocaml-modules/dns/client.nix
+++ b/pkgs/development/ocaml-modules/dns/client.nix
@@ -1,10 +1,14 @@
-{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-random, mirage-stack, mtime, randomconv }:
+{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
+, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }:
 
 buildDunePackage {
   pname = "dns-client";
   inherit (dns) src version;
 
-  propagatedBuildInputs = [ dns mtime ocaml_lwt mirage-clock mirage-random mirage-stack randomconv ];
+  useDune2 = true;
+
+  propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time
+                            mirage-random mirage-stack mirage-crypto-rng ];
 
   meta = dns.meta // {
     description = "Pure DNS resolver API";
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index e2aac3367bfa..01bbffd40b94 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "dns";
-  version = "4.4.1";
+  version = "4.5.0";
 
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
-    sha256 = "18c09jf0kicv2xz40n367y774rg8qs07rr1vdk8bx8f7hnaa9cn8";
+    sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0";
   };
 
   propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ];

From 03c0ab3857e9667039c87ed7520a51a2ae12838c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 25 Apr 2020 15:18:44 +0200
Subject: [PATCH 049/183] goocanvasmm2: fix update script attrPath

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

diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix
index ef593c568a23..d8a910d4799c 100644
--- a/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/pkgs/development/libraries/goocanvasmm/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
+      attrPath = "goocanvasmm2";
     };
   };
 

From 22133c6bf3cf8b285db182dcf804476d6456beff Mon Sep 17 00:00:00 2001
From: Renato Garcia <fgarcia.renato@gmail.com>
Date: Sat, 25 Apr 2020 10:19:54 -0300
Subject: [PATCH 050/183] snakemake: 5.13.0 -> 5.15.0 (#85913)

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

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index e54dc785b08e..af4e225ca323 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "5.13.0";
+  version = "5.15.0";
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec {
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9";
+    sha256 = "10cd1k5vg8ra5fnpqpdbl04qwx6h2mmmqbn71pl8j69w9110dkys";
   };
 
   doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
 
   meta = with stdenv.lib; {
-    homepage = "https://snakemake.bitbucket.io";
+    homepage = "https://snakemake.readthedocs.io";
     license = licenses.mit;
     description = "Python-based execution environment for make-like workflows";
     longDescription = ''

From f544c293ecc59a2e7c7be2deabe5f1cb5b7c160b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 25 Apr 2020 15:23:35 +0200
Subject: [PATCH 051/183] gnome3.updateScript: fix tarball eval on nonexisting
 attrpaths

As reported in https://github.com/NixOS/nixpkgs/commit/974f11cb2972f470ab4b7a71fdf8f09dfdff562b#commitcomment-38735081,
the tarball will fail to evaluate when updateScript is given a non-existing attrPath because getAttrFromPath
uses abort, which terminates the evaluation.
---
 pkgs/desktops/gnome-3/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix
index 555504086a4c..506c265270c0 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/pkgs/desktops/gnome-3/update.nix
@@ -5,7 +5,7 @@ let
   python = python3.withPackages (p: [ p.requests ]);
   upperBoundFlag =
     let
-      package = lib.getAttrFromPath (lib.splitString "." attrPath) pkgs;
+      package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
       packageVersion = lib.getVersion package;
       versionComponents = lib.versions.splitVersion packageVersion;
       minorVersion = lib.versions.minor packageVersion;

From 4239bf17ec3c9a7583162dee93b2005dab956b77 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 25 Apr 2020 15:32:16 +0200
Subject: [PATCH 052/183] gnome3.updateScript: optimize unfrozen updates

When the updates are not frozen, there is no need to try to extract versions from attributes.
---
 pkgs/desktops/gnome-3/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix
index 506c265270c0..1bceddf77eb5 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/pkgs/desktops/gnome-3/update.nix
@@ -12,7 +12,7 @@ let
       minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null;
       nextMinor = builtins.fromJSON minorVersion + 1;
       upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}";
-    in lib.optionalString (minorAvailable && freeze) ''--upper-bound="${upperBound}"'';
+    in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"'';
   updateScript = writeScript "gnome-update-script" ''
     #!${stdenv.shell}
     set -o errexit

From 982c6fc68f6eb8b456c55b2b028bdf52522ead91 Mon Sep 17 00:00:00 2001
From: Cody Allen <ceedubs@gmail.com>
Date: Fri, 24 Apr 2020 06:42:57 -0700
Subject: [PATCH 053/183] unison-ucm: 1.0.M1h-alpha -> 1.0.M1j-alpha

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

diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index a8867d314656..c2cbc03ca0fb 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
 
 stdenv.mkDerivation rec {
   pname = "unison-code-manager";
-  milestone_id = "M1h";
+  milestone_id = "M1j";
   version = "1.0.${milestone_id}-alpha";
 
   src = if (stdenv.isDarwin) then
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
-      sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp";
+      sha256 = "1pvdjmasgl22inbr8nlizsg8s5zagn8bzwhaxqmwafkpsskz0hsg";
     }
   else
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
-      sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci";
+      sha256 = "1xpblx405cp3mv0vrhcqwjlxvrhgmc77mxbvcy93srxja3qai1af";
     };
 
   # The tarball is just the prebuilt binary, in the archive root.

From 1985c6b9d5de7c2a19e0f58afcddf6123c2e62ae Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 18 Apr 2020 23:18:41 +0100
Subject: [PATCH 054/183] afl: fix afl-clang-fast++ by making it a copy of
 afl-clang-fast, not a symlink

a symlink gets skipped by wrapProgram and this ends up confusing the nix
cc wrapper's cpp mode detection
---
 pkgs/tools/security/afl/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index def5458a240c..e32aa0348747 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -47,6 +47,11 @@ let
       # has totally different semantics in that case(?) - and also set a
       # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out
       # of $PATH.
+      # first though we need to replace the afl-clang-fast++ symlink with
+      # a real copy to prevent wrapProgram skipping the symlink and confusing
+      # nix's cc wrapper
+      rm $out/bin/afl-clang-fast++
+      cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++
       for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do
         wrapProgram $x \
           --prefix AFL_PATH : "$out/lib/afl" \

From f5f85d16d19a4428f32fab798340aded12971b28 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Apr 2020 17:48:31 +0200
Subject: [PATCH 055/183] epson-escpr2: 1.1.1 -> 1.1.11

---
 pkgs/misc/drivers/epson-escpr2/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 4edc08a3571b..a1420a0428b7 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "epson-inkjet-printer-escpr2";
-  version = "1.1.1";
+  version = "1.1.11";
 
   src = fetchurl {
     # To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     # version.  
     # NOTE: Don't forget to update the webarchive link too!
     urls = [ 
-      "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm"
-      "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm"
+      "https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm"
+      "https://web.archive.org/web/20200425154102/https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm"
     ];
-    sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q";
+    sha256 = "1gcdzmqli7jycljm66mdssivb3lk223ih6zg0l3lyn7hj2gbkinm";
   };
 
   patches = [ ./cups-filter-ppd-dirs.patch ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       Refer to the description of epson-escpr for usage.
     '';
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ma9e ];
+    maintainers = with maintainers; [ ma9e ma27 ];
     platforms = platforms.linux;
   };
 }

From c970de4586988fb104f4552f8dd5f83045ca9f72 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 17:58:13 +0200
Subject: [PATCH 056/183] haskell-dhall: disable the test suite

Dhall 1.31.x still attempts to access the network during its
test suite run, i.e. it attempts to connect to github.com.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ba885c0ecd5f..817037e1e436 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -720,10 +720,9 @@ self: super: builtins.intersectAttrs super {
   # break infinite recursion with base-orphans
   primitive = dontCheck super.primitive;
 
-  # dhall-1.29.0 tests access the network.  This override can be removed when
-  # dhall_1_29_0 is no longer used, since more recent versions of dhall don't
-  # access the network in checks.
+  # dhall's tests access the network.
   dhall_1_29_0 = dontCheck super.dhall_1_29_0;
+  dhall_1_31_1 = dontCheck super.dhall_1_31_1;
 
   cut-the-crap =
     let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ];

From f2aa6b44d44304ad93f006eeedfd6a955909f450 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 17:59:35 +0200
Subject: [PATCH 057/183] haskell-system-fileio: jailbreak out of dependency on
 chell 0.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 96ab593cf848..23c555c5ac9f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -56,6 +56,7 @@ self: super: {
   regex-posix = doJailbreak super.regex-posix;
   regex-tdfa = doJailbreak super.regex-tdfa;
   split = doJailbreak super.split;
+  system-fileio = doJailbreak super.system-fileio;
   tar = doJailbreak super.tar;
   tasty-expected-failure = doJailbreak super.tasty-expected-failure;
   unliftio-core = doJailbreak super.unliftio-core;

From b24d2a90dd639bcd3083fe75fd675020884589c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:00:09 +0200
Subject: [PATCH 058/183] configuration-ghc-8.10.x.nix: cosmetic

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 23c555c5ac9f..17bd688ffaa4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -64,9 +64,9 @@ self: super: {
   zlib = doJailbreak super.zlib;
 
   # Use the latest version to fix the build.
+  ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
   optics-core = self.optics-core_0_3;
   repline = self.repline_0_3_0_0;
-  ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
   th-desugar = self.th-desugar_1_11;
 
   # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need

From 125ada17b0748038b8c58d69efcf50446f8716bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:01:28 +0200
Subject: [PATCH 059/183] haskell-dhall: use the latest version when building
 with ghc-8.10.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 17bd688ffaa4..4369b7176c94 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -64,6 +64,7 @@ self: super: {
   zlib = doJailbreak super.zlib;
 
   # Use the latest version to fix the build.
+  dhall = self.dhall_1_31_1;
   ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
   optics-core = self.optics-core_0_3;
   repline = self.repline_0_3_0_0;

From 6a6d0174ed1c87703e90cbc1702566a8b8e5e9d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:01:48 +0200
Subject: [PATCH 060/183] haskell-pandoc: jailbreak out of haddock-library
 1.8.x constraint

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 4369b7176c94..cf1624b3fb49 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -49,6 +49,7 @@ self: super: {
   async = doJailbreak super.async;
   ChasingBottoms = doJailbreak super.ChasingBottoms;
   hashable = doJailbreak super.hashable;
+  pandoc = doJailbreak super.pandoc;
   parallel = doJailbreak super.parallel;
   regex-base = doJailbreak super.regex-base;
   regex-compat = doJailbreak super.regex-compat;

From 2ececf1ed9b90d228593fccf58aaf2a014a98352 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 25 Apr 2020 18:09:51 +0200
Subject: [PATCH 061/183] nixos/nscd: be more specific in the nscd.enable
 description on what breaks

---
 nixos/modules/services/system/nscd.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index af26dd847073..d720f254b813 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -24,7 +24,11 @@ in
       enable = mkOption {
         type = types.bool;
         default = true;
-        description = "Whether to enable the Name Service Cache Daemon.";
+        description = ''
+          Whether to enable the Name Service Cache Daemon.
+          Disabling this is strongly discouraged, as this effectively disables NSS Lookups
+          from all non-glibc NSS modules, including the ones provided by systemd.
+        '';
       };
 
       config = mkOption {

From 7b7764287cf5b78a98468a173099d228c19679f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:16:57 +0200
Subject: [PATCH 062/183] haskell-cabal-plan: apply patch to fix the build with
 ghc-8.10.1

---
 .../haskell-modules/configuration-ghc-8.10.x.nix          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index cf1624b3fb49..1b24a68bf4d9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -101,4 +101,12 @@ self: super: {
 
   # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog
   apply-refact = super.apply-refact_0_8_0_0;
+
+  # Apply patch to fix the build.
+  cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch {
+    name = "cabal-plan-fix-for-ghc-8.10.x.patch";
+    url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch";
+    sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
+  });
+
 }

From 21a354b6dd31ce9b1250674218f0a9f49677f2ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:22:55 +0200
Subject: [PATCH 063/183] haskell-cabal-install-parsers: re-factor overrides to
 fix build with ghc-8.10.1

---
 pkgs/development/haskell-modules/configuration-common.nix  | 7 ++-----
 .../haskell-modules/configuration-ghc-8.8.x.nix            | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d6edaa864709..4b898972dede 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1457,11 +1457,8 @@ self: super: {
   cryptonite = dontCheck super.cryptonite;
 
   # The test suite depends on an impure cabal-install installation in
-  # $HOME, which we don't have in our build sandbox, and it is keeping
-  # up with the most recent Cabal version.
-  cabal-install-parsers = dontCheck (super.cabal-install-parsers.overrideScope (self: super: {
-    Cabal = self.Cabal_3_2_0_0;
-  }));
+  # $HOME, which we don't have in our build sandbox.
+  cabal-install-parsers = dontCheck super.cabal-install-parsers;
 
   # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
   haskell-ci = doJailbreak super.haskell-ci;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index bdd5a9007d71..7395d059b4d7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -102,4 +102,8 @@ self: super: {
 
   # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog
   apply-refact = super.apply-refact_0_7_0_0;
+
+  # The package needs the latest Cabal version.
+  cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
+
 }

From 3f472552c4b23c5a62c557ac238227ec23fd0d56 Mon Sep 17 00:00:00 2001
From: chkno <chuck@intelligence.org>
Date: Sat, 25 Apr 2020 09:54:07 -0700
Subject: [PATCH 064/183] gnucash: 3.9 -> 3.10 (#85978)

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

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index d7664b347ee1..a8630381ebf2 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnucash";
-  version = "3.9";
+  version = "3.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
-    sha256 = "1zxrgrjbs13vgr002rvl734w9f7zzxfq4xxmyhj777dwgkfds0ld";
+    sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
   '';
 
   # TODO: The following tests FAILED:
-  #   61 - test-gnc-timezone (Failed)
   #   70 - test-load-c (Failed)
   #   71 - test-modsysver (Failed)
   #   72 - test-incompatdep (Failed)

From daf3b0868ab6f4f24b7bdfbd580cd068b4be9039 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:45:14 +0200
Subject: [PATCH 065/183] configuration-ghc-8.10.x.nix: cosmetic

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 1b24a68bf4d9..dbfc65bab86d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -80,6 +80,7 @@ self: super: {
 
   # Jailbreak to fix the build.
   aeson-diff = doJailbreak super.aeson-diff;
+  brick = doJailbreak super.brick;
   cborg = doJailbreak super.cborg;
   cborg-json = doJailbreak super.cborg-json;
   exact-pi = doJailbreak super.exact-pi;
@@ -87,7 +88,6 @@ self: super: {
   serialise = doJailbreak super.serialise;
   setlocale = doJailbreak super.setlocale;
   shellmet = doJailbreak super.shellmet;
-  brick = doJailbreak super.brick;
 
   # The shipped Setup.hs file is broken.
   csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });

From ceab66bf6e474d48a85cc0deec54946a4ae4eb28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:45:53 +0200
Subject: [PATCH 066/183] haskell-lens: use latest version when building with
 ghc-8.10.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index dbfc65bab86d..70169cffffe6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -67,6 +67,7 @@ self: super: {
   # Use the latest version to fix the build.
   dhall = self.dhall_1_31_1;
   ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
+  lens = self.lens_4_19_2;
   optics-core = self.optics-core_0_3;
   repline = self.repline_0_3_0_0;
   th-desugar = self.th-desugar_1_11;

From 53865f5f713ee112a9a9ffcfb23c8b14001c84ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 18:46:27 +0200
Subject: [PATCH 067/183] haskell-hlint: fix build with ghc-8.10.1

---
 .../development/haskell-modules/configuration-ghc-8.10.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 70169cffffe6..942176f8d8f2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -110,4 +110,9 @@ self: super: {
     sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
   });
 
+  # https://github.com/ndmitchell/hlint/issues/959
+  hlint = super.hlint.override {
+    ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser;
+  };
+
 }

From d28e92d5aa934cd78f41916711c891ba505bccc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 19:04:22 +0200
Subject: [PATCH 068/183] haskell-weeder: jailbreak to fix the build with
 ghc-8.10.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 942176f8d8f2..a9387ec3be6d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -89,6 +89,7 @@ self: super: {
   serialise = doJailbreak super.serialise;
   setlocale = doJailbreak super.setlocale;
   shellmet = doJailbreak super.shellmet;
+  weeder = doJailbreak super.weeder;    # https://github.com/ocharles/weeder/issues/15
 
   # The shipped Setup.hs file is broken.
   csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });

From d3ae5625ffb410db8f79802de486c8e809ccf673 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 19:32:30 +0200
Subject: [PATCH 069/183] haskell-dbus: apply patch to fix the build

Taken from https://github.com/rblaze/haskell-dbus/pull/48.
---
 .../configuration-ghc-8.10.x.nix              |   1 +
 .../patches/fix-dbus-for-ghc-8.10.x.patch     | 383 ++++++++++++++++++
 2 files changed, 384 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index a9387ec3be6d..3721bb724f57 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -110,6 +110,7 @@ self: super: {
     url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch";
     sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
   });
+  dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch;
 
   # https://github.com/ndmitchell/hlint/issues/959
   hlint = super.hlint.override {
diff --git a/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch
new file mode 100644
index 000000000000..7ed390d3f237
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch
@@ -0,0 +1,383 @@
+Only in dbus-1.2.13-new: .codeclimate.yml
+diff -ur dbus-1.2.13-old/dbus.cabal dbus-1.2.13-new/dbus.cabal
+--- dbus-1.2.13-old/dbus.cabal	2020-04-25 19:29:27.372272952 +0200
++++ dbus-1.2.13-new/dbus.cabal	2020-04-25 19:26:36.140991920 +0200
+@@ -1,172 +1,180 @@
+-cabal-version: >=1.8
+ name: dbus
+ version: 1.2.13
+ license: Apache-2.0
+ license-file: license.txt
+-maintainer: Andrey Sverdlichenko <blaze@ruddy.ru>
+ author: John Millikin <john@john-millikin.com>
++maintainer: Andrey Sverdlichenko <blaze@ruddy.ru>
++build-type: Simple
++cabal-version: >= 1.8
++category: Network, Desktop
+ stability: experimental
+ homepage: https://github.com/rblaze/haskell-dbus#readme
++
+ synopsis: A client library for the D-Bus IPC system.
+ description:
+-    D-Bus is a simple, message-based protocol for inter-process
+-    communication, which allows applications to interact with other parts of
+-    the machine and the user's session using remote procedure calls.
+-    .
+-    D-Bus is a essential part of the modern Linux desktop, where it replaces
+-    earlier protocols such as CORBA and DCOP.
+-    .
+-    This library is an implementation of the D-Bus protocol in Haskell. It
+-    can be used to add D-Bus support to Haskell applications, without the
+-    awkward interfaces common to foreign bindings.
+-    .
+-    Example: connect to the session bus, and get a list of active names.
+-    .
+-    @
+-    &#x7b;-\# LANGUAGE OverloadedStrings \#-&#x7d;
+-    .
+-    import Data.List (sort)
+-    import DBus
+-    import DBus.Client
+-    .
+-    main = do
+-    &#x20;   client <- connectSession
+-    &#x20;   //
+-    &#x20;   \-- Request a list of connected clients from the bus
+-    &#x20;   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")
+-    &#x20;       &#x7b; methodCallDestination = Just \"org.freedesktop.DBus\"
+-    &#x20;       &#x7d;
+-    &#x20;   //
+-    &#x20;   \-- org.freedesktop.DBus.ListNames() returns a single value, which is
+-    &#x20;   \-- a list of names (here represented as [String])
+-    &#x20;   let Just names = fromVariant (methodReturnBody reply !! 0)
+-    &#x20;   //
+-    &#x20;   \-- Print each name on a line, sorted so reserved names are below
+-    &#x20;   \-- temporary names.
+-    &#x20;   mapM_ putStrLn (sort names)
+-    @
+-    .
+-    >$ ghc --make list-names.hs
+-    >$ ./list-names
+-    >:1.0
+-    >:1.1
+-    >:1.10
+-    >:1.106
+-    >:1.109
+-    >:1.110
+-    >ca.desrt.dconf
+-    >org.freedesktop.DBus
+-    >org.freedesktop.Notifications
+-    >org.freedesktop.secrets
+-    >org.gnome.ScreenSaver
+-category: Network, Desktop
+-build-type: Simple
++  D-Bus is a simple, message-based protocol for inter-process
++  communication, which allows applications to interact with other parts of
++  the machine and the user's session using remote procedure calls.
++  .
++  D-Bus is a essential part of the modern Linux desktop, where it replaces
++  earlier protocols such as CORBA and DCOP.
++  .
++  This library is an implementation of the D-Bus protocol in Haskell. It
++  can be used to add D-Bus support to Haskell applications, without the
++  awkward interfaces common to foreign bindings.
++  .
++  Example: connect to the session bus, and get a list of active names.
++  .
++  @
++  &#x7b;-\# LANGUAGE OverloadedStrings \#-&#x7d;
++  .
++  import Data.List (sort)
++  import DBus
++  import DBus.Client
++  .
++  main = do
++  &#x20;   client <- connectSession
++  &#x20;
++  &#x20;   -- Request a list of connected clients from the bus
++  &#x20;   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")
++  &#x20;       &#x7b; methodCallDestination = Just \"org.freedesktop.DBus\"
++  &#x20;       &#x7d;
++  &#x20;
++  &#x20;   -- org.freedesktop.DBus.ListNames() returns a single value, which is
++  &#x20;   -- a list of names (here represented as [String])
++  &#x20;   let Just names = fromVariant (methodReturnBody reply !! 0)
++  &#x20;
++  &#x20;   -- Print each name on a line, sorted so reserved names are below
++  &#x20;   -- temporary names.
++  &#x20;   mapM_ putStrLn (sort names)
++  @
++  .
++  >$ ghc --make list-names.hs
++  >$ ./list-names
++  >:1.0
++  >:1.1
++  >:1.10
++  >:1.106
++  >:1.109
++  >:1.110
++  >ca.desrt.dconf
++  >org.freedesktop.DBus
++  >org.freedesktop.Notifications
++  >org.freedesktop.secrets
++  >org.gnome.ScreenSaver
++
++
+ extra-source-files:
+-    examples/dbus-monitor.hs
+-    examples/export.hs
+-    examples/introspect.hs
+-    examples/list-names.hs
+-    idlxml/dbus.xml
++  examples/dbus-monitor.hs
++  examples/export.hs
++  examples/introspect.hs
++  examples/list-names.hs
++  idlxml/dbus.xml
+ 
+ source-repository head
+-    type: git
+-    location: https://github.com/rblaze/haskell-dbus
++  type: git
++  location: https://github.com/rblaze/haskell-dbus
+ 
+ library
+-    exposed-modules:
+-        DBus
+-        DBus.Client
+-        DBus.Generation
+-        DBus.Internal.Address
+-        DBus.Internal.Message
+-        DBus.Internal.Types
+-        DBus.Internal.Wire
+-        DBus.Introspection
+-        DBus.Introspection.Parse
+-        DBus.Introspection.Render
+-        DBus.Introspection.Types
+-        DBus.Socket
+-        DBus.TH
+-        DBus.Transport
+-    hs-source-dirs: lib
+-    ghc-options: -W -Wall
+-    build-depends:
+-        base ==4.*,
+-        bytestring <0.11,
+-        cereal <0.6,
+-        conduit >=1.3.0 && <1.4,
+-        containers <0.7,
+-        deepseq <1.5,
+-        exceptions <0.11,
+-        filepath <1.5,
+-        lens <4.20,
+-        network >=3.0.1.0 && <3.2,
+-        parsec <3.2,
+-        random <1.2,
+-        split <0.3,
+-        template-haskell <2.16.0.0,
+-        text <1.3,
+-        th-lift <0.9,
+-        transformers <0.6,
+-        unix <2.8,
+-        vector <0.13,
+-        xml-conduit >=1.9.0.0 && <1.10.0.0,
+-        xml-types <0.4
++  ghc-options: -W -Wall
++  hs-source-dirs: lib
++
++  build-depends:
++      base >=4 && <5
++    , bytestring
++    , cereal
++    , conduit >= 1.3.0
++    , containers
++    , deepseq
++    , exceptions
++    , filepath
++    , lens < 4.20
++    , network >= 3.0.1.0 && < 3.2
++    , parsec
++    , random
++    , split
++    , template-haskell < 2.17.0.0
++    , text
++    , th-lift < 0.9
++    , transformers
++    , unix
++    , vector
++    , xml-conduit >= 1.9.0.0 && < 1.10.0.0
++    , xml-types
++
++  exposed-modules:
++    DBus
++    DBus.Client
++    DBus.Generation
++    DBus.Internal.Address
++    DBus.Internal.Message
++    DBus.Internal.Types
++    DBus.Internal.Wire
++    DBus.Introspection
++    DBus.Introspection.Parse
++    DBus.Introspection.Render
++    DBus.Introspection.Types
++    DBus.Socket
++    DBus.TH
++    DBus.Transport
+ 
+ test-suite dbus_tests
+-    type: exitcode-stdio-1.0
+-    main-is: DBusTests.hs
+-    hs-source-dirs: tests
+-    other-modules:
+-        DBusTests.Address
+-        DBusTests.BusName
+-        DBusTests.Client
+-        DBusTests.ErrorName
+-        DBusTests.Generation
+-        DBusTests.Integration
+-        DBusTests.InterfaceName
+-        DBusTests.Introspection
+-        DBusTests.MemberName
+-        DBusTests.Message
+-        DBusTests.ObjectPath
+-        DBusTests.Serialization
+-        DBusTests.Signature
+-        DBusTests.Socket
+-        DBusTests.TH
+-        DBusTests.Transport
+-        DBusTests.Util
+-        DBusTests.Variant
+-        DBusTests.Wire
+-    ghc-options: -W -Wall -fno-warn-orphans
+-    build-depends:
+-        dbus -any,
+-        base ==4.*,
+-        bytestring <0.11,
+-        cereal <0.6,
+-        containers <0.7,
+-        directory <1.4,
+-        extra <1.8,
+-        filepath <1.5,
+-        network >=3.0.1.0 && <3.2,
+-        parsec <3.2,
+-        process <1.7,
+-        QuickCheck <2.15,
+-        random <1.2,
+-        resourcet <1.3,
+-        tasty <1.3,
+-        tasty-hunit <0.11,
+-        tasty-quickcheck <0.11,
+-        text <1.3,
+-        transformers <0.6,
+-        unix <2.8,
+-        vector <0.13
++  type: exitcode-stdio-1.0
++  main-is: DBusTests.hs
++  hs-source-dirs: tests
++  ghc-options: -W -Wall -fno-warn-orphans
++
++  build-depends:
++      dbus
++    , base >=4 && <5
++    , bytestring
++    , cereal
++    , containers
++    , directory
++    , extra < 1.8
++    , filepath
++    , network >= 3.0.1.0 && < 3.2
++    , parsec
++    , process
++    , QuickCheck < 2.15
++    , random
++    , resourcet
++    , tasty
++    , tasty-hunit
++    , tasty-quickcheck
++    , text
++    , transformers
++    , unix
++    , vector
++
++  other-modules:
++    DBusTests.Address
++    DBusTests.BusName
++    DBusTests.Client
++    DBusTests.ErrorName
++    DBusTests.Generation
++    DBusTests.Integration
++    DBusTests.InterfaceName
++    DBusTests.Introspection
++    DBusTests.MemberName
++    DBusTests.Message
++    DBusTests.ObjectPath
++    DBusTests.Serialization
++    DBusTests.Signature
++    DBusTests.Socket
++    DBusTests.TH
++    DBusTests.Transport
++    DBusTests.Util
++    DBusTests.Variant
++    DBusTests.Wire
+ 
+ benchmark dbus_benchmarks
+-    type: exitcode-stdio-1.0
+-    main-is: DBusBenchmarks.hs
+-    hs-source-dirs: benchmarks
+-    ghc-options: -Wall -fno-warn-orphans
+-    build-depends:
+-        dbus -any,
+-        base ==4.*,
+-        criterion <1.6
++  type: exitcode-stdio-1.0
++  main-is: DBusBenchmarks.hs
++  hs-source-dirs: benchmarks
++  ghc-options: -Wall -fno-warn-orphans
++
++  build-depends:
++      dbus
++    , base >=4 && <5
++    , criterion
+Only in dbus-1.2.13-new: .git
+Only in dbus-1.2.13-new: .gitignore
+diff -ur dbus-1.2.13-old/lib/DBus/Generation.hs dbus-1.2.13-new/lib/DBus/Generation.hs
+--- dbus-1.2.13-old/lib/DBus/Generation.hs	2019-02-14 16:37:47.000000000 +0100
++++ dbus-1.2.13-new/lib/DBus/Generation.hs	2020-04-25 19:26:36.144991997 +0200
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE OverloadedStrings #-}
+ {-# LANGUAGE TemplateHaskell #-}
+ module DBus.Generation where
+@@ -26,6 +27,13 @@
+ import           Prelude hiding (mapM)
+ import           System.Posix.Types (Fd(..))
+ 
++-- | Compatibility helper to create (total) tuple expressions
++mkTupE :: [Exp] -> Exp
++mkTupE = TupE
++#if MIN_VERSION_template_haskell(2,16,0)
++         . map Just
++#endif
++
+ type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a
+ 
+ dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a
+@@ -232,8 +240,8 @@
+     finalOutputNames <- buildOutputNames
+     let variantListExp = map makeToVariantApp methodArgNames
+         mapOrHead' = mapOrHead outputLength
+-        fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE
+-        finalResultTuple = mapOrHead' VarE finalOutputNames TupE
++        fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE
++        finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE
+         maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP
+         getMethodCallDefDec = [d|
+                $( varP methodCallDefN ) =
+@@ -432,7 +440,7 @@
+                      }
+                  |]
+     let mapOrHead' = mapOrHead argCount
+-        fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE
++        fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE
+         maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP
+         applyToName toApply n = AppE toApply $ VarE n
+         finalApplication = foldl applyToName (VarE handlerArgN)

From ea37fe1f1ccfe1a71560f53e5a665f2313cd1b60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 19:33:11 +0200
Subject: [PATCH 070/183] haskell-singletons: use latest versions when building
 with ghc-8.10.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 3721bb724f57..8cc498638b5f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -70,6 +70,7 @@ self: super: {
   lens = self.lens_4_19_2;
   optics-core = self.optics-core_0_3;
   repline = self.repline_0_3_0_0;
+  singletons = self.singletons_2_7;
   th-desugar = self.th-desugar_1_11;
 
   # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need

From 4bff4d692d93d0c4430c592bb188c341e4e98ee9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 19:42:48 +0200
Subject: [PATCH 071/183] haskell-xmobar: jailbreak to fix the build with
 ghc-8.10.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 8cc498638b5f..a019593161c7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -91,6 +91,7 @@ self: super: {
   setlocale = doJailbreak super.setlocale;
   shellmet = doJailbreak super.shellmet;
   weeder = doJailbreak super.weeder;    # https://github.com/ocharles/weeder/issues/15
+  xmobar = doJailbreak super.xmobar;
 
   # The shipped Setup.hs file is broken.
   csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });

From 6a627c416fe663ac16064f7a155afba9522910e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Apr 2020 19:43:02 +0200
Subject: [PATCH 072/183] haskell-policeman: jailbreak to fix the build with
 ghc-8.10.1

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index a019593161c7..f0d884156160 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -86,6 +86,7 @@ self: super: {
   cborg = doJailbreak super.cborg;
   cborg-json = doJailbreak super.cborg-json;
   exact-pi = doJailbreak super.exact-pi;
+  policeman = doJailbreak super.policeman;
   relude = dontCheck (doJailbreak super.relude);
   serialise = doJailbreak super.serialise;
   setlocale = doJailbreak super.setlocale;

From 29330634557d60305c5c722a25cbf1ad7704ab13 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 25 Apr 2020 12:52:00 -0500
Subject: [PATCH 073/183] tflint: 0.15.4 -> 0.15.5

---
 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 200df98c0a20..8ad237bd1d2d 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.15.4";
+  version = "0.15.5";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j";
+    sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi";
   };
 
-  modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz";
+  modSha256 = "0ksblhra7ln4ryggr2x8fzl8a7ljz5zdjgdxz82c75wd7wdbw8f5";
 
   subPackages = [ "." ];
 

From a4347f2b9248b28880e3d724b4a4301116f3e22a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 25 Apr 2020 20:22:14 +0200
Subject: [PATCH 074/183] wireguard: reference missing `nixosTests.wireguard`

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

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 82e74f1a4fdc..4fac72f7d035 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = ./update.sh;
     tests = {
-      inherit (nixosTests) wg-quick wireguard-generated wireguard-namespaces;
+      inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces;
     };
   };
 

From 170c2b19542a3ba8d5b05ed854b3bf841d863915 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 25 Apr 2020 21:33:09 +0200
Subject: [PATCH 075/183] androidStudioPackages.{dev,canary}: 4.1.0.6 ->
 4.1.0.7

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index a6b99e583518..12badc8798ec 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2";
   };
   latestVersion = { # canary & dev
-    version = "4.1.0.6"; # "Android Studio 4.1 Canary 6"
-    build = "193.6381907";
-    sha256Hash = "0sa5plr96m90wv5hi9bqwa11j6k8k9wa0ji8qmlimdhnpyzhsdrx";
+    version = "4.1.0.7"; # "Android Studio 4.1 Canary 7"
+    build = "193.6401718";
+    sha256Hash = "1xa61rhi7dgxm0y6yl5dxd09x530mzyxvx9bp1jprzfwvc7s0byh";
   };
 in {
   # Attributes are named by their corresponding release channels

From c5e8985fd74e83dbb4a75309581af73c764811dd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 25 Apr 2020 21:35:49 +0200
Subject: [PATCH 076/183] androidStudioPackages.beta: 4.0.0.13 -> 4.0.0.14

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 12badc8798ec..8869f8a0f626 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k";
   };
   betaVersion = {
-    version = "4.0.0.13"; # "Android Studio 4.0 Beta 4"
-    build = "193.6348893";
-    sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2";
+    version = "4.0.0.14"; # "Android Studio 4.0 Beta 5"
+    build = "193.6401094";
+    sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs";
   };
   latestVersion = { # canary & dev
     version = "4.1.0.7"; # "Android Studio 4.1 Canary 7"

From d13a19cfbaf43b1ad2fcf835b1a05410c2f98bcb Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 25 Apr 2020 16:10:38 -0400
Subject: [PATCH 077/183] snes9x-gtk: 1.57 -> 1.60 (#85910)

---
 pkgs/misc/emulators/snes9x-gtk/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index 0ae92121cab1..6560024b19e0 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -1,25 +1,22 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig
-, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }:
 
 stdenv.mkDerivation rec {
   pname = "snes9x-gtk";
-  version = "1.57";
+  version = "1.60";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
     rev = version;
-    sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a";
+    sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1";
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ];
-  buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+  buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ];
 
-  preAutoreconf = ''
-    cd gtk
-    intltoolize
-  '';
+  preConfigure = "cd gtk";
 
   meta = with stdenv.lib; {
     homepage = "http://www.snes9x.com";

From a576482e4cbac5c02409a7864dc33750ad752cd0 Mon Sep 17 00:00:00 2001
From: peelz <LouisTakePILLz@users.noreply.github.com>
Date: Tue, 21 Apr 2020 10:59:49 -0400
Subject: [PATCH 078/183] obs-v4l2sink: add 32-bit support

The rev was downgraded to the latest released version (0.1.0) because the
the changes on master are mostly related to localization and README
stuff. The only code-related change is insignificant.
---
 ...bsPluginHelpers.cmake-in-the-obs-src.patch | 25 ---------
 .../video/obs-studio/v4l2sink.nix             | 52 ++++++++++---------
 2 files changed, 28 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch

diff --git a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch b/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch
deleted file mode 100644
index b642fbc3ada9..000000000000
--- a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5798a2691467604e89fd9fb1cd5289ebd1b1d7b8 Mon Sep 17 00:00:00 2001
-From: Graham Christensen <graham@grahamc.com>
-Date: Fri, 20 Mar 2020 22:32:02 -0400
-Subject: [PATCH] find ObsPluginHelpers.cmake in the obs src
-
----
- external/FindLibObs.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake
-index ab0a3de..53a46b8 100644
---- a/external/FindLibObs.cmake
-+++ b/external/FindLibObs.cmake
-@@ -95,7 +95,7 @@ if(LIBOBS_FOUND)
- 
- 	set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR})
- 	set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB})
--	include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)
-+	include(${OBS_SRC}/cmake/external/ObsPluginHelpers.cmake)
- 
- 	# allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg)
- 	if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES)
--- 
-2.25.0
-
diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix
index 1a1a48f11edc..515cc001ee91 100644
--- a/pkgs/applications/video/obs-studio/v4l2sink.nix
+++ b/pkgs/applications/video/obs-studio/v4l2sink.nix
@@ -1,42 +1,46 @@
-{ stdenv, fetchFromGitHub
-, cmake, pkgconfig, wrapQtAppsHook
-, obs-studio }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qtbase
+, obs-studio
+}:
 
-stdenv.mkDerivation {
-  pname = "obs-v4l2sink-unstable";
-  version = "20181012";
+stdenv.mkDerivation rec {
+  pname = "obs-v4l2sink";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "CatxFish";
     repo = "obs-v4l2sink";
-    rev = "1ec3c8ada0e1040d867ce567f177be55cd278378";
-    sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx";
+    rev = version;
+    sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
-  buildInputs = [ obs-studio ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qtbase obs-studio ];
 
-  patches = [
-    ./0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch
+  cmakeFlags = with lib; [
+    "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
   ];
 
-  cmakeFlags = [
-    "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs"
-    "-DLIBOBS_LIBRARIES=${obs-studio}/lib"
-    "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api"
-    "-DOBS_SRC=${obs-studio.src}"
-  ];
-
-  installPhase = ''
-    mkdir -p $out/share/obs/obs-plugins/v4l2sink/bin/64bit
-    cp ./v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/bin/64bit/
+  # obs-studio expects the shared object to be located in bin/32bit or bin/64bit
+  # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48
+  postInstall = let
+    pluginPath = {
+      i686-linux = "bin/32bit";
+      x86_64-linux = "bin/64bit";
+    }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}");
+  in ''
+    mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath}
+    ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "obs studio output plugin for Video4Linux2 device";
     homepage = "https://github.com/CatxFish/obs-v4l2sink";
     maintainers = with maintainers; [ colemickens peelz ];
     license = licenses.gpl2;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }

From f2211de99ebd4c568e848649ef70bf5548d8ba6a Mon Sep 17 00:00:00 2001
From: peelz <LouisTakePILLz@users.noreply.github.com>
Date: Tue, 21 Apr 2020 11:00:36 -0400
Subject: [PATCH 079/183] obs-v4l2sink: fix v4l2device_close segfault

---
 pkgs/applications/video/obs-studio/v4l2sink.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix
index 515cc001ee91..97eae68b6e72 100644
--- a/pkgs/applications/video/obs-studio/v4l2sink.nix
+++ b/pkgs/applications/video/obs-studio/v4l2sink.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , qtbase
 , obs-studio
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qtbase obs-studio ];
 
+  patches = [
+    # Fixes the segfault when stopping the plugin
+    (fetchpatch {
+      url = "https://github.com/CatxFish/obs-v4l2sink/commit/6604f01796d1b84a95714730ea51a6b8ac0e450b.diff";
+      sha256 = "0crcvw02dj0aqy7hnhizjdsnhiw03zmg6cbdkasxz2mrrbyc3s88";
+    })
+  ];
+
   cmakeFlags = with lib; [
     "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs"
   ];

From 4f17832abfdd15cd05fab04b3eec607896fe1e18 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 26 Apr 2020 01:08:31 +0200
Subject: [PATCH 080/183] msmtp: 1.8.8 -> 1.8.10 (#86027)

This update contains the full fix for the unfortunate and very annoying
msmtpq regression [0]. #YAY
This successfully reduces the amount of spam my setup generates :)
(Note: SCNR)

Relevant patches:
- https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071
- https://github.com/marlam/msmtp-mirror/commit/dfb39595a5cdf048db4dfc438333a2b8948c5296

[0]: https://marlam.de/msmtp/news/
---
 pkgs/applications/networking/msmtp/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 0117ab978cc0..9e990dcdf33d 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo
 , netcat-gnu, gnutls, gsasl, libidn2, Security
 , withKeyring ? true, libsecret ? null
 , systemd ? null }:
@@ -9,20 +9,15 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "msmtp";
-  version = "1.8.8";
+  version = "1.8.10";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc";
+    sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna";
   };
 
-  # the 2nd patch should go when 1.8.9 is released
   patches = [
     ./paths.patch
-    (fetchpatch {
-      url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch";
-      sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx";
-    })
   ];
 
   buildInputs = [ gnutls gsasl libidn2 ]

From c1facd193e8031a7a86ae1bf93318f99df65b392 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 19 Apr 2020 16:11:10 +1000
Subject: [PATCH 081/183] buildGoPackage: remove inactive maintainer

---
 pkgs/development/go-packages/generic/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 388280a905fb..b4ec8bd1706e 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -242,11 +242,7 @@ let
       # Add default meta information
       homepage = "https://${goPackagePath}";
       platforms = go.meta.platforms or lib.platforms.all;
-    } // meta // {
-      # add an extra maintainer to every package
-      maintainers = (meta.maintainers or []) ++
-                    [ lib.maintainers.lethalman ];
-    };
+    } // meta;
   });
 in if disabled then
   throw "${package.name} not supported for go ${go.meta.branch}"

From 7a40eb5763a13f68af5d7f74cae166d6c2d73c4d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:50 +1000
Subject: [PATCH 082/183] docker-machine: use installShellFiles

---
 .../networking/cluster/docker-machine/default.nix  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index 321084260320..a801a1223744 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "machine";
@@ -14,13 +14,13 @@ buildGoPackage rec {
     sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy";
   };
 
-  postInstall = ''
-    mkdir -p \
-      $bin/share/bash-completion/completions/ \
-      $bin/share/zsh/site-functions/
+  nativeBuildInputs = [ installShellFiles ];
 
-    cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/
-    cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/
+  postInstall = ''
+    pushd go/src/${goPackagePath}/contrib/completion
+    installShellCompletion --bash bash/*
+    installShellCompletion --zsh zsh/*
+    popd
   '';
 
   meta = with stdenv.lib; {

From 7c399a4ee080f33cc500a3fda33af6fccfd617bd Mon Sep 17 00:00:00 2001
From: rizary <andika.riyan@gmail.com>
Date: Sun, 26 Apr 2020 08:38:44 +0700
Subject: [PATCH 083/183] nixpkgs-fmt: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index dfd7eb63b12d..b95bb46a8440 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,16 +1,16 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
   pname = "nixpkgs-fmt";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis";
+    sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr";
   };
 
-  cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n";
+  cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9";
 
   meta = with lib; {
     description = "Nix code formatter for nixpkgs";

From 3e0aa4af2da4e4010cd9011aaa125fed7ca220e6 Mon Sep 17 00:00:00 2001
From: Colin <486199+c00w@users.noreply.github.com>
Date: Sun, 26 Apr 2020 04:37:59 -0400
Subject: [PATCH 084/183] Get rid of go 1.13 (#86036)

Kubernetes builds with go1.14.
Terraform has an upstream patch which fixes the macos mojave issues -
it's a bug in terraform, not go.
---
 .../networking/cluster/terraform/default.nix  |  10 +-
 pkgs/development/compilers/go/1.13.nix        | 244 ------------------
 pkgs/top-level/all-packages.nix               |  22 +-
 3 files changed, 10 insertions(+), 266 deletions(-)
 delete mode 100644 pkgs/development/compilers/go/1.13.nix

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index ee27422a1391..50a5129226a7 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils
-, runCommand, writeText, terraform-providers }:
+, runCommand, writeText, terraform-providers, fetchpatch }:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -120,7 +120,13 @@ in rec {
   terraform_0_12 = pluggable (generic {
     version = "0.12.24";
     sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z";
-    patches = [ ./provider-path.patch ];
+    patches = [
+        ./provider-path.patch
+        (fetchpatch {
+            name = "fix-mac-mojave-crashes.patch";
+            url = "https://github.com/hashicorp/terraform/pull/24562.patch";
+            sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";
+        }) ];
     passthru = { inherit plugins; };
   });
 
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
deleted file mode 100644
index 8fee93cc4abe..000000000000
--- a/pkgs/development/compilers/go/1.13.nix
+++ /dev/null
@@ -1,244 +0,0 @@
-{ stdenv, fetchurl, tzdata, iana-etc, runCommand
-, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
-, mailcap, runtimeShell
-, buildPackages, pkgsTargetTarget
-}:
-
-let
-
-  inherit (stdenv.lib) optionals optionalString;
-
-  goBootstrap = runCommand "go-bootstrap" {} ''
-    mkdir $out
-    cp -rf ${buildPackages.go_bootstrap}/* $out/
-    chmod -R u+w $out
-    find $out -name "*.c" -delete
-    cp -rf $out/bin/* $out/share/go/bin/
-  '';
-
-  goarch = platform: {
-    "i686" = "386";
-    "x86_64" = "amd64";
-    "aarch64" = "arm64";
-    "arm" = "arm";
-    "armv5tel" = "arm";
-    "armv6l" = "arm";
-    "armv7l" = "arm";
-  }.${platform.parsed.cpu.name} or (throw "Unsupported system");
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "go";
-  version = "1.13.8";
-
-  src = fetchurl {
-    url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi";
-  };
-
-  # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch procps ];
-  buildInputs = [ cacert pcre ]
-    ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
-    ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
-
-  depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
-
-  hardeningDisable = [ "all" ];
-
-  prePatch = ''
-    patchShebangs ./ # replace /bin/bash
-
-    # This source produces shell script at run time,
-    # and thus it is not corrected by patchShebangs.
-    substituteInPlace misc/cgo/testcarchive/carchive_test.go \
-      --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
-
-    # Patch the mimetype database location which is missing on NixOS.
-    # but also allow static binaries built with NixOS to run outside nix
-    sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/net/{listen,parse}_test.go
-    rm src/syscall/exec_linux_test.go
-
-    # !!! substituteInPlace does not seems to be effective.
-    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
-    # Disable the unix socket test
-    sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
-    # Remove the api check as it never worked
-    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
-    # Remove the coverage test as we have removed this utility
-    sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
-    # Remove the timezone naming test
-    sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
-    # Remove disable setgid test
-    sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
-    # Remove cert tests that conflict with NixOS's cert resolution
-    sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
-    # TestWritevError hangs sometimes
-    sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
-    # TestVariousDeadlines fails sometimes
-    sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
-
-    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
-    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-
-    # Disable cgo lookup tests not works, they depend on resolver
-    rm src/net/cgo_unix_test.go
-
-  '' + optionalString stdenv.isLinux ''
-    # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
-    # that run outside a nix server
-    sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
-
-  '' + optionalString stdenv.isAarch32 ''
-    echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
-  '' + optionalString stdenv.isDarwin ''
-    substituteInPlace src/race.bash --replace \
-      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
-    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
-    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
-    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
-
-    sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
-    sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
-    sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
-    sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
-
-    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
-    sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
-
-    sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
-
-    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
-
-    # TestCurrent fails because Current is not implemented on Darwin
-    sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
-    sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
-
-    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
-  '';
-
-  patches = [
-    ./remove-tools-1.11.patch
-    ./ssl-cert-file-1.13.patch
-    ./remove-test-pie-1.13.patch
-    ./creds-test.patch
-    ./go-1.9-skip-flaky-19608.patch
-    ./go-1.9-skip-flaky-20072.patch
-    ./skip-external-network-tests.patch
-    ./skip-nohup-tests.patch
-  ] ++ [
-    # breaks under load: https://github.com/golang/go/issues/25628
-    (if stdenv.isAarch32
-    then ./skip-test-extra-files-on-aarch32.patch
-    else ./skip-test-extra-files-on-386.patch)
-  ];
-
-  postPatch = ''
-    find . -name '*.orig' -exec rm {} ';'
-  '';
-
-  GOOS = stdenv.targetPlatform.parsed.kernel.name;
-  GOARCH = goarch stdenv.targetPlatform;
-  # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
-  # Go will nevertheless build a for host system that we will copy over in
-  # the install phase.
-  GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
-  GOHOSTARCH = goarch stdenv.buildPlatform;
-
-  # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
-  # to be different from CC/CXX
-  CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
-      "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
-    else
-      null;
-  CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
-      "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
-    else
-      null;
-
-  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
-  GO386 = 387; # from Arch: don't assume sse2 on i686
-  CGO_ENABLED = 1;
-  # Hopefully avoids test timeouts on Hydra
-  GO_TEST_TIMEOUT_SCALE = 3;
-
-  # Indicate that we are running on build infrastructure
-  # Some tests assume things like home directories and users exists
-  GO_BUILDER_NAME = "nix";
-
-  GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
-
-  postConfigure = ''
-    export GOCACHE=$TMPDIR/go-cache
-    # this is compiled into the binary
-    export GOROOT_FINAL=$out/share/go
-
-    export PATH=$(pwd)/bin:$PATH
-
-    # Independent from host/target, CC should produce code for the building system.
-    export CC=${buildPackages.stdenv.cc}/bin/cc
-    ulimit -a
-  '';
-
-  postBuild = ''
-    (cd src && ./make.bash)
-  '';
-
-  doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
-
-  checkPhase = ''
-    runHook preCheck
-    (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
-    runHook postCheck
-  '';
-
-  preInstall = ''
-    rm -r pkg/obj
-    # Contains the wrong perl shebang when cross compiling,
-    # since it is not used for anything we can deleted as well.
-    rm src/regexp/syntax/make_perl_groups.pl
-  '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
-    mv bin/*_*/* bin
-    rmdir bin/*_*
-    ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
-      rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
-    ''}
-  '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
-    rm -rf bin/*_*
-    ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
-      rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
-    ''}
-  '' else "");
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $GOROOT_FINAL
-    cp -a bin pkg src lib misc api doc $GOROOT_FINAL
-    ln -s $GOROOT_FINAL/bin $out/bin
-    runHook postInstall
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  disallowedReferences = [ goBootstrap ];
-
-  meta = with stdenv.lib; {
-    branch = "1.13";
-    homepage = "http://golang.org/";
-    description = "The Go Programming language";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a5ac3065d80..9d25c87a425e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8585,13 +8585,6 @@ in
     buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
   });
 
-  go_1_13 = callPackage ../development/compilers/go/1.13.nix ({
-    inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  } // lib.optionalAttrs stdenv.isAarch64 {
-    stdenv = gcc8Stdenv;
-    buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
-  });
-
   go_1_14 = callPackage ../development/compilers/go/1.14.nix ({
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   } // lib.optionalAttrs stdenv.isAarch64 {
@@ -15230,9 +15223,6 @@ in
   buildGo112Package = callPackage ../development/go-packages/generic {
     go = buildPackages.go_1_12;
   };
-  buildGo113Package = callPackage ../development/go-packages/generic {
-    go = buildPackages.go_1_13;
-  };
   buildGo114Package = callPackage ../development/go-packages/generic {
     go = buildPackages.go_1_14;
   };
@@ -15242,9 +15232,6 @@ in
   buildGo112Module = callPackage ../development/go-modules/generic {
     go = buildPackages.go_1_12;
   };
-  buildGo113Module = callPackage ../development/go-modules/generic {
-    go = buildPackages.go_1_13;
-  };
   buildGo114Module = callPackage ../development/go-modules/generic {
     go = buildPackages.go_1_14;
   };
@@ -20343,9 +20330,7 @@ in
 
   kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
 
-  kubernetes = callPackage ../applications/networking/cluster/kubernetes {
-    go = buildPackages.go_1_13;
-  };
+  kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
 
   kubeseal = callPackage ../applications/networking/cluster/kubeseal { };
 
@@ -25973,10 +25958,7 @@ in
 
   termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {};
 
-  inherit (callPackage ../applications/networking/cluster/terraform {
-    # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287
-    buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage;
-  })
+  inherit (callPackage ../applications/networking/cluster/terraform { })
     terraform_0_11
     terraform_0_11-full
     terraform_0_12

From f6ee88f41e00fb6631e02dcb7153837c0c13b87b Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <b@lambda.icu>
Date: Sat, 25 Apr 2020 10:00:29 +0200
Subject: [PATCH 085/183] babashka: increase java heap space max to 4500

3g has very long build times and also doesn't build 100% of the time
it's also the new default since:
https://github.com/borkdude/babashka/commit/7fc33dcb21c067ea8212e07a55e3ac08c284409f
---
 pkgs/development/interpreters/clojure/babashka.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index 7f94a0695d4e..130eabbee347 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       --no-server \
       --report-unsupported-elements-at-runtime \
       "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \
-      "-J-Xmx3g"
+      "-J-Xmx4500m"
   '';
 
   installPhase = ''

From 9d7f94a3f0aa1cb0df6868a33f0202df37f69df1 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Apr 2020 14:51:34 +0300
Subject: [PATCH 086/183] rofi-file-browser: init at 1.1.1 (#86052)

Co-authored-by: zimbatm <zimbatm@zimbatm.com>
---
 .../misc/rofi-file-browser/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/rofi-file-browser/default.nix

diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix
new file mode 100644
index 000000000000..10453b858491
--- /dev/null
+++ b/pkgs/applications/misc/rofi-file-browser/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }:
+
+stdenv.mkDerivation rec {
+  pname = "rofi-file-browser-extended";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "marvinkreis";
+    repo = pname;
+    rev = version;
+    sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn";
+    fetchSubmodules = true;
+  };
+
+  prePatch = ''
+    substituteInPlace ./CMakeLists.txt \
+      --replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \
+      --replace "/usr/share/" "$out/share/"
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ rofi gtk3 ];
+
+  ROFI_PLUGINS_DIR = "$out/lib/rofi";
+
+  dontUseCmakeBuildDir = true;
+
+  meta = with stdenv.lib; {
+    description = "Use rofi to quickly open files";
+    homepage = "https://github.com/marvinkreis/rofi-file-browser-extended";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d25c87a425e..3316b446b9ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20756,6 +20756,8 @@ in
 
   rofi-emoji = callPackage ../applications/misc/rofi-emoji { };
 
+  rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
+
   ympd = callPackage ../applications/audio/ympd { };
 
   nload = callPackage ../applications/networking/nload { };

From 35812875a4455e2636eb24ddaf702faa4767fafa Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 26 Apr 2020 14:53:06 +0300
Subject: [PATCH 087/183] docs/python: document builders using doInstallCheck
 and not doCheck (#86051)

---
 doc/languages-frameworks/python.section.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index e6f0b64fa9cc..dd989e6cc68f 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1059,6 +1059,11 @@ let
 in newpkgs.inkscape
 ```
 
+If you'd like to disable tests for a particular Python based package built with
+`buildPythonPackage` or `buildPythonApplication`, you'd need to set
+`doInstallCheck = false` and not `doCheck = false` as the later will take no
+effect.
+
 ### `python setup.py bdist_wheel` cannot create .whl
 
 Executing `python setup.py bdist_wheel` in a `nix-shell `fails with

From f56459f7ec83c8afb7c355200c502aa8b0c8affe Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 26 Apr 2020 14:53:44 +0300
Subject: [PATCH 088/183] gpxsee: 7.28 -> 7.29 (#86050)

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 7077b855e3d0..c519bf63e093 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,19 +2,19 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.28";
+  version = "7.29";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0077y5az3hb46rvkqrpl4zxga5wnm85ca6rz1rdpwiwhq4ch9q8y";
+    sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4=";
   };
 
   nativeBuildInputs = [ qmake qttools ];
 
   preConfigure = ''
-    lrelease lang/*.ts
+    lrelease gpxsee.pro
   '';
 
   postInstall = with stdenv; lib.optionalString isDarwin ''

From 73f3469c765b24ec0ab5b2a2108d028806f32069 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 26 Apr 2020 15:11:09 +0300
Subject: [PATCH 089/183] azpainter: 2.1.5 -> 2.1.6 (#86028)

---
 pkgs/applications/graphics/azpainter/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix
index 2f636764e1fc..67f1f47dccd0 100644
--- a/pkgs/applications/graphics/azpainter/default.nix
+++ b/pkgs/applications/graphics/azpainter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ stdenv, fetchFromGitHub
 , libX11, libXext, libXi
 , freetype, fontconfig
 , libpng, libjpeg
@@ -7,17 +7,15 @@
 
 stdenv.mkDerivation rec {
   pname = "azpainter";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "Symbian9";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba";
+    rev = "v${version}";
+    sha256 = "sha256-al87Rnf4HkKdmtN3EqxC0zEHgVWwnVi7WttqT/Qxr0Q=";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-
   buildInputs = [
     libX11 libXext libXi
     freetype fontconfig
@@ -25,14 +23,11 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  configureFlags = [
-    "--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2"
-  ];
-
   meta = with stdenv.lib; {
     description = "Full color painting software for illustration drawing";
     homepage = "https://osdn.net/projects/azpainter";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dtzWill ];
+    platforms = with platforms; linux ++ darwin;
   };
 }

From 579e56fb9eb1ac259baf4badef9652f609cfa507 Mon Sep 17 00:00:00 2001
From: davidak <davidak@users.noreply.github.com>
Date: Sun, 26 Apr 2020 14:12:55 +0200
Subject: [PATCH 090/183] Update commit policy for stable release branches
 (#86026)

only very few people followed the strict policy in the last 5 years. the
maintainers accept backports without reason when it's obvious, so i
updated the policy to reflect that
---
 doc/contributing/submitting-changes.xml | 48 ++++++++++++++++++-------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml
index 73222c1a49ac..a88965f5cc60 100644
--- a/doc/contributing/submitting-changes.xml
+++ b/doc/contributing/submitting-changes.xml
@@ -407,23 +407,47 @@ Additional information.
   <section xml:id="submitting-changes-stable-release-branches">
    <title>Stable release branches</title>
 
-   <itemizedlist>
+   <para>
+    For cherry-picking a commit to a stable release branch (<quote>backporting</quote>), use <literal>git cherry-pick -x &lt;original commit&gt;</literal> so that the original commit id is included in the commit.
+   </para>
+
+   <para>
+    Add a reason for the backport by using <literal>git cherry-pick -xe &lt;original commit&gt;</literal> instead when it is not obvious from the original commit message. It is not needed when it’s a minor version update that includes security and bug fixes but don’t add new features or when the commit fixes an otherwise broken package.
+   </para>
+
+   <para>
+    Here is an example of a cherry-picked commit message with good reason description:
+   </para>
+
+<screen>
+zfs: Keep trying root import until it works
+
+Works around #11003.
+
+(cherry picked from commit 98b213a11041af39b39473906b595290e2a4e2f9)
+
+Reason: several people cannot boot with ZFS on NVMe
+</screen>
+
+   <para>
+    Other examples of reasons are:
+   </para>
+
+   <itemizedlist spacing="compact">
     <listitem>
      <para>
-      If you're cherry-picking a commit to a stable release branch (“backporting”), always use <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch.
+      Previously the build would fail due to, e.g., <literal>getaddrinfo</literal> not being defined
      </para>
+    </listitem>
+    <listitem>
      <para>
-      An example of a cherry-picked commit would look like this:
+      The previous download links were all broken
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Crash when starting on some X11 systems
      </para>
-<screen>
-nixos: Refactor the world.
-
-The original commit message describing the reason why the world was torn apart.
-
-(cherry picked from commit abcdef)
-Reason: I just had a gut feeling that this would also be wanted by people from
-the stone age.
-</screen>
     </listitem>
    </itemizedlist>
   </section>

From 5e4abf76c7e74660369bcb5e2648746db03142c8 Mon Sep 17 00:00:00 2001
From: Maxine Aubrey <35892750+maxeaubrey@users.noreply.github.com>
Date: Sun, 26 Apr 2020 14:13:22 +0200
Subject: [PATCH 091/183] yaru-theme: 20.04.1 -> 20.04.6 (#86019)


From 6b3506458e1752f3d226b924f4407a0422b1cc6f Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 16 Mar 2020 20:15:47 -0400
Subject: [PATCH 092/183] tomcat-native: init at 1.2.23

---
 pkgs/servers/http/tomcat/tomcat-native.nix | 29 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/servers/http/tomcat/tomcat-native.nix

diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix
new file mode 100644
index 000000000000..57ab2a96b4df
--- /dev/null
+++ b/pkgs/servers/http/tomcat/tomcat-native.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, apr, jdk, openssl }:
+
+stdenv.mkDerivation rec {
+  pname = "tomcat-native";
+  version = "1.2.23";
+
+  src = fetchurl {
+    url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
+    sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee";
+  };
+
+  sourceRoot = "${pname}-${version}-src/native";
+
+  buildInputs = [ apr jdk openssl ];
+
+  configureFlags = [
+    "--with-apr=${apr.dev}"
+    "--with-java-home=${jdk}"
+    "--with-ssl=${openssl.dev}"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An optional component for use with Apache Tomcat that allows Tomcat to use certain native resources for performance, compatibility, etc";
+    homepage = "https://tomcat.apache.org/native-doc/";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ aanderse ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04597ad02aed..80ca1d3454a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15667,6 +15667,8 @@ in
 
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
 
+  tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
+
   pies = callPackage ../servers/pies { };
 
   rpcbind = callPackage ../servers/rpcbind { };

From ef964a801ebe3d5e4ccaf682aa4adb5ee4d4e933 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Apr 2020 15:51:20 +0200
Subject: [PATCH 093/183] =?UTF-8?q?coqPackages.coqhammer:=201.1.1=20?=
 =?UTF-8?q?=E2=86=92=201.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add support for Coq 8.11
---
 pkgs/development/coq-modules/coqhammer/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 7d9ec5e7312b..16813ac4f119 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -13,8 +13,12 @@ let
       buildInputs = [ coq.ocamlPackages.camlp5 ];
     };
     "8.10" = {
-      version = "1.1.1";
-      sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df";
+      version = "1.2";
+      sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56";
+    };
+    "8.11" = {
+      version = "1.2";
+      sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy";
     };
   };
   param = params.${coq.coq-version};

From 9cf9e66e6ffb3b3d489ae481ef7aabe86de3a671 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine@chikhaoui.org>
Date: Sun, 26 Apr 2020 09:51:20 -0400
Subject: [PATCH 094/183] ec2-amis.nix: add NixOS 20.03 images

Fixes #85857.
---
 nixos/modules/virtualisation/ec2-amis.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 630c35bd08fc..24de8cf1afbf 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -310,5 +310,24 @@ let self = {
   "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1";
   "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06";
 
-  latest = self."19.09";
+  # 20.03.1554.94e39623a49
+  "20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013";
+  "20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1";
+  "20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd";
+  "20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c";
+  "20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b";
+  "20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85";
+  "20.03".us-east-2.hvm-ebs = "ami-030296bb256764655";
+  "20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741";
+  "20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2";
+  "20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7";
+  "20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7";
+  "20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd";
+  "20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c";
+  "20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45";
+  "20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d";
+  "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
+  "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
+
+  latest = self."20.03";
 }; in self

From ca2fd28d83b86d4d619b532a7622cd87a630df0f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Apr 2020 16:22:33 +0200
Subject: [PATCH 095/183] Revert "docs/python: document builders using
 doInstallCheck and not doCheck (#86051)"

For disabling tests when overriding, use `.overridePythonAttrs`.

Discussion about aliasing `.overridePythonAttrs` to `.overrideAttrs`.
https://github.com/NixOS/nixpkgs/pull/82772

This reverts commit 35812875a4455e2636eb24ddaf702faa4767fafa.
---
 doc/languages-frameworks/python.section.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index dd989e6cc68f..e6f0b64fa9cc 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1059,11 +1059,6 @@ let
 in newpkgs.inkscape
 ```
 
-If you'd like to disable tests for a particular Python based package built with
-`buildPythonPackage` or `buildPythonApplication`, you'd need to set
-`doInstallCheck = false` and not `doCheck = false` as the later will take no
-effect.
-
 ### `python setup.py bdist_wheel` cannot create .whl
 
 Executing `python setup.py bdist_wheel` in a `nix-shell `fails with

From 6617a79ba320b6e47abfd05416a237ec557ae15c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:21:32 -0400
Subject: [PATCH 096/183] linux: 4.14.176 -> 4.14.177

---
 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 5d7337c27f67..6c5d86a0e69e 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.176";
+  version = "4.14.177";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18jwxhf29ax54xnylmz9zfkslnxw7y3h215dbfmmvddfp9b0kbmw";
+    sha256 = "04hq0i06mg2yc09jj2xk0vhf5q9yigzjzm55a5bvfy2a6j43r9rk";
   };
 } // (args.argsOverride or {}))

From 6efb2ba2bf6ad5b80e934934bec53ad37fa0f06c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:22:05 -0400
Subject: [PATCH 097/183] linux: 4.4.219 -> 4.4.220

---
 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 e99375ed62c4..d846a015477f 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.219";
+  version = "4.4.220";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1mpxqb2m24ay4n9px4n2cyklxy4lhnv9q6wlvilx13rs5qfbb62f";
+    sha256 = "1knj3qsl7x3fysdz1h0s980ddbafs3658z2y67w6sn79wp7d8blg";
   };
 } // (args.argsOverride or {}))

From 4883dde6b7d6660ad83e9ef7e1fdee073023b43e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:22:41 -0400
Subject: [PATCH 098/183] linux: 4.9.219 -> 4.9.220

---
 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 78c76d12ddc4..b05a3685c276 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.219";
+  version = "4.9.220";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0i5wlyp11ss9p035bhq73xjx8iyk5dk4ynvd7msw5qfkrs6265vb";
+    sha256 = "0bhbkybzbdsbmrjmb5m7hxxl8b3v6n79zhh86cbr95kzg1hcgnfs";
   };
 } // (args.argsOverride or {}))

From be48bf2ba8fb92cdb02d2d453470f7bf36b46e3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:23:01 -0400
Subject: [PATCH 099/183] linux/hardened-patches/4.14: 4.14.176.a -> 4.14.177.a

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

diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json
index eecb27cdb669..e365199a4bbe 100644
--- a/pkgs/os-specific/linux/kernel/hardened-patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened-patches.json
@@ -1,8 +1,8 @@
 {
     "4.14": {
-        "name": "linux-hardened-4.14.176.a.patch",
-        "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch"
+        "name": "linux-hardened-4.14.177.a.patch",
+        "sha256": "0wiapq4nj16m5ywnz0k7k0fr5hpw2gjy68mjlk6x866rf8vhndrq",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch"
     },
     "4.19": {
         "name": "linux-hardened-4.19.117.a.patch",

From 334627d92fda18682a870cdb152f8185a9fd673d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:23:03 -0400
Subject: [PATCH 100/183] linux/hardened-patches/5.6: 5.6.6.a -> 5.6.7.a

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

diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json
index e365199a4bbe..0f29e9b25d36 100644
--- a/pkgs/os-specific/linux/kernel/hardened-patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened-patches.json
@@ -20,8 +20,8 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch"
     },
     "5.6": {
-        "name": "linux-hardened-5.6.6.a.patch",
-        "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch"
+        "name": "linux-hardened-5.6.7.a.patch",
+        "sha256": "1dnk9df4v2iw05vpn0s8q6b0ci2rzl2wiq77vhr40mpbg6p18fap",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.7.a/linux-hardened-5.6.7.a.patch"
     }
 }

From 4af476e2b3e75dbef3abc85291a2ebbb30f42dba Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:23:05 -0400
Subject: [PATCH 101/183] linux/hardened-patches/5.4: 5.4.34.a -> 5.4.35.a

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

diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json
index 0f29e9b25d36..f072543cac6b 100644
--- a/pkgs/os-specific/linux/kernel/hardened-patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened-patches.json
@@ -10,9 +10,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch"
     },
     "5.4": {
-        "name": "linux-hardened-5.4.34.a.patch",
-        "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch"
+        "name": "linux-hardened-5.4.35.a.patch",
+        "sha256": "0vcqgrzns4d3z93mn8mv0sxkmj7ylbr8prff72c4ssvb0kd7agy9",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.35.a/linux-hardened-5.4.35.a.patch"
     },
     "5.5": {
         "name": "linux-hardened-5.5.19.a.patch",

From a9fa6028adaa37f92efb33c827b27f40617e4cd9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 26 Apr 2020 12:23:07 -0400
Subject: [PATCH 102/183] linux/hardened-patches/4.19: 4.19.117.a -> 4.19.118.a

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

diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json
index f072543cac6b..a87628dd7697 100644
--- a/pkgs/os-specific/linux/kernel/hardened-patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened-patches.json
@@ -5,9 +5,9 @@
         "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch"
     },
     "4.19": {
-        "name": "linux-hardened-4.19.117.a.patch",
-        "sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch"
+        "name": "linux-hardened-4.19.118.a.patch",
+        "sha256": "120lnn9j9zsx1kcq4frcjmj2vj39x0g1yxrrx9nax2yjrzp4wfdw",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.118.a/linux-hardened-4.19.118.a.patch"
     },
     "5.4": {
         "name": "linux-hardened-5.4.35.a.patch",

From 25e4c9db6798252c7989775f51a0eaab760af833 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 24 Apr 2020 13:10:42 +0200
Subject: [PATCH 103/183] cypress: 4.3.0 -> 4.4.1

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

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index b70fa053a1d4..3cb5b96d5887 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
   pname = "cypress";
-  version = "4.3.0";
+  version = "4.4.1";
 
   src = fetchzip {
     url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "0lrjha3zrsclpk8bhmv14vy1y5liahjkvcd87zm6cik1rnscaspw";
+    sha256 = "0da1y90a6i3fjhyrzwwn3pavzbqin9v5v7hx8halz6i7cf1halfi";
   };
 
   # don't remove runtime deps

From 6c1201aa8ca994c1d385985fac5653df7d59a4a7 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sun, 19 Apr 2020 12:12:50 +0200
Subject: [PATCH 104/183] ledger-autosync: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix
index 00c402558613..3a0f362dcf72 100644
--- a/pkgs/applications/office/ledger-autosync/default.nix
+++ b/pkgs/applications/office/ledger-autosync/default.nix
@@ -2,14 +2,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ledger-autosync";
-  version = "1.0.1";
+  version = "1.0.2";
 
 # no tests included in PyPI tarball
   src = fetchFromGitHub {
     owner = "egh";
     repo = "ledger-autosync";
     rev = "v${version}";
-    sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q";
+    sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 0f20af8bd36abb26b79a44bf9ee87692b3ba7397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=BChrk?= <andy@hammerhartes.de>
Date: Fri, 24 Apr 2020 20:57:58 +0200
Subject: [PATCH 105/183] skaffold: 1.6.0 -> 1.8.0

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

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index d1d1200344f8..5534492cf37d 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
 
 buildGoPackage rec {
   pname = "skaffold";
-  version = "1.6.0";
+  version = "1.8.0";
   # rev is the ${version} commit, mainly for skaffold version command output
-  rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0";
+  rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h";
+    sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 9c32e5c495b76f9dee4ce2d5752bd65c9fad9835 Mon Sep 17 00:00:00 2001
From: davidak <davidak@users.noreply.github.com>
Date: Wed, 22 Apr 2020 00:50:51 +0200
Subject: [PATCH 106/183] CONTRIBUTING.md: Improve backport instructions

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

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ae4f68dddc19..cb0264b0167f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -50,12 +50,13 @@ For package version upgrades and such a one-line commit message is usually suffi
 
 ## Backporting changes
 
-To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches):
+Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
 
-1. Take note of the commit in which the change was introduced into `master`.
+1. Take note of the commits in which the change was introduced into `master` branch.
 2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`.
-3. Use `git cherry-pick -x <original commit>`.
-4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`.
+3. Create a branch for your change, e.g. `git checkout -b backport`.
+4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar.
+5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`.
 
 ## Reviewing contributions
 

From 75963b916077eb27cee7bc71133baedcfbfbfccd Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Tue, 17 Mar 2020 08:45:20 +0100
Subject: [PATCH 107/183] kicad: update.sh: set -e

and some more suggestions from veprbl

warn if an empty item gets through anyway

and use UTC time

cc #82634
---
 .../science/electronics/kicad/update.sh       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh
index 7dc0b008b6c2..f048ccde4ec8 100755
--- a/pkgs/applications/science/electronics/kicad/update.sh
+++ b/pkgs/applications/science/electronics/kicad/update.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p coreutils git nix curl
 
+set -e
+
 # this script will generate versions.nix in the right location
 # this should contain the versions' revs and hashes
 # the stable revs are stored only for ease of skipping
@@ -50,12 +52,11 @@ for arg in "$@"; do
 done
 
 here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-now=$(date --iso-8601)
+now=$(date --iso-8601 --utc)
 
 file="${here}/versions.nix"
 # just in case this runs in parallel
-rand="$(head -c 3 /dev/urandom | base64)"
-tmp="${here}/,versions.nix.${rand}"
+tmp="${here}/,versions.nix.${RANDOM}"
 
 # libraries currently on github, move to $gitlab/libraries planned
 libs=( symbols templates footprints packages3d )
@@ -112,16 +113,16 @@ for version in "${all_versions[@]}"; do
 
     echo "Checking src" >&2
     src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)"
-    ret="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}")"
+    has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)"
     has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")"
-    if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then
+    if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
       echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2
       grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1
     else
           printf "%8srev =\t\t\t\"%s\";\n" "" "${src_rev}"
           printf "%8ssha256 =\t\t\"%s\";\n" \
             "" "$(${prefetch} "${gitlab_pre}${src_rev}")"
-          (( count++ ))
+          count=$((count+1))
     fi
         printf "%6s};\n" ""
       printf "%4s};\n" ""
@@ -132,25 +133,25 @@ for version in "${all_versions[@]}"; do
 
         echo "Checking i18n" >&2
         i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)"
-        ret="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}")"
+        has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)"
         has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")"
-        if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then
+        if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
           echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2
           grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1
         else
           printf "%8si18n.rev =\t\t\"%s\";\n" "" "${i18n_rev}"
           printf "%8si18n.sha256 =\t\t\"%s\";\n" "" \
             "$(${prefetch} "${i18n_pre}${i18n_rev}")"
-          (( count++ ))
+          count=$((count+1))
         fi
 
           for lib in "${libs[@]}"; do
             echo "Checking ${lib}" >&2
             url="${github}-${lib}.git"
             lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)"
-            ret="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" -A 1)"
+            has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)"
             has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")"
-            if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then
+            if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
               echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2
               grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1
             else
@@ -161,7 +162,7 @@ for version in "${all_versions[@]}"; do
               printf "\"%s\";\n" "${lib_rev}"
               printf "%8s%s.sha256 =\t\"%s\";\n" "" \
               "${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")"
-              (( count++ ))
+              count=$((count+1))
             fi
           done
         printf "%6s};\n" ""
@@ -175,6 +176,11 @@ done
 printf "}\n"
 } > "${tmp}"
 
+if grep '""' "${tmp}"; then
+	echo "empty value detected, out of space?" >&2
+	exit "1"
+fi
+
 mv "${tmp}" "${file}"
 
 printf "\nFinished\nMoved output to %s\n\n" "${file}" >&2

From b80bd001e2abceac052c3a1fb68551021388383a Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Mon, 30 Mar 2020 04:09:25 +0200
Subject: [PATCH 108/183] kicad-unstable: 2020-02-10 -> 2020-04-25

cc #82634
---
 .../science/electronics/kicad/versions.nix    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index 6b9a981a87c4..174532d69625 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -27,25 +27,25 @@
   };
   "kicad-unstable" = {
     kicadVersion = {
-      version =			"2020-02-10";
+      version =			"2020-04-25";
       src = {
-        rev =			"1190e60dd426d246661e478db3287f266ec6cda2";
-        sha256 =		"0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi";
+        rev =			"3759799d1e03b2da6a0dcd72273e4978880fc8f1";
+        sha256 =		"0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi";
       };
     };
     libVersion = {
-      version =			"2020-02-10";
+      version =			"2020-04-25";
       libSources = {
-        i18n.rev =		"26786c4ca804bad7eb072f1ef381f00b5a2ff3ee";
-        i18n.sha256 =		"0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl";
-        symbols.rev =		"35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7";
-        symbols.sha256 =	"0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64";
-        templates.rev =		"0c0490897f803ab8b7c3dad438b7eb1f80e0417c";
-        templates.sha256 =	"0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
-        footprints.rev =	"9357b6f09312966c57fec9f66a516941d79c3038";
-        footprints.sha256 =	"0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d";
-        packages3d.rev =	"de368eb739abe41dfc3163e0e370477e857f9cc1";
-        packages3d.sha256 =	"0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs";
+        i18n.rev =		"fc14baa52ca56a58b0048ab860bf31887d3cf8eb";
+        i18n.sha256 =		"05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6";
+        symbols.rev =		"0f9ff2d17237f90bb649bf0a52b6d454f68197e8";
+        symbols.sha256 =	"1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5";
+        templates.rev =		"7db8d4d0ea0711f1961d117853547fb3edbc3857";
+        templates.sha256 =	"1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg";
+        footprints.rev =	"61df6d8853b4c68cca0ac87784c0a33cff9394d3";
+        footprints.sha256 =	"0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v";
+        packages3d.rev =	"88bcf2e817fe000bb2c05e14489afc3b1a4e10ed";
+        packages3d.sha256 =	"0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6";
       };
     };
   };

From 2901db8e35ec70d768b94c11403d3323e23eff75 Mon Sep 17 00:00:00 2001
From: Sam Hug <s@m-h.ug>
Date: Fri, 24 Apr 2020 10:53:44 -0700
Subject: [PATCH 109/183] vimPlugins: update

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 1099ca84af5f..3248d568883f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -473,12 +473,12 @@ let
 
   coc-java = buildVimPluginFrom2Nix {
     pname = "coc-java";
-    version = "2020-04-10";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-java";
-      rev = "e4dd6b744f7eb356afa8db7b958bdf5910b5ec6f";
-      sha256 = "0fndkbmi84qgqfj6ny04wm05mnrvrg36bb04vk7zj90k8a51xrrr";
+      rev = "3c914c2b9e154889361d2631cd2188cf7e5fa020";
+      sha256 = "0q7q2z7k2sxqgi6nyj669iq2p4h3962i8hv3gzg2mpi0p73xs98k";
     };
     meta.homepage = "https://github.com/neoclide/coc-java/";
   };
@@ -521,12 +521,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-04-21";
+    version = "2020-04-22";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "fdddbbdbe04cdb077b7a2006c295d7a95343c4bb";
-      sha256 = "0g0zqxmakwmjr9ii0v5rxiyvv3k909lzvkxkw0hyhpdkbpmzjkxl";
+      rev = "b35bb16122d8771c9936f1203d0c712d45017f13";
+      sha256 = "1w9vgxai421j3qbzbm42hq3fyzwf2a9n89y10vj9vhir0q0j8az0";
     };
     meta.homepage = "https://github.com/ckipp01/coc-metals/";
   };
@@ -569,12 +569,12 @@ let
 
   coc-python = buildVimPluginFrom2Nix {
     pname = "coc-python";
-    version = "2020-02-21";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-python";
-      rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8";
-      sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0";
+      rev = "968aec39f74c6f80e6c9c3c0fed51b6113a1a35a";
+      sha256 = "135z48idr8r7604ymiqdsml9z6d3swaja89697znszigpy05nz11";
     };
     meta.homepage = "https://github.com/neoclide/coc-python/";
   };
@@ -593,12 +593,12 @@ let
 
   coc-rls = buildVimPluginFrom2Nix {
     pname = "coc-rls";
-    version = "2019-12-07";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-rls";
-      rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60";
-      sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl";
+      rev = "142353e2f71cb6c1b235db0cf430ca53e211613b";
+      sha256 = "07gkspvh5l25vyny5waiw0y3fm5a8qbrml13r7llgp4lqzzh96bd";
     };
     meta.homepage = "https://github.com/neoclide/coc-rls/";
   };
@@ -617,12 +617,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2020-04-16";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "21f65e0de83936f8db27ce1bc4a93251adfeef5a";
-      sha256 = "1ahh143yq6hb8f3xv5kvj3dy2017yzl9vn31gfabswvdmdjm37in";
+      rev = "cad80795d4abcbbd2aa6da462af1087e9134b4eb";
+      sha256 = "04wk7x148dcw3rx4fh3c7c80qillq0bf9vfdkc9l8xaglk0xh73h";
     };
     meta.homepage = "https://github.com/neoclide/coc-snippets/";
   };
@@ -773,12 +773,12 @@ let
 
   coc-nvim = buildVimPluginFrom2Nix {
     pname = "coc-nvim";
-    version = "2020-04-21";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "1cedc9a852cc7e246665ca1d662bd8978ac5405c";
-      sha256 = "1vqm9s68148715gb5x5xrhl5ajwi881d86hq7906lp7b8gk5d6is";
+      rev = "0d4f02555e5aaecbd8efef47a70ba2f2c6412d1f";
+      sha256 = "0129gr3hsagr1lzngvbgs4bnvj92izxavval0zyxgh68w3vlak42";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -1038,12 +1038,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-04-20";
+    version = "2020-04-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "6d2174645f3a7ab790546940b02024d72296e4c1";
-      sha256 = "0dnnnwr01c4jgjyjnk4hivj4hiyar4j60fy2jc3l91aqd4m845vl";
+      rev = "609c85797a5f6acc2e2357cf56e7f6c78c561145";
+      sha256 = "0rx0nvsyzj1wl7p30g769cidspkq3xpvzpdhz94qfsczdm68yhi0";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
   };
@@ -1692,12 +1692,12 @@ let
 
   iceberg-vim = buildVimPluginFrom2Nix {
     pname = "iceberg-vim";
-    version = "2020-03-06";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
-      rev = "1740235846c92666fe521e550a27fa47ebe5f5a3";
-      sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6";
+      rev = "acf6696e14fd8cfa2ed338076a7c3a68fad42486";
+      sha256 = "1hy9n37nkkax6qdcg23a522bz26r8b23w9kj570qml9v3ck4ihqm";
     };
     meta.homepage = "https://github.com/cocopon/iceberg.vim/";
   };
@@ -1873,12 +1873,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2020-04-17";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "34c24ee0f8476dfc573e22f9f6a6fe4eec466225";
-      sha256 = "0yy50yb28md5z2yzcaq45cchd8c44q12xvwcb2yh3r9nhgqhll2h";
+      rev = "c97e5cfb6ef20b725f859af694bec9c6a3a44145";
+      sha256 = "1349v5lhc4dg7ir42jj157jyf29bm7pj73h64n2501ddqdkb1zqd";
     };
     meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
   };
@@ -2269,12 +2269,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2020-03-20";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf";
-      sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d";
+      rev = "7af08e5a80c095a836d3f6762b991c6f9c4f2f2f";
+      sha256 = "17llh2jh2igkbjmnbii54g4x9g57y6xflh8d40wim980pb3jr57s";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
   };
@@ -2353,12 +2353,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2020-04-20";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "e3ece229fc0f26cb114f629faa2dc979e16e8e8a";
-      sha256 = "1g823p6qvxvxv5l9f3lb0dyf9pzrr7i3qw8n1rqfs2w0xipj6arl";
+      rev = "48900bd6a008120aeb33e3807f1d2c18985ad210";
+      sha256 = "1x788nrrxaa12cqsdi2gdx2haxji3v4rahpxjq309kd5s40m9z2j";
     };
     meta.homepage = "https://github.com/kassio/neoterm/";
   };
@@ -2521,12 +2521,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-04-21";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "39b743b9b36be26a5e58278d7608fe456a0ad3f8";
-      sha256 = "15q7d0qxdvvn79rwy87aiynilxn8vcnym2w252x1p3s4wqsx1psi";
+      rev = "d1507239df1d9f2758f1ad75634046c4d024cfd8";
+      sha256 = "00smhjk73xwzmxqjwqi1srmfbirl065gii65gj1lhfi6vha7h9k1";
     };
     meta.homepage = "https://github.com/neovim/nvim-lsp/";
   };
@@ -3229,12 +3229,12 @@ let
 
   tagbar = buildVimPluginFrom2Nix {
     pname = "tagbar";
-    version = "2020-01-23";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "majutsushi";
       repo = "tagbar";
-      rev = "679a9d9ac9579bd18225409d85ed4870fb6c9c62";
-      sha256 = "1s4736104vfaj7rfcdzcnmgbnxxi0ngs07km0p2fi1m2zc68602l";
+      rev = "1e50ea85361b7144acad459eb091973089b780f6";
+      sha256 = "09w7vwzacny6kbf9s2ihan8k682qljp8zad1dh5ds0738a3nwxpl";
     };
     meta.homepage = "https://github.com/majutsushi/tagbar/";
   };
@@ -3277,12 +3277,12 @@ let
 
   tender-vim = buildVimPluginFrom2Nix {
     pname = "tender-vim";
-    version = "2020-02-18";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
-      rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2";
-      sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq";
+      rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1";
+      sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z";
     };
     meta.homepage = "https://github.com/jacoborus/tender.vim/";
   };
@@ -3506,12 +3506,12 @@ let
 
   vim = buildVimPluginFrom2Nix {
     pname = "vim";
-    version = "2020-04-18";
+    version = "2020-04-22";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "6a8cd0f825c3d7b071ebd0dce81a7707ec0be652";
-      sha256 = "1qyqc7j8sdq3xnp871hgxdgxypkm8v5mfri2r89b0ydchrd15b2l";
+      rev = "043518d3a9c48049bc0ae0af72dcbb239bf1d36d";
+      sha256 = "0v25yk0d4488yn1yvzkpcqh8ldx51q4hbfn678vkr9ga5i0nkkwp";
     };
     meta.homepage = "https://github.com/dracula/vim/";
   };
@@ -3758,12 +3758,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-04-20";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "eff4828b37d7f631aaec0465a315d627651b9037";
-      sha256 = "1rm8kd90sf00sdgr8pqcansyrmrwsqd4v1fkyy7zl9x2jgrxkbrh";
+      rev = "ff3f66ed30fbab70af1f37c8532327bd9617f7c7";
+      sha256 = "1gppy9lk9vyxrqyb9lxvvl8nl31ha5mjwvhlang8g69j2vqpxikr";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -4502,12 +4502,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-04-12";
+    version = "2020-04-21";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "85e2c73830b6bb01ce7fc3a926d2b25836a253eb";
-      sha256 = "1zbw8cnjl9m59grr65kfkgi8p4850rjp24f1plp4jhidjmsfhv7x";
+      rev = "05bbfcd0dc24088f302e7221c7ec000d0ee62982";
+      sha256 = "1yrfci26yr02s2728jlk4bd29g1abh8dwps8q9l1pk93rzlchisc";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -4562,12 +4562,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-04-18";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "2b62481d388c5e0e1dd11e74377523fdb98b6ac4";
-      sha256 = "1x6x6wp1ggn2whrm5mi7wyz5b88syc4yvncgs8bjhbrc636psqhq";
+      rev = "6b46098b2a83becda06586d7c430ffdc4a27db88";
+      sha256 = "0q8yvjgxvfjd40f3pspv2kzdcz45q242jfpl948mw74arl0121g8";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
   };
@@ -4598,12 +4598,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-04-19";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "07869cdfb066dcb287673eee3effb30021a970b8";
-      sha256 = "1gmfvlysy7s0rh3lwpq9fym59nfwm64grcfrrhf2d9gzvwip9326";
+      rev = "b7edb21cc518a5404b16997df056d560b6ae067f";
+      sha256 = "1acwh0kqk7vy0p5vinmm42c4map4qara0590yd6mzc3ym0zyjvi0";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -4898,12 +4898,12 @@ let
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     pname = "vim-javacomplete2";
-    version = "2019-12-17";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "dc7951895a98c49c39622f65cdd7b39374c348bc";
-      sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy";
+      rev = "3ebc63c4b79eec08eb81bdddc8f4c7cfe9cb702f";
+      sha256 = "0dwgqnjcnnyvmrplbxkzmfyrm0rgd4z5kgx5989c528gp0dwhaja";
     };
     meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
   };
@@ -5979,12 +5979,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-04-20";
+    version = "2020-04-21";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "dbfffb971b46bfb9bc90763d4ccad97e3277cd7b";
-      sha256 = "0rmpf1lrrq57pai2vn0q9qig73kdq7l54iar1qk46f7wxy3wi1dw";
+      rev = "ad4407f31bf170b0813fb9b03f851cf79b5f65ca";
+      sha256 = "0nr7xq5kz94fm578ds84pd3ydbhfbxs6r4fc5250anmazip2h2cw";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
   };
@@ -6075,12 +6075,12 @@ let
 
   vim-subversive = buildVimPluginFrom2Nix {
     pname = "vim-subversive";
-    version = "2020-04-10";
+    version = "2020-04-22";
     src = fetchFromGitHub {
       owner = "svermeulen";
       repo = "vim-subversive";
-      rev = "4a2020248c8a09950b7e1a2cd864ffb88826572c";
-      sha256 = "0pqrb3hz1hjl42khn4691s3ajlswk6nms43hdbglj679y28bkzfi";
+      rev = "9db5f782be230368a3a81a21d3eb93678f7523ae";
+      sha256 = "0igv2yf1h1ajnv9c0z02pvgqciighwc1y53c9ahfqwxd58kpi5fj";
     };
     meta.homepage = "https://github.com/svermeulen/vim-subversive/";
   };
@@ -6291,12 +6291,12 @@ let
 
   vim-tmux-navigator = buildVimPluginFrom2Nix {
     pname = "vim-tmux-navigator";
-    version = "2019-12-10";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306";
-      sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac";
+      rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b";
+      sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d";
     };
     meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";
   };
@@ -6651,12 +6651,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-04-20";
+    version = "2020-04-23";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "f029f673b259206bb04ca71b97e68d9635b1c4ee";
-      sha256 = "16m7ab5sy0gb900bf6ydynm1bhi11w60qmscqc66cmmb2hjz0iq2";
+      rev = "3e2bf3f27ad7253767eefe0b4c4e551c602d5d77";
+      sha256 = "1pxkim0mh691lb8clv1828nhs4cqzf8s3vkmynq7164mzvrf77sh";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -6699,12 +6699,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-04-19";
+    version = "2020-04-24";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "02b128dd37a63f82732c3a0a9db9b24430ad56af";
-      sha256 = "1zmf9yrpxynbvajkv52z3njgzh89j4qx6w8ppnl7bkf4r85k09hl";
+      rev = "48631457714b6a611b96ad4785ec16a98b639515";
+      sha256 = "05zabbnrxbgnymp6iyc6gmfj3sk752679kvyzk5jiraksi32djiw";
     };
     meta.homepage = "https://github.com/liuchengxu/vista.vim/";
   };

From c0872bfc286797b5022a268bda3f3ed4e25594f8 Mon Sep 17 00:00:00 2001
From: Sam Hug <s@m-h.ug>
Date: Sun, 26 Apr 2020 00:50:46 -0700
Subject: [PATCH 110/183] nodePackages.coc-rust-analyzer: init at 0.5.5

---
 .../node-packages/node-packages-v10.json       |  1 +
 .../node-packages/node-packages-v10.nix        | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 177b7fdf12d3..9ea5b2ec15d9 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -35,6 +35,7 @@
 , "coc-python"
 , "coc-r-lsp"
 , "coc-rls"
+, "coc-rust-analyzer"
 , "coc-smartf"
 , "coc-snippets"
 , "coc-solargraph"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 434cc707babb..95edbef44e34 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -54491,6 +54491,24 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  coc-rust-analyzer = nodeEnv.buildNodePackage {
+    name = "coc-rust-analyzer";
+    packageName = "coc-rust-analyzer";
+    version = "0.5.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.5.5.tgz";
+      sha512 = "l44UBTzSWkEL/uHb5GCR5m6HnheJmuJFbYqqJ+5n6Q+PJIpKSyzyNgMiC3nmsOWCT6W3Js83s1i6zTAu8Zy8LA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim";
+      homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   coc-smartf = nodeEnv.buildNodePackage {
     name = "coc-smartf";
     packageName = "coc-smartf";

From 59087de17b74867c693a64274b10653eb65a5704 Mon Sep 17 00:00:00 2001
From: Sam Hug <s@m-h.ug>
Date: Fri, 24 Apr 2020 11:42:22 -0700
Subject: [PATCH 111/183] vimPlugins.coc-rust-analyzer: init at 2020-04-24

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/overrides.nix    |  6 ++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3248d568883f..f0d93572de59 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -603,6 +603,17 @@ let
     meta.homepage = "https://github.com/neoclide/coc-rls/";
   };
 
+  coc-rust-analyzer = buildVimPluginFrom2Nix {
+    pname = "coc-rust-analyzer";
+    version = "2020-04-24";
+    src = fetchFromGitHub {
+      owner = "fannheyward";
+      repo = "coc-rust-analyzer";
+      rev = "1dcdf6768520bff29921c50ef904478cbdfe0fb8";
+      sha256 = "1p6hyixx9bjpyy42g2w4bnxwv9hafs5ppsx1fq8gndnq3nsjcyl3";
+    };
+  };
+
   coc-smartf = buildVimPluginFrom2Nix {
     pname = "coc-smartf";
     version = "2019-07-26";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 66e956a0f16e..4d5b532216d2 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -229,6 +229,12 @@ self: super: {
     src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls";
   };
 
+  coc-rust-analyzer = buildVimPluginFrom2Nix {
+    pname = "coc-rust-analyzer";
+    version = nodePackages.coc-rust-analyzer.version;
+    src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer";
+  };
+
   coc-smartf = buildVimPluginFrom2Nix {
     pname = "coc-smartf";
     version = nodePackages.coc-smartf.version;
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 9a854d58b08d..4af22bd833ee 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -97,6 +97,7 @@ enomsg/vim-haskellConcealPlus
 ensime/ensime-vim
 ervandew/supertab
 esneider/YUNOcommit.vim
+fannheyward/coc-rust-analyzer
 farmergreg/vim-lastplace
 fatih/vim-go
 FelikZ/ctrlp-py-matcher

From 5adfa39a99073ea2be01a8e38656823bb3210605 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 26 Apr 2020 19:33:54 +0100
Subject: [PATCH 112/183] elpa-packages: 2020-04-26

---
 .../editors/emacs-modes/elpa-generated.nix    | 96 ++++++++++++-------
 1 file changed, 63 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9ae07c1c900c..e0e28f53b816 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -925,10 +925,10 @@
       elpaBuild {
         pname = "ebdb";
         ename = "ebdb";
-        version = "0.6.13";
+        version = "0.6.16";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar";
-          sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr";
+          url = "https://elpa.gnu.org/packages/ebdb-0.6.16.tar";
+          sha256 = "0yn0nqjp68kwlrd4qs9fg3xizm9jnddkkyw25l0llq04b53zgjdl";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -1005,10 +1005,10 @@
       elpaBuild {
         pname = "eglot";
         ename = "eglot";
-        version = "1.5";
+        version = "1.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eglot-1.5.tar";
-          sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i";
+          url = "https://elpa.gnu.org/packages/eglot-1.6.tar";
+          sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx";
         };
         packageRequires = [ emacs flymake jsonrpc ];
         meta = {
@@ -1367,10 +1367,10 @@
       elpaBuild {
         pname = "gnorb";
         ename = "gnorb";
-        version = "1.6.5";
+        version = "1.6.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar";
-          sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc";
+          url = "https://elpa.gnu.org/packages/gnorb-1.6.6.tar";
+          sha256 = "1vlb9q7a622qylrgip5ld2yrzp4l58gl543i2jdxr7jxvamy22bp";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2011,10 +2011,10 @@
       elpaBuild {
         pname = "modus-operandi-theme";
         ename = "modus-operandi-theme";
-        version = "0.6.0";
+        version = "0.7.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el";
-          sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v";
+          url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.7.0.el";
+          sha256 = "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2026,10 +2026,10 @@
       elpaBuild {
         pname = "modus-vivendi-theme";
         ename = "modus-vivendi-theme";
-        version = "0.6.0";
+        version = "0.7.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el";
-          sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2";
+          url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.7.0.el";
+          sha256 = "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2215,10 +2215,10 @@
       elpaBuild {
         pname = "oauth2";
         ename = "oauth2";
-        version = "0.12";
+        version = "0.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/oauth2-0.12.el";
-          sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29";
+          url = "https://elpa.gnu.org/packages/oauth2-0.13.el";
+          sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r";
         };
         packageRequires = [];
         meta = {
@@ -2320,10 +2320,10 @@
       elpaBuild {
         pname = "orgalist";
         ename = "orgalist";
-        version = "1.11";
+        version = "1.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/orgalist-1.11.el";
-          sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl";
+          url = "https://elpa.gnu.org/packages/orgalist-1.12.el";
+          sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2455,10 +2455,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.3.38";
+        version = "0.3.43";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar";
-          sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.3.43.tar";
+          sha256 = "099s7c0ll8bbfgynijjaciv2qnyg4r2akajkhlmchh7y10kp5ii4";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2500,10 +2500,10 @@
       elpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "0.6.0";
+        version = "0.7.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-0.6.0.el";
-          sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d";
+          url = "https://elpa.gnu.org/packages/posframe-0.7.0.el";
+          sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2575,10 +2575,10 @@
       elpaBuild {
         pname = "rainbow-mode";
         ename = "rainbow-mode";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el";
-          sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339";
+          url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el";
+          sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg";
         };
         packageRequires = [];
         meta = {
@@ -2857,6 +2857,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "scanner";
+        ename = "scanner";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/scanner-0.1.tar";
+          sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/scanner.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "scroll-restore";
@@ -2947,6 +2962,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "sm-c-mode";
+        ename = "sm-c-mode";
+        version = "1.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el";
+          sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "smalltalk-mode";
@@ -3539,10 +3569,10 @@
       elpaBuild {
         pname = "web-server";
         ename = "web-server";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar";
-          sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n";
+          url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar";
+          sha256 = "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim";
         };
         packageRequires = [ emacs ];
         meta = {

From 8c65a2f1de8b5c9afddd217f3ed425eae5e1399e Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 26 Apr 2020 19:47:27 +0100
Subject: [PATCH 113/183] melpa-packages:  2020-04-26

---
 .../editors/emacs-modes/melpa-packages.nix    |  108 +-
 .../emacs-modes/recipes-archive-melpa.json    | 5614 ++++++++++-------
 2 files changed, 3434 insertions(+), 2288 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f5c77bd09fd0..39148c8fc6e5 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -164,36 +164,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         ivy-rtags = fix-rtags super.ivy-rtags;
 
-        mandoku = super.mandoku.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
-        mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         magit = super.magit.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-        magit-circleci = super.magit-circleci.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
-        magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         magit-find-file = super.magit-find-file.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
@@ -224,30 +200,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-        magit-p4 = super.magit-p4.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
-        magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
-        magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
-        magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or []) ++ [ external.git ];
-        });
-
         magit-stgit = super.magit-stgit.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
@@ -314,12 +266,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
-        kapacitor = super.kapacitor.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 =
@@ -478,6 +424,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
           packageRequires = with self; [ evil highlight ];
         });
 
+        kapacitor = super.kapacitor.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         forge = super.forge.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
@@ -486,6 +438,54 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         helm-rtags = fix-rtags super.helm-rtags;
 
+        mandoku = super.mandoku.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-p4 = super.magit-p4.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-rbr = super.magit-rbr.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: {
+          # searches for Git at build time
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
+        magit-circleci = super.magit-circleci.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
diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index b512d5f5c751..2224c44f9c49 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,11 +31,11 @@
   "url": "https://git.sr.ht/~zge/nullpointer-emacs",
   "unstable": {
    "version": [
-    20200313,
-    1542
+    20200411,
+    1227
    ],
-   "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610",
-   "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28"
+   "commit": "59136313132c08ab5fddaa875f6abeb22916a04b",
+   "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y"
   },
   "stable": {
    "version": [
@@ -67,17 +67,17 @@
  },
  {
   "ename": "2048-game",
-  "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
-  "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0",
-  "fetcher": "bitbucket",
-  "repo": "zck/2048.el",
+  "commit": "d3828ad7599d13728b5571b882344c3ada434b85",
+  "sha256": "0i7g7fg21ndpfbdydij3fb683pqgd1sicb7x6rradbc8jpmcf5sq",
+  "fetcher": "hg",
+  "url": "https://hg.sr.ht/~zck/game-2048",
   "unstable": {
    "version": [
-    20151026,
-    1933
+    20200417,
+    259
    ],
-   "commit": "ea6c3bce8ac1c17dae5ac711ae4e931c0495e455",
-   "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l"
+   "commit": "aad4a590ea91f9a3256233b9b345e9159c6993f2",
+   "sha256": "1jd50m5w0g0yplzms4qvkxx16f7xsbm9h7sdrw1p130gbij252l3"
   }
  },
  {
@@ -960,8 +960,8 @@
     "auto-complete",
     "yasnippet"
    ],
-   "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152",
-   "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q"
+   "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2",
+   "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x"
   },
   "stable": {
    "version": [
@@ -986,8 +986,8 @@
   "repo": "xcwen/ac-php",
   "unstable": {
    "version": [
-    20200103,
-    656
+    20200425,
+    835
    ],
    "deps": [
     "dash",
@@ -997,8 +997,8 @@
     "s",
     "xcscope"
    ],
-   "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152",
-   "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q"
+   "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2",
+   "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x"
   },
   "stable": {
    "version": [
@@ -1064,8 +1064,8 @@
     "auto-complete",
     "rtags"
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -1212,11 +1212,11 @@
   "repo": "tam17aki/ace-isearch",
   "unstable": {
    "version": [
-    20200205,
-    1105
+    20200420,
+    518
    ],
-   "commit": "cb6d7306cb5d2d4d36cb3803c0eaf779d88c2666",
-   "sha256": "1lrgjz7a4s50shc74kx6k958i1ayv5pfncsrjb3n87bvrx9wq6g3"
+   "commit": "58e4f1ad5cbbd2f86d161881d3f3ded3a3db984c",
+   "sha256": "0mlswnyd89ir060kiinzlrh70mdy8nfm2zpwr9jj2p19hrslmc4r"
   },
   "stable": {
    "version": [
@@ -1563,32 +1563,30 @@
   "repo": "pauldub/activity-watch-mode",
   "unstable": {
    "version": [
-    20200130,
-    805
+    20200416,
+    637
    ],
    "deps": [
     "cl-lib",
     "json",
-    "projectile",
     "request"
    ],
-   "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b",
-   "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx"
+   "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc",
+   "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    3,
+    0
    ],
    "deps": [
     "cl-lib",
     "json",
-    "projectile",
     "request"
    ],
-   "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b",
-   "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx"
+   "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc",
+   "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y"
   }
  },
  {
@@ -1819,14 +1817,14 @@
   "repo": "Malabarba/aggressive-indent-mode",
   "unstable": {
    "version": [
-    20190828,
-    1828
+    20200421,
+    1149
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985",
-   "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd"
+   "commit": "58348d29adf8d2f23da2798badd7f89ff59cd7cc",
+   "sha256": "1d9hi36ml449x7qqpvcgxqx0r88jpqf1pq9k38af66ny3vd6zwl6"
   },
   "stable": {
    "version": [
@@ -1894,11 +1892,11 @@
   "repo": "ralesi/ahk-mode",
   "unstable": {
    "version": [
-    20191221,
-    2202
+    20200412,
+    1832
    ],
-   "commit": "377f79484cc43458f66c1ba5a61459b77e363591",
-   "sha256": "0vf9pg2yjldzm4nzvzw0w2cvrnxj4xpm3ymsnpzdd55mp7q3y1ag"
+   "commit": "729007b5f22a49f5187ff47fca18c0d674e73047",
+   "sha256": "0989iva0igmd3y61hihwnc7mhn11midimrnbpvq7d062iy7g4vaw"
   },
   "stable": {
    "version": [
@@ -1942,11 +1940,11 @@
   "repo": "skeeto/emacs-aio",
   "unstable": {
    "version": [
-    20190601,
-    753
+    20200410,
+    1409
    ],
-   "commit": "0e8a18f1bbb5f7be0f88d8e02ef13494736d63bc",
-   "sha256": "1aikvka4s97p5s26vclrnamgj8agx1j8ls6q3x7mxf8mhpv4ghqz"
+   "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd",
+   "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1"
   },
   "stable": {
    "version": [
@@ -1965,14 +1963,14 @@
   "repo": "AnthonyDiGirolamo/airline-themes",
   "unstable": {
    "version": [
-    20180411,
-    406
+    20200408,
+    2114
    ],
    "deps": [
     "powerline"
    ],
-   "commit": "8b528fbae0e557461315bed82883275d58df41f2",
-   "sha256": "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9"
+   "commit": "d81ec80d6fc36157c20015e9fd6b192cfc679035",
+   "sha256": "0h9iximw1n5pwfd8zfn1xx4dcrsvxcy8rmr2ng20kl8bflir3i6s"
   },
   "stable": {
    "version": [
@@ -2242,14 +2240,14 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20200326,
-    1553
+    20200411,
+    520
    ],
    "deps": [
     "memoize"
    ],
-   "commit": "f6cbb51c152dd60be5718218600a4ec14d9fd6cc",
-   "sha256": "0a59m1vv0s7czsccfalqyyp3v4lhydn1wbvyxkzy8i9fsjqbyxsa"
+   "commit": "0b74fc361817e885580c3f3408079f949f5830e1",
+   "sha256": "0y7wgwkspa800pck4ijyzgp3nrg8xkky079k1ywz7p04jqvgxrpp"
   },
   "stable": {
    "version": [
@@ -2272,14 +2270,14 @@
   "repo": "jtbm37/all-the-icons-dired",
   "unstable": {
    "version": [
-    20200327,
-    758
+    20200403,
+    1018
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "816987d339630e43f77a5a64ef308e95d341dda7",
-   "sha256": "01wgxdw222pz2sv7x9jwlislkasaw01bkq1nkpdp4jwl816aza8l"
+   "commit": "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5",
+   "sha256": "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp"
   }
  },
  {
@@ -2531,15 +2529,15 @@
   "repo": "zwild/ammonite-term-repl",
   "unstable": {
    "version": [
-    20190618,
-    1517
+    20200416,
+    559
    ],
    "deps": [
     "s",
     "scala-mode"
    ],
-   "commit": "9b3fe36654f03f6ab461bbec413f9ea014829a49",
-   "sha256": "09n9b1zkhaq0ikbgklnlxpgyyjf8hs9f7dcpgx5jjwi4pj0wzvi9"
+   "commit": "b552fe21977e005c1c460bf6607557e67241a6b6",
+   "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6"
   }
  },
  {
@@ -2595,14 +2593,14 @@
   "repo": "stardiviner/amread-mode",
   "unstable": {
    "version": [
-    20200322,
-    843
+    20200404,
+    1143
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "76ebe8d56b4d19f2bf75f54479f0e7ecc9cbaac9",
-   "sha256": "09jmllb9an992mzgncxral8i7j532l8i80yvvqwaqwv9azwab5sd"
+   "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce",
+   "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj"
   }
  },
  {
@@ -2613,14 +2611,14 @@
   "repo": "DarwinAwardWinner/amx",
   "unstable": {
    "version": [
-    20200215,
-    1901
+    20200417,
+    1513
    ],
    "deps": [
     "s"
    ],
-   "commit": "e512e74e8368f9b1cf83bee16dd2522f3b1dbeea",
-   "sha256": "08vx7rd36j4ls7a7i2vn7mf74vbzcyrzzv0wzqzyb8ihv4qhjc0g"
+   "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d",
+   "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc"
   },
   "stable": {
    "version": [
@@ -2670,6 +2668,37 @@
    "sha256": "1vydyyxd5n0pz0jlib3yvw8vnklp15nvyyj7qkm4wcyssi70q1rf"
   }
  },
+ {
+  "ename": "anakondo",
+  "commit": "197ff9f72a46a5732495d97c6b0ecb526e6995f4",
+  "sha256": "14kypppdgvzj2plydcpd22b9wpkircr0nc6gs4rcw416h157l2bv",
+  "fetcher": "github",
+  "repo": "didibus/anakondo",
+  "unstable": {
+   "version": [
+    20200426,
+    28
+   ],
+   "deps": [
+    "projectile"
+   ],
+   "commit": "50ca8b69e0e53e4163215f3fcc325620b4d5d5af",
+   "sha256": "1sy0hxrj1vffqcwl5l48hl9yq4qswwjfgcc4445lairfycd4l9m7"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "json",
+    "projectile"
+   ],
+   "commit": "6ba040e6af4466949dcad2b4a47069705f200322",
+   "sha256": "05j9x11hy8wzq1fbbal1y1wzkw6h98l9pp8q0qmarg0lb6hjk52x"
+  }
+ },
  {
   "ename": "anaphora",
   "commit": "8505db1945071a15ba0f2bb74b58d4a6875ca7d6",
@@ -2845,8 +2874,8 @@
   "repo": "davidshepherd7/anki-mode",
   "unstable": {
    "version": [
-    20191020,
-    1441
+    20200413,
+    1019
    ],
    "deps": [
     "dash",
@@ -2854,8 +2883,8 @@
     "request",
     "s"
    ],
-   "commit": "8022fbab57c47581102af831b4405fc27f71db92",
-   "sha256": "1nyiqd3093dbcimljj09vidanki6nbrzknzdxw4rkbl2kd1wfvlf"
+   "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d",
+   "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr"
   },
   "stable": {
    "version": [
@@ -2930,11 +2959,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20200317,
-    1703
+    20200330,
+    1640
    ],
-   "commit": "44b378b16ad407c36e8cf728e671c17116d854b6",
-   "sha256": "1xhmgadi4maci25si3mf854d0ammz7w9l317r4m81v1gkdfvv8wi"
+   "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2",
+   "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw"
   },
   "stable": {
    "version": [
@@ -3206,11 +3235,11 @@
   "repo": "emacsorphanage/anzu",
   "unstable": {
    "version": [
-    20200328,
-    2019
+    20200331,
+    1717
    ],
-   "commit": "61cb32aa61f9bd088c519ea3cc96b81e241efed7",
-   "sha256": "1b2zjich6mvypycsrz5jkpv5mbaj77jka17vcc5ss2390dad92f8"
+   "commit": "3e34fb3df53c0c68e842fa179c327a7395d1901d",
+   "sha256": "10jgh1mg8bxmpgaspsmqksgf3cqw9glap84cb9sdirvicsmisbsd"
   },
   "stable": {
    "version": [
@@ -3271,20 +3300,20 @@
   "repo": "dieter-wilhelm/apdl-mode",
   "unstable": {
    "version": [
-    20200329,
-    2024
+    20200417,
+    857
    ],
-   "commit": "af7764828555486a78727194a001193d03dc12f0",
-   "sha256": "1p5w7kzmmsc3ayh4rvmd0a9g9wchvddhr22dx3jl7dx42s3sig5m"
+   "commit": "2fcf73e0d522e88e99813c84ac1c07f8a83b1e77",
+   "sha256": "1kfzvgxf34a1wdiiwv4q6bix24avdiwkldxbypkpw57sbrarwiva"
   },
   "stable": {
    "version": [
     20,
-    3,
+    4,
     0
    ],
-   "commit": "17bbc63239d2b791887c3d263fa7b4e8ea9d0ccb",
-   "sha256": "0g9nf0853c56w8vpzys4rxw6ki887ajr3h7cgqb295aa16bg65x7"
+   "commit": "03d4d55f5d44584d6de50033cdc1b1bc87db83a3",
+   "sha256": "0yv3l3j3syn2i4ff9rvsx7a2vp7mv7p9y08dzcvl6km1909adzc6"
   }
  },
  {
@@ -4632,14 +4661,14 @@
   "repo": "rranelli/auto-package-update.el",
   "unstable": {
    "version": [
-    20180712,
-    2045
+    20200421,
+    309
    ],
    "deps": [
     "dash"
    ],
-   "commit": "55870d313fbe9db40b1a2b59dbc420ba66a9297e",
-   "sha256": "06hnr7id7w774adip0yffxh6c2xk27j2kch03r8y0v19mnfrvb39"
+   "commit": "cf7f7486ed699f2ed7cc8af950740aece0de6124",
+   "sha256": "14sq8p3qbhlfmpisanjxpginiibngmb84mjga97aq5sgpxy38wix"
   },
   "stable": {
    "version": [
@@ -4790,7 +4819,7 @@
    "deps": [
     "f"
    ],
-   "commit": "bfad607be640bed3a107e36c91b091e136c1c9ec",
+   "commit": "22cd3dd6d3206cdab5c72792479a8f7f04a2b3e9",
    "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4"
   }
  },
@@ -4822,16 +4851,16 @@
   "repo": "robert-zaremba/auto-virtualenvwrapper.el",
   "unstable": {
    "version": [
-    20191120,
-    1159
+    20200416,
+    1128
    ],
    "deps": [
     "cl-lib",
     "s",
     "virtualenvwrapper"
    ],
-   "commit": "6380e8986d593655021f7f884d0d21895d7e63ad",
-   "sha256": "18k7azy456l7qizn3xnpb2dkj58gfrxy5q77dwplgakyvkr13y8p"
+   "commit": "f33e8c40e53c247ee6a4fd90af8805a9806735a1",
+   "sha256": "0hxwlm364xq66rp8izv0x09r37pg9kiddik0xbss736fdlw0sx4z"
   }
  },
  {
@@ -4909,11 +4938,11 @@
   "url": "https://git.sr.ht/~zge/autocrypt",
   "unstable": {
    "version": [
-    20200327,
-    1958
+    20200330,
+    2301
    ],
-   "commit": "f970fb51c80d582dcc6682106388d6a870ef2c83",
-   "sha256": "0qfawvnjyc0rrvr5zhkq7ngllrf5h9z3wsi2a75s74545d6nyyjq"
+   "commit": "a16bf93ba833264b10d19abfa8fa684d9be32081",
+   "sha256": "119nii5qdds53cmwz3f8rl7f4k5l783h6k6ahizdawy4rf54xfz4"
   }
  },
  {
@@ -5125,14 +5154,14 @@
   "repo": "abo-abo/avy",
   "unstable": {
    "version": [
-    20200311,
-    1106
+    20200422,
+    1153
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3bf83140fad4c28f2dc4c7107b9d8fef84d17cb9",
-   "sha256": "1zicf7xynvxdx0pvg0zshvllabmjprvprjgg54phcbqlilcrq0hk"
+   "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd",
+   "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj"
   },
   "stable": {
    "version": [
@@ -5319,11 +5348,11 @@
   "url": "https://bitbucket.org/pdo/axiom-environment",
   "unstable": {
    "version": [
-    20200109,
-    2207
+    20200411,
+    1031
    ],
-   "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f",
-   "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67"
+   "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164",
+   "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
   }
  },
  {
@@ -5569,20 +5598,20 @@
   "url": "https://git.sr.ht/~zge/bang",
   "unstable": {
    "version": [
-    20200325,
-    1053
+    20200414,
+    1123
    ],
-   "commit": "11e121aed7f5fe90700bd3f49d987bff0a796c2d",
-   "sha256": "0y6rdfhywjp0d4l39hjhlzzwp64wgd3xrvr80c2f6xbc74c6l5hk"
+   "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db",
+   "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
-   "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9",
-   "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48"
+   "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db",
+   "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls"
   }
  },
  {
@@ -5661,11 +5690,11 @@
   "repo": "belak/base16-emacs",
   "unstable": {
    "version": [
-    20191031,
-    1607
+    20200414,
+    2048
    ],
-   "commit": "9eba6874c80ab429bf5cbf6c76bb0399d3d2a2cb",
-   "sha256": "0ag5fsr3377rz6xfa0b9j54r90zh0yiz98kpa27xzhky4f5jpdah"
+   "commit": "d68512c0856f57a19cd49d1034199836352c15a0",
+   "sha256": "1h98ra53i7hc7zi9yjc6p29f70r04hivdczhw4imds13akq6j034"
   },
   "stable": {
    "version": [
@@ -5719,6 +5748,44 @@
    "sha256": "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z"
   }
  },
+ {
+  "ename": "basic-ide",
+  "commit": "9aaac29f5711f93f9ba7c14e5a332888e8920a86",
+  "sha256": "1pvgbc3vxqm4l8qc43g7b4viz4ilw828k9qlmb6ynzmij5ykrfrq",
+  "fetcher": "gitlab",
+  "repo": "sasanidas/emacs-c64-basic-ide",
+  "unstable": {
+   "version": [
+    20200416,
+    1953
+   ],
+   "deps": [
+    "basic-mode",
+    "company",
+    "dash",
+    "f",
+    "flycheck"
+   ],
+   "commit": "5d186623fb6805db71fe5b226df497e6b2904b96",
+   "sha256": "1v9mhvi1fqh4pni03y3qrlrzj2jrz2s9jc5g3jjpxll4zhsfr6w4"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    3
+   ],
+   "deps": [
+    "basic-mode",
+    "company",
+    "dash",
+    "f",
+    "flycheck"
+   ],
+   "commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1",
+   "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0"
+  }
+ },
  {
   "ename": "basic-mode",
   "commit": "71801bdc0720f150edeab6796487c753c6e7c3f5",
@@ -5794,17 +5861,17 @@
  },
  {
   "ename": "bazel-mode",
-  "commit": "3945f7eba7d5f248cace11a7946262ac2500b01a",
-  "sha256": "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586",
+  "commit": "10f3918c55426c8c4754ef0dfccf19300e516012",
+  "sha256": "1gylmwlhzg6kgj9936799ppahbhicrxn2zpbr3417qycib84nl8x",
   "fetcher": "github",
-  "repo": "codesuki/bazel-mode",
+  "repo": "bazelbuild/emacs-bazel-mode",
   "unstable": {
    "version": [
-    20191110,
-    2228
+    20200424,
+    1953
    ],
-   "commit": "7798e33cba5db14eb2c06ddcbc4e8fa361eb679c",
-   "sha256": "0gjm8276qj3a5kmh2qg93yadjhc2gcny058zpxwr6sialq9p7iwz"
+   "commit": "668a44907f7b3ad0e6fd300e319fba5862780140",
+   "sha256": "13llvkl40pybi4f1chak3v4f58fwwqw1kn9ygmv6dmn2wg4ag2mp"
   },
   "stable": {
    "version": [
@@ -6099,11 +6166,11 @@
   "repo": "DamienCassou/beginend",
   "unstable": {
    "version": [
-    20200203,
-    1035
+    20200415,
+    1752
    ],
-   "commit": "3ab68d77839060f5e85bbf9455846b68cc63ef00",
-   "sha256": "049r18sa4646rhp2cidpdnk09c87xxf52d6mffq82xphzsniqarz"
+   "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea",
+   "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr"
   },
   "stable": {
    "version": [
@@ -6177,6 +6244,21 @@
    "sha256": "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm"
   }
  },
+ {
+  "ename": "bencoding",
+  "commit": "a668dc6c90a3be1a51be7478e385b9ab395f6852",
+  "sha256": "1qjk71gkzqq07yy84i0bkyg2wh0jn4gvglcknpcia38dd80m8b7z",
+  "fetcher": "github",
+  "repo": "xuchunyang/bencoding.el",
+  "unstable": {
+   "version": [
+    20200331,
+    1102
+   ],
+   "commit": "f0af19511831f3ade590879e7d1636387682a8e7",
+   "sha256": "1sfj694a6yjc4qwkxn2yvnl8xp8rzrkdgnsaj8ncwdyaa50xgw78"
+  }
+ },
  {
   "ename": "bento",
   "commit": "aad104fd26adb419c5da1e3472807244794e8949",
@@ -6373,14 +6455,14 @@
   "repo": "cpitclaudel/biblio.el",
   "unstable": {
    "version": [
-    20190624,
-    1408
+    20200416,
+    1407
    ],
    "deps": [
     "biblio-core"
    ],
-   "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9",
-   "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms"
+   "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e",
+   "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5"
   },
   "stable": {
    "version": [
@@ -6420,16 +6502,16 @@
   "repo": "cpitclaudel/biblio.el",
   "unstable": {
    "version": [
-    20190624,
-    1408
+    20200416,
+    307
    ],
    "deps": [
     "dash",
     "let-alist",
     "seq"
    ],
-   "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9",
-   "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms"
+   "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e",
+   "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5"
   },
   "stable": {
    "version": [
@@ -6501,6 +6583,45 @@
    "sha256": "0vcdi0q6rbs3qqlpccy9hdv82zrx61gdj3fn444qashk84s085vf"
   }
  },
+ {
+  "ename": "bibtex-completion",
+  "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3",
+  "sha256": "06mg9fwp6jwr6fbnzh4z8am47bspcl8hv0icmdpc9lmzbcyfpg8f",
+  "fetcher": "github",
+  "repo": "tmalsburg/helm-bibtex",
+  "unstable": {
+   "version": [
+    20200417,
+    1725
+   ],
+   "deps": [
+    "biblio",
+    "cl-lib",
+    "dash",
+    "f",
+    "parsebib",
+    "s"
+   ],
+   "commit": "631dc607e8f29f1a585adde01d6785af1fb35d12",
+   "sha256": "09l1h1z493dc7hp109sqs1lkkcaw0mh762p5cpda9xymr9hf6w31"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "f",
+    "parsebib",
+    "s"
+   ],
+   "commit": "d6a98ac6f28d2a6a05e203115211c98333d40aca",
+   "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"
+  }
+ },
  {
   "ename": "bibtex-utils",
   "commit": "5764b6a880e8143db66e9011cc1c2bf0bcd61082",
@@ -6852,11 +6973,11 @@
   "repo": "raxod502/blackout",
   "unstable": {
    "version": [
-    20200326,
-    1640
+    20200404,
+    1550
    ],
-   "commit": "87498cc91916c2f41d28e93fd80102c42b93ccf6",
-   "sha256": "156mnqwcpv3zl5pklqvmayq5j76hm4jc3has4qydfygz8fhx1zhy"
+   "commit": "af37650d99bb5ae3ab05577a5bf99d5ff26b1e66",
+   "sha256": "18n1l6rwwfjrgaygm7nhrxg92fdd21aqkb38lc55lx3qhlrw1qwv"
   },
   "stable": {
    "version": [
@@ -6926,11 +7047,11 @@
   "repo": "Sodaware/blitzmax-mode",
   "unstable": {
    "version": [
-    20200211,
-    2205
+    20200415,
+    1529
    ],
-   "commit": "4814c35007035f0e26e0fadc50fffc4ab6d298ad",
-   "sha256": "160jd2rn1lgwgnm1ygdcsz1z0yxg9f1ps9wxqkv30xnkbnnxq10c"
+   "commit": "5f67bb3c8e4baf1f6881cc998f9f031641a7b08a",
+   "sha256": "1hcx6b3ka0n6sbi9p0z2wqlsxk5d2pvkjawpcyh40b5f1r6dpfmc"
   },
   "stable": {
    "version": [
@@ -7126,8 +7247,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "b5df3647f55359f8546dcfa991a351673a069a49",
-   "sha256": "1rfv036wzlrbqbki5i24871a9f2h6zk7yqd1lq6gnqrc4y7m477c"
+   "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4",
+   "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05"
   },
   "stable": {
    "version": [
@@ -7504,8 +7625,8 @@
     20200321,
     2126
    ],
-   "commit": "51f2d43e08960aa65a67273101733636026790a6",
-   "sha256": "0dzgkpaqlrqfzsmb61idlrp91vs3lrcymbdd4k6ls58kdv75v1j8"
+   "commit": "3b34032bdde6a37b4566c45ce93cb38da21d4965",
+   "sha256": "16p4404mxqgl1zqdalnq3bvbhwv11wgfl42871lxv3nndcsd30gr"
   },
   "stable": {
    "version": [
@@ -7620,6 +7741,21 @@
    "sha256": "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y"
   }
  },
+ {
+  "ename": "brutal-theme",
+  "commit": "e415b9a4d269cfee5ee2b0e58acb18804c2a8cb7",
+  "sha256": "1xjj2ssw3lbx21w6g4m6vqc471v8jgmgk0zw1z1hkmygg0xipgl3",
+  "fetcher": "github",
+  "repo": "topikettunen/brutal-emacs",
+  "unstable": {
+   "version": [
+    20200415,
+    602
+   ],
+   "commit": "ee63563b7cb07aeec342722ae684426cb0465a98",
+   "sha256": "1wx6771iv4psvlwhng0n09g0w3yml1pw3ga5lghjz9j6hba0bc6s"
+  }
+ },
  {
   "ename": "brutalist-theme",
   "commit": "ec889956a5685c3a60003ad2bfa04b03b57aa8e8",
@@ -7946,14 +8082,14 @@
  },
  {
   "ename": "bufler",
-  "commit": "b50d5939113ca9a8ad1ba606f3d3030f110a800b",
-  "sha256": "0y1gfpb99777sxizxvqyffsmbv6ib4zasi2dyrf8imf4z45r6adh",
+  "commit": "4ba5657f237eea9073a46a4127be5795be07c687",
+  "sha256": "1zxvkrgwk7v3404vcwyv5nag60ri72qqi5fkpwwmzc9cs2bckj20",
   "fetcher": "github",
   "repo": "alphapapa/bufler.el",
   "unstable": {
    "version": [
-    20200318,
-    2005
+    20200409,
+    1253
    ],
    "deps": [
     "dash",
@@ -7962,16 +8098,23 @@
     "magit-section",
     "pretty-hydra"
    ],
-   "commit": "39e756a23196d12792a3af4a06ab024d8235ee19",
-   "sha256": "1b9ddgdd7b6x6353f8s6cv97xqsmmka6vwmv68sq75104wr189w5"
+   "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f",
+   "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
-   "commit": "2eca0959657030c5853020da017fe98a19bba3f1",
-   "sha256": "0yqgaqz41sbfdbvjxf773p5m2qsr4mm22j2qgn3mp0z1r5dx67ai"
+   "deps": [
+    "dash",
+    "dash-functional",
+    "f",
+    "magit-section",
+    "pretty-hydra"
+   ],
+   "commit": "d6c79f04b7d288174d8294fb30488b567586364d",
+   "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3"
   }
  },
  {
@@ -8275,11 +8418,11 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20200308,
-    2200
+    20200412,
+    1148
    ],
-   "commit": "b360e3501703d8829a7dfc2d141e8c7c32c9bcfe",
-   "sha256": "0b3xkykfw8888zdg5w45kzij0d547j67crpc62mizh0fnc5naqvr"
+   "commit": "a91f2820256a4e0c8636cc33a2ef8515a26d3f81",
+   "sha256": "0nhsxj48a9aqfmwqs4m65zh2g0cmvijz4m69cvx1bcia31jaabpx"
   },
   "stable": {
    "version": [
@@ -8304,8 +8447,8 @@
    "deps": [
     "buttercup"
    ],
-   "commit": "400227a45164e4e849048d288a02ab8243d09cd2",
-   "sha256": "1z972i1pzg8bkrzzbjha802486mybqyh9bhbvfk2sr6nzhvx2w1k"
+   "commit": "3ae4f84813c9e04e03a6e703990ca998b62b6deb",
+   "sha256": "0ndxbh2jff6qryczawzbg580744h18z7grg82dpg7fv0rbxnyi3j"
   },
   "stable": {
    "version": [
@@ -8559,6 +8702,25 @@
    "sha256": "1a0qdiihyc5qwz5j68hnpfp0fx3qbzgvzflrbfv072r7ldxzfi57"
   }
  },
+ {
+  "ename": "calc-at-point",
+  "commit": "9ab725281ae66c1b97875518614a0f6312ace3a8",
+  "sha256": "1yzb2gmmdrcckgq1kd1gcbnbqf65aia7nx4j2lgrh2n9dlp40d03",
+  "fetcher": "github",
+  "repo": "walseb/calc-at-point",
+  "unstable": {
+   "version": [
+    20200406,
+    1618
+   ],
+   "deps": [
+    "dash",
+    "dash-functional"
+   ],
+   "commit": "11e40c8db9493ada71964b73069c6db529016492",
+   "sha256": "06dmm6b2xflkwgk5mysi3ycbi6yz5n0sci191a15nnzxg7vh1fbf"
+  }
+ },
  {
   "ename": "calendar-norway",
   "commit": "c5d01230027d5cec9da2545a9ce9270a611f6567",
@@ -8721,8 +8883,8 @@
   "repo": "beacoder/call-graph",
   "unstable": {
    "version": [
-    20200211,
-    240
+    20200402,
+    910
    ],
    "deps": [
     "anaconda-mode",
@@ -8731,8 +8893,8 @@
     "ivy",
     "tree-mode"
    ],
-   "commit": "768a1b2169dca60a130204065dbc54bdff415b0f",
-   "sha256": "12f9wc3kp3pafip283yr8qd5s93nmcf84b07i72fv69nxxi4a41q"
+   "commit": "2f47dcb65ed8dc5393df846b4175a4872e254c05",
+   "sha256": "0xn8xk2x3ih22vlfjvnl6853ddpk57q70z9b0vwhjvwmi4idz7xp"
   },
   "stable": {
    "version": [
@@ -9190,8 +9352,8 @@
     20200314,
     1557
    ],
-   "commit": "37593d191b255d8633231099c70b1b26b3da0d39",
-   "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh"
+   "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b",
+   "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji"
   }
  },
  {
@@ -9240,8 +9402,8 @@
     20200314,
     1557
    ],
-   "commit": "37593d191b255d8633231099c70b1b26b3da0d39",
-   "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh"
+   "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b",
+   "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji"
   }
  },
  {
@@ -9421,11 +9583,11 @@
   "repo": "anler/centered-window-mode",
   "unstable": {
    "version": [
-    20171127,
-    949
+    20200426,
+    1053
    ],
-   "commit": "24f7c5be9def20879f46659082d497e67b55d7af",
-   "sha256": "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz"
+   "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac",
+   "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8"
   }
  },
  {
@@ -9510,17 +9672,17 @@
     20171115,
     2108
    ],
-   "commit": "f09d88781a5557d4b2b7d039757cc5e9a7ddd275",
-   "sha256": "10zr6a3z7gzvqvn5fb4l7hg9wi5vhmkdln0c44gskmikdsm173x1"
+   "commit": "5d5692e7526eb228308f91c10761f22c69c8ea35",
+   "sha256": "1shwvgakkv9q9mlvzcsxnrj4zd1ld8nf7k8pw6zl6j3wg0sj5fd3"
   },
   "stable": {
    "version": [
     3,
     15,
-    0
+    1
    ],
-   "commit": "76bc1fad91478de7064380c31d333e1975cf8126",
-   "sha256": "1amjzy3v7rhc6djl1ldqnhpd4m3prh7lfyd5hyb9fp0v8jhyg3w2"
+   "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5",
+   "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac"
   }
  },
  {
@@ -10183,8 +10345,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20200328,
-    1555
+    20200420,
+    735
    ],
    "deps": [
     "clojure-mode",
@@ -10195,8 +10357,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "dfc13f9c199920522ee02feac1d5da1c0b578b6b",
-   "sha256": "12yifir74qicryl5v5gl80s5m2qvlb09ck6jywx20yin3jkw6l58"
+   "commit": "7f4d4e81816e64238370e028824e6389f02a38c8",
+   "sha256": "03rbanapb2rg9is91r6c549gx96va5gkpdqhlm0gqgph4jg4jvfi"
   },
   "stable": {
    "version": [
@@ -10688,8 +10850,8 @@
     20200327,
     2241
    ],
-   "commit": "7ee3f9c52f70f80820a8c66fb6f796d6e01dd92d",
-   "sha256": "1vgk4ci5di0dxm2ql02g1h484nd6abqiv2xa7fh2d9rbkfh9px30"
+   "commit": "01b39044b9b65fa4ea7d3166f8b1ffab6f740362",
+   "sha256": "1g1awdcqzrnw1a6gl4n87a97lniyn0ck5a51l9n6jz2m8k3idmsg"
   },
   "stable": {
    "version": [
@@ -10794,8 +10956,8 @@
   "repo": "clojure-emacs/clj-refactor.el",
   "unstable": {
    "version": [
-    20200229,
-    1105
+    20200405,
+    1419
    ],
    "deps": [
     "cider",
@@ -10808,8 +10970,8 @@
     "seq",
     "yasnippet"
    ],
-   "commit": "92d372393a031e5fa73ef926447afe72b574cb45",
-   "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4"
+   "commit": "8259791e054382457b87d1f78061b5e3ce948907",
+   "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj"
   },
   "stable": {
    "version": [
@@ -10972,11 +11134,11 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20200326,
-    1542
+    20200419,
+    559
    ],
-   "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55",
-   "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr"
+   "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a",
+   "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr"
   },
   "stable": {
    "version": [
@@ -11002,8 +11164,8 @@
    "deps": [
     "clojure-mode"
    ],
-   "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55",
-   "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr"
+   "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a",
+   "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr"
   },
   "stable": {
    "version": [
@@ -11305,17 +11467,17 @@
     20190710,
     1319
    ],
-   "commit": "887eb6b7680685ae9bc8697f30bf6406df2d318e",
-   "sha256": "1lcfn79fn3cn0sdhw5f50l8830w6lh0j7lhrz7la27sg4ag5rmg0"
+   "commit": "eadafe2ebc419414fba42a3fe28b534bb2fc7a93",
+   "sha256": "11yhjsg2y6mxpd674wkqfwzfm4qzrmbh0mywq7617brg6hk71kb9"
   },
   "stable": {
    "version": [
     3,
     17,
-    0
+    1
    ],
-   "commit": "e3185e3d1b92a95c18f22f70b3cef6944dd019eb",
-   "sha256": "1r8nnaisx10d5r3kzyfz4af9mwb5f0nzz8nmn3xvnr12rryg2bwl"
+   "commit": "bd580b7d568493a795a855c0710ba4ad88532485",
+   "sha256": "1ng8svdxwgjj4aq9f89lx18znrlhcjgl0brsfxwissf1z0539l9d"
   }
  },
  {
@@ -11768,8 +11930,8 @@
     20200315,
     929
    ],
-   "commit": "6c25e4f29e1c75dabd350e04c190e81f7bca3cc3",
-   "sha256": "0fi0w7mjardvblqwvii9grgfzd11mjr2c35vzbq5dx01ydfib387"
+   "commit": "40464198e7bf2121694a7e6d87588342140a84ff",
+   "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j"
   },
   "stable": {
    "version": [
@@ -11815,11 +11977,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20200220,
-    1500
+    20200419,
+    156
    ],
-   "commit": "437bdd7a96fee751c6f817aff0100dd44bb07b23",
-   "sha256": "0cjbl7m6a0mmiiidn7w7hcggc58l5503swfnasbzyd1pzdrnn15y"
+   "commit": "344b06ed3c139af717ebff59505fc66635678f6c",
+   "sha256": "00as07y5q71bscchbz3yzck4ljzbcd5x5ghzzajgz3pj484smz6z"
   },
   "stable": {
    "version": [
@@ -11950,11 +12112,11 @@
   "repo": "cyrus-and/comb",
   "unstable": {
    "version": [
-    20200114,
-    1325
+    20200411,
+    1040
    ],
-   "commit": "bd8e11b8593bc48f81ce01c0657d5a7977cafdf6",
-   "sha256": "0ndz25x1l0rzn5j8xg9ql2s2lgin1893kzf722chyk8147qwb0i8"
+   "commit": "59e025c3afb867706b869ac4bf2623665eb99821",
+   "sha256": "16swixv88nbs6gscgzy5lizi66pw0c9fm03xpm1kinan8v2s9m3v"
   },
   "stable": {
    "version": [
@@ -12246,11 +12408,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20200324,
-    2145
+    20200425,
+    118
    ],
-   "commit": "61ddd9afb58879267bf947b152a68f3dbadb9259",
-   "sha256": "097xy8ar6dms4zn7ymxxgmhap096fs8nc5j3js5srzmv14rswm36"
+   "commit": "fdde3d112ba85d034f83f95deafa24fd13be36e4",
+   "sha256": "1krc5gxlkhr87hw5wlch1wfrjxdin8isg51f8m6kjy20jx57jalc"
   },
   "stable": {
    "version": [
@@ -12270,8 +12432,8 @@
   "repo": "pythonic-emacs/company-anaconda",
   "unstable": {
    "version": [
-    20200129,
-    1830
+    20200404,
+    1859
    ],
    "deps": [
     "anaconda-mode",
@@ -12280,8 +12442,8 @@
     "dash",
     "s"
    ],
-   "commit": "a31354ca8ea35c0b2c1f6bb2b1a02a6cfb5e564b",
-   "sha256": "05qaxb3qpz3bi6c88qspf50sh15hzc01354zhj0amd07bmqzhwfg"
+   "commit": "da1566db41a68809ef7f91ebf2de28118067c89b",
+   "sha256": "1x260p0fj33xg6hkrz9q9dqrpibp4yn2n9is3a6s4xxfb485rz0g"
   },
   "stable": {
    "version": [
@@ -12388,8 +12550,8 @@
     "axiom-environment",
     "company"
    ],
-   "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f",
-   "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67"
+   "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164",
+   "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
   }
  },
  {
@@ -12528,14 +12690,14 @@
   "repo": "redguardtoo/company-ctags",
   "unstable": {
    "version": [
-    20200209,
-    47
+    20200407,
+    803
    ],
    "deps": [
     "company"
    ],
-   "commit": "fa5a3f7b765fc0e42a378fa2293be4c2817fe04e",
-   "sha256": "1wgxmy1pwwc7mvgw9bx3vvaay1pirzghvpqs6d9mnx1wbzn1x29b"
+   "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772",
+   "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h"
   },
   "stable": {
    "version": [
@@ -12623,41 +12785,6 @@
    "sha256": "0yvp3dwa9mwfyrqla27ycwyjad4bp1267bxv0chxcr4528hnygl3"
   }
  },
- {
-  "ename": "company-edbi",
-  "commit": "5d881ff0927d5bd7f8192f58927ceabb9bad4beb",
-  "sha256": "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm",
-  "fetcher": "github",
-  "repo": "proofit404/company-edbi",
-  "unstable": {
-   "version": [
-    20160221,
-    1923
-   ],
-   "deps": [
-    "cl-lib",
-    "company",
-    "edbi",
-    "s"
-   ],
-   "commit": "ffaeff75d0457285d16d11db772881542a6026ad",
-   "sha256": "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1"
-  },
-  "stable": {
-   "version": [
-    0,
-    1
-   ],
-   "deps": [
-    "cl-lib",
-    "company",
-    "edbi",
-    "s"
-   ],
-   "commit": "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11",
-   "sha256": "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai"
-  }
- },
  {
   "ename": "company-emacs-eclim",
   "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e",
@@ -12912,8 +13039,8 @@
     "company",
     "go-mode"
    ],
-   "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9",
-   "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9"
+   "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c",
+   "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb"
   },
   "stable": {
    "version": [
@@ -13192,8 +13319,8 @@
     "company",
     "native-complete"
    ],
-   "commit": "11803df3706fb23d58e418a14ce981204a64e847",
-   "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1"
+   "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d",
+   "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic"
   }
  },
  {
@@ -13285,16 +13412,16 @@
   "repo": "jethrokuan/company-org-roam",
   "unstable": {
    "version": [
-    20200329,
-    609
+    20200403,
+    614
    ],
    "deps": [
     "company",
     "dash",
     "org-roam"
    ],
-   "commit": "0d14bf56f53b1fcf14418d3e545785f4857b5f06",
-   "sha256": "0kjf3pqlb95m1z057sjkqmsi1qhh3d4snp29gk3fzz278bc7sl45"
+   "commit": "be645587aa51e764127dcbe49e70a13e618d4537",
+   "sha256": "0gk865wwkb9c6slfvm6sfq88c61s523bf52vi9rdq3gxghvqaaby"
   },
   "stable": {
    "version": [
@@ -13325,8 +13452,8 @@
     "cl-lib",
     "company"
    ],
-   "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152",
-   "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q"
+   "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2",
+   "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x"
   },
   "stable": {
    "version": [
@@ -13358,8 +13485,8 @@
     "company",
     "phpactor"
    ],
-   "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05",
-   "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5"
+   "commit": "860d7e8784b261ee71deba354d01c3038cd777ab",
+   "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3"
   },
   "stable": {
    "version": [
@@ -13423,15 +13550,15 @@
   "repo": "tumashu/company-posframe",
   "unstable": {
    "version": [
-    20200327,
-    148
+    20200408,
+    400
    ],
    "deps": [
     "company",
     "posframe"
    ],
-   "commit": "18b83d29dae75239e22ca73d91eb09ceca5e77c4",
-   "sha256": "0gb3y80qhk1xgdx0iglcj78wvnbxnaiyvfgg0bmfvhswjii80160"
+   "commit": "9b59cd679c4396cbfe8118a9dfa8a5acfe038ac6",
+   "sha256": "1z18libg2nplx8a8dcycdzm354gczqzg8r37agzz0jk1a7frxa7m"
   },
   "stable": {
    "version": [
@@ -13455,27 +13582,27 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20191224,
-    220
+    20200404,
+    1550
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5",
-   "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p"
+   "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63",
+   "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h"
   },
   "stable": {
    "version": [
     4,
-    0
+    1
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387",
-   "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr"
+   "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
+   "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
   }
  },
  {
@@ -13651,8 +13778,8 @@
     "company",
     "rtags"
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -13717,8 +13844,8 @@
     "company",
     "solidity-mode"
    ],
-   "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341",
-   "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg"
+   "commit": "022b3159832384a7dcdc2168809e698600826047",
+   "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69"
   },
   "stable": {
    "version": [
@@ -13873,46 +14000,6 @@
    "sha256": "1g5qv1fg22x1nkj696n12ixa2akgzivdc5q7yzy502kqjg67mkx5"
   }
  },
- {
-  "ename": "company-tern",
-  "commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
-  "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh",
-  "fetcher": "github",
-  "repo": "proofit404/company-tern",
-  "unstable": {
-   "version": [
-    20161004,
-    1847
-   ],
-   "deps": [
-    "cl-lib",
-    "company",
-    "dash",
-    "dash-functional",
-    "s",
-    "tern"
-   ],
-   "commit": "10ac058b065ae73c1f30e9fb7d969dd1a79387be",
-   "sha256": "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h"
-  },
-  "stable": {
-   "version": [
-    0,
-    3,
-    0
-   ],
-   "deps": [
-    "cl-lib",
-    "company",
-    "dash",
-    "dash-functional",
-    "s",
-    "tern"
-   ],
-   "commit": "b20b3e490bf277c8480712210e3c92ea489859ef",
-   "sha256": "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm"
-  }
- },
  {
   "ename": "company-terraform",
   "commit": "1d9732da975dcf59d3b311b19e20abbb29c33656",
@@ -13952,15 +14039,15 @@
   "repo": "Wilfred/company-try-hard",
   "unstable": {
    "version": [
-    20191106,
-    2105
+    20200417,
+    1603
    ],
    "deps": [
     "company",
     "dash"
    ],
-   "commit": "8a417255b4da9f2e3889f6024755290dcc5884d1",
-   "sha256": "14b3sad9a7dr8j7xhnspk905ybidqz8h4hx2rw4bgl25imhmlysz"
+   "commit": "2b41136b5ed6e02032d99bcdb0599ecf00394fa5",
+   "sha256": "07c4vsrixqw6d6d2mqm6xzzzc9l9mgwgabcc6jlnw78cxij1wrsx"
   }
  },
  {
@@ -14074,14 +14161,14 @@
  },
  {
   "ename": "competitive-programming-snippets",
-  "commit": "0100042ee1356dd709d8bbeec4539ddc64317baa",
-  "sha256": "1mdkv2pn83mgj7yy4xf8nkm9bvxldiy7gdx4bpv36b9xw5zz6q6r",
+  "commit": "9a6d2467c37bf095c0a1e4605744474999ce04e2",
+  "sha256": "1yblnm1ar466fgwvhxybqv8sp2hn40p10p6hhnn9gi1xj9napam7",
   "fetcher": "github",
   "repo": "sei40kr/competitive-programming-snippets",
   "unstable": {
    "version": [
-    20200122,
-    1558
+    20200213,
+    1521
    ],
    "deps": [
     "yasnippet"
@@ -14102,6 +14189,21 @@
    "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min"
   }
  },
+ {
+  "ename": "completions-frame",
+  "commit": "dcbb088900f76c05b04ffe25d32e43a477a0556f",
+  "sha256": "1ng5wmk1vp6yqrcyld23mrs8xdfa010l9acjy1vgkcsxjp3nmv3x",
+  "fetcher": "github",
+  "repo": "muffinmad/emacs-completions-frame",
+  "unstable": {
+   "version": [
+    20200419,
+    2027
+   ],
+   "commit": "2e726a497605752d7d57aaf0adf53178c1e9f7e4",
+   "sha256": "0f4vaq84si57p7y0zl0l93vixv0ld1srrxvav40ipil3p9fm1yig"
+  }
+ },
  {
   "ename": "composable",
   "commit": "1fc0f076198e4be46a33a26eea9f2d273dda12b8",
@@ -14221,8 +14323,8 @@
   "repo": "necaris/conda.el",
   "unstable": {
    "version": [
-    20200120,
-    1721
+    20200420,
+    1418
    ],
    "deps": [
     "dash",
@@ -14230,8 +14332,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "335474e409774e31125fe320a4a54c8d92bf5fa2",
-   "sha256": "10aadbvsg6qy11nfkmc5rvivjvyak6501srmjl6lvzxsw8q79fj4"
+   "commit": "f187948f7bda856befb54a08473c9aae3e595c8a",
+   "sha256": "02i3nq35cq0vlrg3xppyldi7s0zimvlf8j07xdn6pxm5ilrlmsl6"
   },
   "stable": {
    "version": [
@@ -14654,6 +14756,30 @@
    "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7"
   }
  },
+ {
+  "ename": "cort",
+  "commit": "1c99109a816303b1a14ff15e7a8300c73910e3a7",
+  "sha256": "1r1plngky2djgpbja0xr2j7hgj79d0l2jcjq4kj97q6874r4fswq",
+  "fetcher": "github",
+  "repo": "conao3/cort.el",
+  "unstable": {
+   "version": [
+    20200330,
+    1641
+   ],
+   "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4",
+   "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky"
+  },
+  "stable": {
+   "version": [
+    3,
+    0,
+    5
+   ],
+   "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b",
+   "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx"
+  }
+ },
  {
   "ename": "cosmo",
   "commit": "3ab914dfefcddf6ecd65261bc11bd3eb12929c79",
@@ -14677,14 +14803,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200319,
-    1329
+    20200422,
+    1208
    ],
    "deps": [
     "swiper"
    ],
-   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
-   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
+   "commit": "47ec37b395cc1b304bbf91e804f138634544a9df",
+   "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74"
   },
   "stable": {
    "version": [
@@ -14757,15 +14883,15 @@
   "repo": "hlissner/emacs-counsel-css",
   "unstable": {
    "version": [
-    20191031,
-    345
+    20200331,
+    632
    ],
    "deps": [
     "cl-lib",
     "counsel"
    ],
-   "commit": "61a38c9d50fa9d1e38b2fa550d07130eb9322524",
-   "sha256": "0c8assn7dc8dhzyzk37x7y8s266pvr6hs0vh13y65z0sgxk59i2w"
+   "commit": "6427dfcbda0d2bbd81db03f9d6b56b06c260ac02",
+   "sha256": "1g8gz5mz2qclia64qmgw02h5ivywgn46d6djlr7vcdfyp774cf64"
   },
   "stable": {
    "version": [
@@ -14824,14 +14950,14 @@
   "repo": "redguardtoo/counsel-etags",
   "unstable": {
    "version": [
-    20200320,
-    19
+    20200413,
+    213
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "0abd7a1b6abaf59a01774ca05f51cc0c6ce7f287",
-   "sha256": "0kfj3b8gx95pa7yaps25javmag2bnlz5zn802wf0x81np4d3hgjs"
+   "commit": "65298d82468a2221f154de3606ead9a7a7806fa0",
+   "sha256": "0zk4axx64s9bmwfnhi2yhcfd9bkxxv3l5q33ak6l6q5dmyprp8ay"
   },
   "stable": {
    "version": [
@@ -15323,11 +15449,11 @@
   "url": "https://git.sr.ht/~zge/cpp-capf",
   "unstable": {
    "version": [
-    20190723,
-    1158
+    20200405,
+    8
    ],
-   "commit": "ca6d50f3853e1226a0ccad435aa8fbd7852c2149",
-   "sha256": "19vhayxy3ha3kkncz8vy5as2pdc17k4mycqszi2g0wywllnirhvv"
+   "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50",
+   "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph"
   },
   "stable": {
    "version": [
@@ -15362,6 +15488,21 @@
    "sha256": "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i"
   }
  },
+ {
+  "ename": "cpu-sos",
+  "commit": "612eddcec84562a1f060c9eb5a63f77ce88da7ea",
+  "sha256": "1mjbcyz8j1d0l6jnfa3bk4ba5dbb8xih56rvfri61caqmy73s6pz",
+  "fetcher": "github",
+  "repo": "oitofelix/cpu-sos",
+  "unstable": {
+   "version": [
+    20200409,
+    2356
+   ],
+   "commit": "1594b76d4ad3a6e3c471d82da366226d156e6226",
+   "sha256": "1pqw1gilj3m35fqaj5j51ggmxzwhdiks0k36hxmw3ihr63am0j5f"
+  }
+ },
  {
   "ename": "cql-mode",
   "commit": "1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1",
@@ -15581,11 +15722,11 @@
   "repo": "emacs-pe/crontab-mode",
   "unstable": {
    "version": [
-    20190827,
-    1300
+    20200330,
+    920
    ],
-   "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e",
-   "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k"
+   "commit": "9625228cbfce29ac3b443c6eff893ff828268f7d",
+   "sha256": "01s32ivn1fdqq99ms3s6a73hrqdc2r5khrg4jv3sniviql2k3i31"
   }
  },
  {
@@ -15707,11 +15848,11 @@
   "repo": "josteink/csharp-mode",
   "unstable": {
    "version": [
-    20191126,
-    1928
+    20200402,
+    919
    ],
-   "commit": "57bd21bda4edc16671a85c7d6d51484e40a6e640",
-   "sha256": "0chl9lzxn1mq59vy5lsim2iiy2hl20rg3d7ri41ljksjcfz9ki6v"
+   "commit": "31124dba6833a4de144ca508edb90d5adfeec209",
+   "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x"
   },
   "stable": {
    "version": [
@@ -15731,8 +15872,8 @@
   "repo": "hlolli/csound-mode",
   "unstable": {
    "version": [
-    20200326,
-    2154
+    20200402,
+    1509
    ],
    "deps": [
     "dash",
@@ -15740,8 +15881,8 @@
     "multi",
     "shut-up"
    ],
-   "commit": "f278a0e13ecd6b00cd7b056a2e36021322bed8ea",
-   "sha256": "1axib3rgy7kdyprpp8cs94rc9yr34faii4n9f70jjkk6x7pr398m"
+   "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4",
+   "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2"
   },
   "stable": {
    "version": [
@@ -15918,6 +16059,29 @@
    "sha256": "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31"
   }
  },
+ {
+  "ename": "ctrlf",
+  "commit": "46073c430c271aa1971e27948e7f6d4b65b3d533",
+  "sha256": "01d2zv7x588r55namcda58l21lg5sbwcn1ycnvg5md69pv5cg461",
+  "fetcher": "github",
+  "repo": "raxod502/ctrlf",
+  "unstable": {
+   "version": [
+    20200417,
+    1549
+   ],
+   "commit": "97b59f1974ddcfcd9eedcf4c2d286a38f5200273",
+   "sha256": "1axi9wdpr82ghsbjxz1k73v82kkp9g63ahgqy38w6560f40m32dr"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc",
+   "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z"
+  }
+ },
  {
   "ename": "ctune",
   "commit": "927ecd888bc00abff13f5fc335a88dffc2bf6779",
@@ -16266,8 +16430,8 @@
     20190111,
     2150
    ],
-   "commit": "6a30fecff5decdf20029763afea6183de3177dc3",
-   "sha256": "1qdxr4wdl7mmbahsdhybq4qmc6ahf2h342gf6y99y6jkj8akvjy3"
+   "commit": "f09e61ab721ad51526ec7a6798fc01d8346f539d",
+   "sha256": "0l6yzbshqkkbb4fhvnakrilbyc441va6r3yhczksaz0rxlyminlw"
   },
   "stable": {
    "version": [
@@ -16364,11 +16528,11 @@
   "repo": "cbowdon/daemons.el",
   "unstable": {
    "version": [
-    20200129,
-    929
+    20200421,
+    912
    ],
-   "commit": "9320c6af524f923f20aa95c1a48b7ae41c3005a8",
-   "sha256": "0wlv3vjhw6v6q5br4bassw34k4kai6nrw10av4y6nkvw58i5b3h7"
+   "commit": "a26155d04cec399ffe25b88f71cbfa4ada784569",
+   "sha256": "0bvfcrr3blyz0861ysfw2qbfh1iq8nfdh1kw9wz4m7g6big27qgd"
   },
   "stable": {
    "version": [
@@ -16433,8 +16597,8 @@
   "repo": "jyp/dante",
   "unstable": {
    "version": [
-    20200131,
-    1211
+    20200416,
+    1217
    ],
    "deps": [
     "company",
@@ -16445,8 +16609,8 @@
     "lcr",
     "s"
    ],
-   "commit": "4955bc7363e250d22579bc34b0b4ab6611c0766c",
-   "sha256": "06xagrjl00iwvaf0cli3dhhvvn4x7ysvkir4120lwc9ispzc077m"
+   "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3",
+   "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz"
   },
   "stable": {
    "version": [
@@ -16474,8 +16638,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20200325,
-    546
+    20200425,
+    606
    ],
    "deps": [
     "bui",
@@ -16486,8 +16650,8 @@
     "lsp-treemacs",
     "s"
    ],
-   "commit": "e2086fc9fbde4413f779b314bd5a93f808a3fb78",
-   "sha256": "1ig4s5aimd7zfyaa4fgb584lpzmi38kbfqc4jncifh0i69mi6x9k"
+   "commit": "43c672747e537620f5385ec4bd86c393b16d84dd",
+   "sha256": "0mqhzwk0l32k94msxq69wlcwxn8gc34cqbgxs7z1x9nddjirqmb1"
   },
   "stable": {
    "version": [
@@ -17144,6 +17308,37 @@
    "sha256": "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a"
   }
  },
+ {
+  "ename": "dbc",
+  "commit": "0f82920ec0b8544c7008a57a412fe3ba15fc5e0f",
+  "sha256": "0xba153ky52iiyjndryzm6n3v019d0710r4k91chvv8gvyb4jr9z",
+  "fetcher": "gitlab",
+  "repo": "matsievskiysv/display-buffer-control",
+  "unstable": {
+   "version": [
+    20200331,
+    1826
+   ],
+   "deps": [
+    "cl-lib",
+    "ht"
+   ],
+   "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f",
+   "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "cl-lib",
+    "ht"
+   ],
+   "commit": "5123477396a562fae350a89fbed79464cc498bc9",
+   "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k"
+  }
+ },
  {
   "ename": "ddskk",
   "commit": "6eccccb79881eaa04af3ed6395cd2ab981d9c894",
@@ -17152,15 +17347,15 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20200325,
-    1337
+    20200403,
+    1308
    ],
    "deps": [
     "ccc",
     "cdb"
    ],
-   "commit": "37593d191b255d8633231099c70b1b26b3da0d39",
-   "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh"
+   "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b",
+   "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji"
   }
  },
  {
@@ -17202,16 +17397,16 @@
   "repo": "Wilfred/deadgrep",
   "unstable": {
    "version": [
-    20200202,
-    1520
+    20200411,
+    652
    ],
    "deps": [
     "dash",
     "s",
     "spinner"
    ],
-   "commit": "3ec95398d09719a9dbdc3a67d29d22ca224516cf",
-   "sha256": "0rxzm30md5s87s6j1aqgjxa9kb637v11b7q194l8zzhf457ky6la"
+   "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757",
+   "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227"
   },
   "stable": {
    "version": [
@@ -17235,11 +17430,11 @@
   "url": "https://salsa.debian.org/emacsen-team/debian-el.git",
   "unstable": {
    "version": [
-    20181020,
-    1513
+    20200401,
+    1622
    ],
-   "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c",
-   "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx"
+   "commit": "d7117ab18b15f449f194cd7d91ff22e55fcfa817",
+   "sha256": "09i2n4990d5ra4zqswzv8sjk4psd9lf71xdsgnfbr88pdv1q8bhf"
   },
   "stable": {
    "version": [
@@ -17471,11 +17666,11 @@
   "repo": "abo-abo/define-word",
   "unstable": {
    "version": [
-    20191031,
-    1736
+    20200417,
+    844
    ],
-   "commit": "d8c76d503be3d561221631067ec5274e7c147248",
-   "sha256": "18yy7gw8x3y9sk3v7xpd59p425qc36dymj0wgk6mzarfq5rhv79h"
+   "commit": "08c71b1ff4fd07bf0c78d1fcf77efeaafc8f7443",
+   "sha256": "053kyg2jqayphdkm7s8fz8yl97yspib6qszcajyr77m6n7j4i764"
   },
   "stable": {
    "version": [
@@ -17806,11 +18001,11 @@
   "repo": "raxod502/diary-manager",
   "unstable": {
    "version": [
-    20190702,
-    2148
+    20200404,
+    1549
    ],
-   "commit": "964dd7bf60a8e8abc880ef5b73319bc65d5ea5e3",
-   "sha256": "1w1hffypsx41n63yrpz0lcyzia4x4lis0sja8gksik7dvwwkyhwb"
+   "commit": "6d9b86faecb2ab7c2e1eb90dcf7bffdf70804470",
+   "sha256": "05v449px4nq565w9kcg2bbz1j27qlgiw17z4drgriz2qf2m50v18"
   },
   "stable": {
    "version": [
@@ -17849,15 +18044,15 @@
   "repo": "cqql/dictcc.el",
   "unstable": {
    "version": [
-    20200209,
-    1810
+    20200421,
+    1422
    ],
    "deps": [
     "cl-lib",
     "ivy"
    ],
-   "commit": "e07ebfc577b904b3387705a91395ac873e42c727",
-   "sha256": "0wi3iz31qizd3xsys1pyfr2zfn03x27lrja5s8170s27zqkwm56j"
+   "commit": "3950011197ba81f27cc82b4e6075c9100945f936",
+   "sha256": "0xmmkzsg48q6awhkbi5naqjm0yjdnwb437k17razgd6y99vyh0ns"
   },
   "stable": {
    "version": [
@@ -17936,11 +18131,11 @@
   "repo": "ideasman42/emacs-diff-at-point",
   "unstable": {
    "version": [
-    20200106,
-    441
+    20200413,
+    200
    ],
-   "commit": "c26027d701f2a1512e0a2b18e4b34f02e9140ee0",
-   "sha256": "1c5pibjmpkw7fi26vnsvv5yjg4y851jccwymzwa06gbxb3jf5ggc"
+   "commit": "5b06de513297a80cf3a2081b8ee0914e90da810b",
+   "sha256": "1ib8297alpsvcxl9c56n2bjh5j4m49k92nz1mgdybiqwg3z4is21"
   }
  },
  {
@@ -17951,14 +18146,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20200329,
-    1724
+    20200406,
+    37
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7fce94f7d5eebea06aed153b0f574567182c8d2b",
-   "sha256": "11m9ab7ymvbsxgddwxwcr8mrll3m67lnib8bpmb9vmh16zb2mzcl"
+   "commit": "a625033fb1dde83f6e4c2fc21f632b22ec34b609",
+   "sha256": "01m0aknqn0pgb46877kbz9n1nqmlamrlm58g2q894imbhybgfpan"
   },
   "stable": {
    "version": [
@@ -18627,11 +18822,11 @@
   "repo": "thomp/dired-launch",
   "unstable": {
    "version": [
-    20200318,
-    1715
+    20200403,
+    308
    ],
-   "commit": "1f73233065ddb077adb7019ae33efd8acce9b561",
-   "sha256": "1sc0y7ffvyq5785gcmlgkkblz1nyyx4a5h1m1bi50zkqpna1pxbf"
+   "commit": "6e5d26ca859f7af624351ba2af6b1be83982053b",
+   "sha256": "0xy8c90d6lv21cp5p2xzqqv5da2m3mry8bdkz54rknv2v9in8g0l"
   }
  },
  {
@@ -18831,14 +19026,14 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20200226,
-    333
+    20200409,
+    801
    ],
    "deps": [
     "dired-subtree"
    ],
-   "commit": "5f88a4570eae9645be06ff22542f110aeb70dd7d",
-   "sha256": "0l1wr7g4lfqmvhw3vir6fmwxmid9sasxlf5pxxvh0z8kps53f0cn"
+   "commit": "6e569c851418890c21fd37d03a62f85343aa0900",
+   "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9"
   },
   "stable": {
    "version": [
@@ -18928,11 +19123,11 @@
   "repo": "renard/dired-toggle-sudo",
   "unstable": {
    "version": [
-    20151109,
-    1006
+    20200401,
+    1353
    ],
-   "commit": "02449dbda4e168f99fe5352c9628df5d39e11483",
-   "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2"
+   "commit": "13bbe52c54893f5aa3e56228450ffdd0c9e1d169",
+   "sha256": "1fw1pb1z6krqd1pfxxhr6rrfr9ckkcb0zsjzbjk0i2i1q5cg6car"
   },
   "stable": {
    "version": [
@@ -19754,8 +19949,8 @@
   "repo": "Silex/docker.el",
   "unstable": {
    "version": [
-    20200218,
-    1257
+    20200421,
+    822
    ],
    "deps": [
     "dash",
@@ -19765,8 +19960,8 @@
     "tablist",
     "transient"
    ],
-   "commit": "a2092b3b170214587127b6c05f386504cae6981b",
-   "sha256": "1q3fgh3sjly62h86yvjqhr7j1yyrsfygk4rqkx0p7a052s2qvqi7"
+   "commit": "08745207332d940130a2357eb5c5e00fd88bd6af",
+   "sha256": "15fgcmld7z83b89jkwi0a5i9lls43kpbqav0lhfdyq3m941whzs4"
   },
   "stable": {
    "version": [
@@ -19925,11 +20120,11 @@
   "repo": "progfolio/doct",
   "unstable": {
    "version": [
-    20200329,
-    1548
+    20200413,
+    157
    ],
-   "commit": "e788ec71dafdd57a5c0eb3633794abbe3355f0c9",
-   "sha256": "19zqhcjpb23h4nn9h22jn1gh7a53y5v8f52809scl3vif0ch9b2h"
+   "commit": "c237e72e0bc53a67a83c05d9c1bb28e80fd15c1e",
+   "sha256": "0bh7yckr1cfampc1kmigbg98b6kwvnjgq8143lqlj1hmg0hw5cb6"
   }
  },
  {
@@ -20044,30 +20239,30 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20200322,
-    636
+    20200425,
+    553
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "0642f7107102e88fb8818da02e6612c6855537ff",
-   "sha256": "1wmsrvzbvixzps6zp1d2r5fn7gkfwvjz2ksjqd6a8sd4swdx9ggk"
+   "commit": "c177959bbfa7fa6f199b1145c6986e55f462f1c1",
+   "sha256": "0iclkfryfj72c5377rydsxh090maq6i0sxj90cm6dalyazd7rl4k"
   },
   "stable": {
    "version": [
-    2,
-    9,
-    2
+    3,
+    0,
+    0
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "e6d690bae01cb68e7171857fe07ac914d7a19f4b",
-   "sha256": "0k5rppzpycl1aggg6cvwvgxylgvjbxksvdah8fkrrmx3dwcr2y3p"
+   "commit": "b44955841a301f4930b054e912fa4c1a700d426d",
+   "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d"
   }
  },
  {
@@ -20078,14 +20273,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20200327,
-    1325
+    20200331,
+    1901
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "bbb3725af973485424f6ca716b648923defa176c",
-   "sha256": "0pybwshmcfj0ll2hjcdrqdqbf6crn10pjlkbiyf3k23w5ayaql49"
+   "commit": "8d5ddbbb72752fdd981407bdc2e33d917675e919",
+   "sha256": "16d1mlz5ll89p2f4avz8cbyg2wkxkjydb19aff9y6c75pw948cks"
   },
   "stable": {
    "version": [
@@ -20314,11 +20509,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20200324,
-    1726
+    20200412,
+    1112
    ],
-   "commit": "e4672e22885772d2be0c75df03c4f805f1acf5fa",
-   "sha256": "0pb0q8grybzl3sh75km93n1cvk7wh5c2r2nbm8rkwzzhxrhrvffl"
+   "commit": "81d06717d1b75d2b51c1b7d3da93b6a01d7e253d",
+   "sha256": "1ywzxhygf8qyif4d6kg0rhbpdxxb74wnip8n4n9m9mabmff5xkzk"
   },
   "stable": {
    "version": [
@@ -20562,19 +20757,19 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20200306,
-    1054
+    20200410,
+    920
    ],
-   "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45",
-   "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh"
+   "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be",
+   "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8"
   },
   "stable": {
    "version": [
     1,
-    0
+    1
    ],
-   "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45",
-   "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh"
+   "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be",
+   "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8"
   }
  },
  {
@@ -20644,8 +20839,8 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20200306,
-    513
+    20200423,
+    1658
    ],
    "deps": [
     "dash",
@@ -20653,8 +20848,8 @@
     "popup",
     "s"
    ],
-   "commit": "e8e9b0c2d1eda594fd40db9c64e93a70b426641b",
-   "sha256": "0m8771bzz972zf2lhv7f4z2x0rnnfc0iidb5jpz072wr3v52kark"
+   "commit": "d760aa880fc1052570ab0fd7e586eeffb7636af6",
+   "sha256": "0a27fv2yi4c19g78hgflrp8vx135v74q6n8ak3g3b2gh66vkvq7p"
   },
   "stable": {
    "version": [
@@ -20698,17 +20893,17 @@
     20191016,
     1241
    ],
-   "commit": "d864995d98479a21fb88fcf6d24b8262f2fdeae2",
-   "sha256": "091c58yvvwly070dgzz1202njlp695fzq85873v4dak1rwxisrwh"
+   "commit": "17895c30724c2a5ea18c0140d4022e2ef83d7208",
+   "sha256": "0sgn56g1225ar45kgp5qcdd6fc95skr36zci1lz1fszy94v162z7"
   },
   "stable": {
    "version": [
     2,
-    4,
-    0
+    5,
+    1
    ],
-   "commit": "ccd447e41a711f8a52bc854d71dba8677c900c34",
-   "sha256": "0i8b84mi38r431z4a1yh4xnn9z5mnk1g3di0qz6h4lsxq8pg2m0v"
+   "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2",
+   "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di"
   }
  },
  {
@@ -20767,11 +20962,11 @@
   "repo": "dylan-lang/dylan-mode",
   "unstable": {
    "version": [
-    20190831,
-    1910
+    20200425,
+    1347
    ],
-   "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4",
-   "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma"
+   "commit": "64f3aed546315c766331c69be3c7e78c7da6c333",
+   "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz"
   }
  },
  {
@@ -21098,14 +21293,14 @@
   "repo": "redguardtoo/eacl",
   "unstable": {
    "version": [
-    20191230,
-    1057
+    20200407,
+    756
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "a25c28f4ee1126d1ee51dae22843f3440520f1a3",
-   "sha256": "0pz894saz6ncira9ag9aqmfw394v56sfxldv25phh3z44y1ij01z"
+   "commit": "47b839f305e63e119b6a554497cd4b99512e8e00",
+   "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh"
   },
   "stable": {
    "version": [
@@ -21367,14 +21562,14 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20200327,
-    1040
+    20200419,
+    2017
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "f57e138d56bd293f30a64c33ab8b374758acfb08",
-   "sha256": "0h8bxy6p91hhx6mvzbxv2j3cr6bxcdbpgbaqa9ibcaxy72d9xrjp"
+   "commit": "87920ab793e6e854903eb101b80a0746f588dab6",
+   "sha256": "0mw5spmjn8yyjbdpas06rf9cmfsfa3k2z0yfrs7xvmaalpxz55xm"
   },
   "stable": {
    "version": [
@@ -21397,11 +21592,11 @@
   "repo": "flexibeast/ebuku",
   "unstable": {
    "version": [
-    20200203,
-    1122
+    20200422,
+    723
    ],
-   "commit": "2f1af38469966c788483cbce4ab70436f72cf30d",
-   "sha256": "15liiczqjf8p2jr9356zrj65ijp5gdrnb5i7m09armyhb8282rmg"
+   "commit": "ec8a5057dd2bf6275c8cdfca53c51e0b7f21b8f3",
+   "sha256": "0j6g56vqi12m5533dm6f716vsqcw59awfbiiv0jafb5kw9wj698v"
   }
  },
  {
@@ -21547,90 +21742,6 @@
    "sha256": "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s"
   }
  },
- {
-  "ename": "edbi-database-url",
-  "commit": "e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb",
-  "sha256": "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn",
-  "fetcher": "github",
-  "repo": "proofit404/edbi-database-url",
-  "unstable": {
-   "version": [
-    20160221,
-    1923
-   ],
-   "deps": [
-    "edbi"
-   ],
-   "commit": "d56c580268cd93651998c4c6b1c5558e6b6ca90f",
-   "sha256": "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx"
-  }
- },
- {
-  "ename": "edbi-django",
-  "commit": "10dd853022ab93e345761b04d760b3763f4d2384",
-  "sha256": "02vcbqgkvhlw9msf65777f85c8myxr95g2dz199nlfmz4vpqrkgq",
-  "fetcher": "github",
-  "repo": "proofit404/edbi-django",
-  "unstable": {
-   "version": [
-    20190212,
-    1417
-   ],
-   "deps": [
-    "edbi",
-    "pythonic"
-   ],
-   "commit": "9b73db66c02a222fc62dc3bc590962f58c5b43d8",
-   "sha256": "1yinm4qzwpdmr4a0isbkiw6ny23gllajcppwh7g0d62di3v242dm"
-  }
- },
- {
-  "ename": "edbi-minor-mode",
-  "commit": "5fb878b60c7ecbb1e3a47aef1d9765061c510644",
-  "sha256": "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi",
-  "fetcher": "github",
-  "repo": "proofit404/edbi-minor-mode",
-  "unstable": {
-   "version": [
-    20160706,
-    1447
-   ],
-   "deps": [
-    "edbi"
-   ],
-   "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec",
-   "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88"
-  },
-  "stable": {
-   "version": [
-    0,
-    1
-   ],
-   "deps": [
-    "edbi"
-   ],
-   "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec",
-   "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88"
-  }
- },
- {
-  "ename": "edbi-sqlite",
-  "commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
-  "sha256": "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y",
-  "fetcher": "github",
-  "repo": "proofit404/edbi-sqlite",
-  "unstable": {
-   "version": [
-    20160221,
-    1923
-   ],
-   "deps": [
-    "edbi"
-   ],
-   "commit": "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f",
-   "sha256": "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51"
-  }
- },
  {
   "ename": "ede-compdb",
   "commit": "3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a",
@@ -21787,8 +21898,8 @@
    "deps": [
     "websocket"
    ],
-   "commit": "7074fe87c2df4aa7afecb7513326f5d481dcf92d",
-   "sha256": "17kbakpr6d79cih1fmvnrivs0vk41fw0njhb5y6dbml6ppi11i57"
+   "commit": "e9ef6a72bdc6b58f932c51aa161869cee11b4bc9",
+   "sha256": "1akyxq0ja06q5bywa6nb4klnbvrw6f6d83bzrjdz2sc7ddk3a4hz"
   }
  },
  {
@@ -21887,8 +21998,8 @@
     20181016,
     1125
    ],
-   "commit": "af46de40e2991b046f04856c18a6483badce38aa",
-   "sha256": "1lfdfnc7cx3lqa69mpn72jhsz4dwmfnrfpzrnk6lfh10h65yfdiw"
+   "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3",
+   "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0"
   },
   "stable": {
    "version": [
@@ -21961,8 +22072,8 @@
    "deps": [
     "editorconfig"
    ],
-   "commit": "ddf60923c6f4841cb593b2ea04c9c710a01d262f",
-   "sha256": "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9"
+   "commit": "4f75e175ad15ce2038f926fe4f0e5a0c1d0cbc46",
+   "sha256": "12a78187ar4mxdf1sk8bkrdcxly1nc5m9krkry04jklj6h9dayj3"
   }
  },
  {
@@ -22071,8 +22182,8 @@
   "repo": "sebastiw/edts",
   "unstable": {
    "version": [
-    20200304,
-    1709
+    20200413,
+    1929
    ],
    "deps": [
     "auto-complete",
@@ -22083,8 +22194,8 @@
     "popup",
     "s"
    ],
-   "commit": "22eb59692a792c6769ae0b2b9f9a2583133764b8",
-   "sha256": "015irp4vd4s2j2iw4p0r98kb60xyjbrpvckj8iixsja3qj8b63rw"
+   "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29",
+   "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j"
   },
   "stable": {
    "version": [
@@ -22247,17 +22358,17 @@
     20200107,
     2333
    ],
-   "commit": "6ea43326d142b714363042a27e06d3487f7845d7",
-   "sha256": "0pvaz69rjaz8m32s4chq7kavf20njb78l380xl97blj9h0yry1l4"
+   "commit": "8e0706fdb5ae139a1db93bdd24203a261b13c875",
+   "sha256": "09jqjdgjrg740a326vn086wj3gv548w19dk8pz9k7k3dvlncw24y"
   },
   "stable": {
    "version": [
-    3,
-    10,
-    3
+    4,
+    0,
+    0
    ],
-   "commit": "79ab16f093aa3b2373422d0044f3119467755f5e",
-   "sha256": "0fisq0g3css641fh7y9vhagkfbsm2rfw9pnzyz434cr41wnjmjfz"
+   "commit": "400465de0ece5b03607895bd1c83b1cfae34079a",
+   "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i"
   }
  },
  {
@@ -22268,27 +22379,27 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20200320,
-    852
+    20200424,
+    1852
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "2209779972eee595ff6ea8e75c002f7e5726b0c8",
-   "sha256": "08mfgg9s76wmjzvpdirnm8rsa3fsvlvjivxjdn53aj1pnky55z8d"
+   "commit": "e5cf30e26bd3107583418f2b4539c7385d37d6c8",
+   "sha256": "0fx2zx46j4mivb2h1bdz7n17bmmd6811az1wzi8g4q430kiv9hpi"
   },
   "stable": {
    "version": [
     1,
-    5
+    6
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "33a4f869972f0958c15c33b47035672b265a8b55",
-   "sha256": "1x6nlsc93scq8lidx1l5ipi7r7s0p63m2vwkl77p3v59glir15cb"
+   "commit": "e02479a8c20cd79c3dfeb553deaaecd7d6e97e51",
+   "sha256": "13r1ysdhnxkc025wypwi6w507v18hm5qf0x29qrycql46f8klrjb"
   }
  },
  {
@@ -22299,28 +22410,28 @@
   "repo": "non-Jedi/eglot-jl",
   "unstable": {
    "version": [
-    20200120,
-    1457
+    20200413,
+    1930
    ],
    "deps": [
     "eglot",
     "julia-mode"
    ],
-   "commit": "94e84fe0d14585192dca53e1e962bec7596f095c",
-   "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb"
+   "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06",
+   "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "eglot",
     "julia-mode"
    ],
-   "commit": "94e84fe0d14585192dca53e1e962bec7596f095c",
-   "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb"
+   "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06",
+   "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs"
   }
  },
  {
@@ -22348,17 +22459,17 @@
  },
  {
   "ename": "eide",
-  "commit": "a42244392719c620b47bc43a7a8501dab4b6f74e",
-  "sha256": "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m",
+  "commit": "1dd52b48fbac25ee2873645d87a1238351a6ff74",
+  "sha256": "1akmb48rpq05mmb022yh0qnjlbs1wx5x6f1gk2kw5fb5g45swb0c",
   "fetcher": "git",
-  "url": "https://framagit.org/eide/eide.git",
+  "url": "https://forge.tedomum.net/eide/eide.git",
   "unstable": {
    "version": [
-    20191213,
-    2119
+    20200419,
+    2126
    ],
-   "commit": "2153a68b58910e7892b16cc32414e2be99e33f36",
-   "sha256": "17fbxijpiachsb16ngbv7wpy9f4m0456bc5q9g7z8qi28dgzlz9p"
+   "commit": "827f29b9fd8e20e2e460cffc67a8f9ac9623c450",
+   "sha256": "1bqsvk70l9n929b41xz6j3sg3irwrcrlbvqxpvq0d8jqjl4nw51g"
   },
   "stable": {
    "version": [
@@ -22393,8 +22504,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20200328,
-    2131
+    20200425,
+    1940
    ],
    "deps": [
     "anaphora",
@@ -22404,8 +22515,8 @@
     "request",
     "websocket"
    ],
-   "commit": "6fc75f20aa0b6666e743ce674c6da526f88793b1",
-   "sha256": "10cm3pvpjrqy76xd9067ayn108z34014cyaal4vj2l69yrkfr0m1"
+   "commit": "42134adf3c95b7768e2d725bab39ddb98feafa09",
+   "sha256": "07lwxl5kbsc0xlmnvp524p3r4m9f4ldxnkwm0gmbk8aq1lg1gyw6"
   },
   "stable": {
    "version": [
@@ -22479,8 +22590,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20200325,
-    1455
+    20200424,
+    1623
    ],
    "deps": [
     "auto-complete",
@@ -22489,8 +22600,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "5bf46fc49b7827604ee82d56b80eee36630b562d",
-   "sha256": "0dcnzq9l1mnfrn7rq8kvyfkbw36r6iagp61c0p757xwfawsaxns4"
+   "commit": "0914ff731630ebdaa4e07dba97644e0e57bbf18e",
+   "sha256": "0qm4sdzxmkm35kg3ldijj6vwbdn8yflivyv09m4w05vz0liks0qa"
   },
   "stable": {
    "version": [
@@ -22573,8 +22684,8 @@
     20181006,
     225
    ],
-   "commit": "456fea0866ee71cb5a68eb65e9464565674081bf",
-   "sha256": "1hcjf88xjgkgp5wv7ccnfifnmpdj33csx6xm7rrdal3cy0f3ydj8"
+   "commit": "64abd393d5cefb1d59380dcc1344befdf618735b",
+   "sha256": "006c2kgkky81mv7an24m55521ay0d6ang5cwi16ac88j8x3n1q4i"
   },
   "stable": {
    "version": [
@@ -22687,20 +22798,19 @@
   "repo": "raxod502/el-patch",
   "unstable": {
    "version": [
-    20191114,
-    1639
+    20200404,
+    1548
    ],
-   "commit": "4744d6b1a5405001cb75f2c362a681964367319c",
-   "sha256": "1l4rjvdrdzvgq5zq6njg6gv0b7p6j545h4v27mpyxfh3z5jc8c49"
+   "commit": "f5c785a6f951a4aa6d6ab5cda84460dad2a072cc",
+   "sha256": "12fw4zk3w8kh8g94k4hcqjixxb1vvnv4qivc672lwdj4d8a218jw"
   },
   "stable": {
    "version": [
-    2,
     2,
     3
    ],
-   "commit": "ef56cbc6950dffd91de93009bafe51efb81eb84f",
-   "sha256": "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7"
+   "commit": "278a27477a4d7032fe06bb56ab01701cb10df808",
+   "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2"
   }
  },
  {
@@ -22841,11 +22951,11 @@
   "repo": "tumashu/el2org",
   "unstable": {
    "version": [
-    20190504,
-    1114
+    20200408,
+    146
    ],
-   "commit": "fbb2c5bff78564111ff1826976101555314bfc53",
-   "sha256": "17d85fdckbzj551j98j0hrhdj0ag8ba2kpk2ix8fmvdnssxdnvm0"
+   "commit": "7db77fdd73f378d4e60e34c11bbdf00677adc32c",
+   "sha256": "196nrg4cp57calv36if0fkc8bjiz6qzisr29ry49zmkgjlqaafq3"
   },
   "stable": {
    "version": [
@@ -22991,8 +23101,8 @@
     20200316,
     1956
    ],
-   "commit": "7fa3b78d073c235ad945fc28d692c5f5fb60860a",
-   "sha256": "06cy6dsn3drfk0jkc10b96qzvi5rfhkjy7cib5dk2kqgg615is6d"
+   "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829",
+   "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb"
   },
   "stable": {
    "version": [
@@ -23114,14 +23224,14 @@
   "repo": "davidshepherd7/electric-operator",
   "unstable": {
    "version": [
-    20191005,
-    1109
+    20200410,
+    928
    ],
    "deps": [
     "dash"
    ],
-   "commit": "71d65e4abaef5e49a9e1b8fce706ce0296f9d5e2",
-   "sha256": "168ri3wahr6zjv2dvqc3jbqih2m4d0mfzp4gqw5mss000fqmx9ns"
+   "commit": "f8454905a147045f25ab03da7aa6406e4f20cc64",
+   "sha256": "1x087fry0yx5sk9vvgqv1zh7fkpgzvykl14fzns1920sxacgms68"
   },
   "stable": {
    "version": [
@@ -23268,15 +23378,15 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20200307,
-    1242
+    20200426,
+    1143
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "328dcf40def951ddc193f3d6ccb01cb58f9fc1cd",
-   "sha256": "0zqgkx6s9dcy6la62vlv4c12wx5a505pc1hhxiwhhpp93r61bh1z"
+   "commit": "294b0d70f2cb85d5563019343f14c64938ae4b07",
+   "sha256": "0bm6vn61awwa4yd97idjqbbwp3ypz11n5w9mswg5yivhg4kc82sm"
   },
   "stable": {
    "version": [
@@ -23473,6 +23583,24 @@
    "sha256": "09xbrk1li76fwa85kvd5xpr0zswrkh51p7a62sb8g422wpaqxiwx"
   }
  },
+ {
+  "ename": "elisp-depmap",
+  "commit": "8c86ca9b1ad39282f965d36ec2a8df807cc0ebb1",
+  "sha256": "08qjrc3vrn18apnb856qd2m0wzza8755fbh8ly9nh58dlbjhkkd7",
+  "fetcher": "github",
+  "repo": "mtekman/elisp-depmap.el",
+  "unstable": {
+   "version": [
+    20200413,
+    1215
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "e47616c968dd82e30cb10961452e2b46c7900163",
+   "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i"
+  }
+ },
  {
   "ename": "elisp-docstring-mode",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -23699,8 +23827,8 @@
   "repo": "jcollard/elm-mode",
   "unstable": {
    "version": [
-    20200301,
-    19
+    20200406,
+    214
    ],
    "deps": [
     "dash",
@@ -23708,8 +23836,8 @@
     "reformatter",
     "s"
    ],
-   "commit": "3f042ec430e7d915bfdca21d4f4d6201a882434b",
-   "sha256": "16b66kv49bslnnhya2a9q0zshcwx58017sy0ab451j5zsq42v2qh"
+   "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f",
+   "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i"
   },
   "stable": {
    "version": [
@@ -24047,8 +24175,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "fc54812f5f53889842e7e707727e50d9589443ca",
-   "sha256": "1jdpg6vq88kxg1wfhp9hwnvfadxazmznzscfhvr967fbgq46w6qj"
+   "commit": "816061cf16d53448d95612380855e7ccaf59a417",
+   "sha256": "0fjz3y0yh2hfmx0470jcyni1glc6m3bm5gh20iakvlwxf4wa8801"
   },
   "stable": {
    "version": [
@@ -24236,15 +24364,15 @@
   "repo": "wamei/elscreen-multi-term",
   "unstable": {
    "version": [
-    20151022,
-    233
+    20200417,
+    821
    ],
    "deps": [
     "elscreen",
     "multi-term"
    ],
-   "commit": "7b6048a0dd80f69460a62bbc6f1af8856141a5ea",
-   "sha256": "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51"
+   "commit": "4ea89bae0444d9d4377515929f76cb3e98140f1f",
+   "sha256": "0j5dpikjxwn1679ndy894g55qm9hs0n65lqyxx483h584nqxsdkg"
   }
  },
  {
@@ -24350,11 +24478,11 @@
   "repo": "emacscollective/elx",
   "unstable": {
    "version": [
-    20191226,
-    1614
+    20200422,
+    1352
    ],
-   "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09",
-   "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6"
+   "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c",
+   "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8"
   },
   "stable": {
    "version": [
@@ -25172,8 +25300,8 @@
   "repo": "Wilfred/emacs-refactor",
   "unstable": {
    "version": [
-    20191122,
-    1911
+    20200420,
+    721
    ],
    "deps": [
     "cl-lib",
@@ -25186,8 +25314,8 @@
     "projectile",
     "s"
    ],
-   "commit": "8038ab88a000a835ca73af2068b1ef536bc7e33c",
-   "sha256": "1d27y6chxjf4k9cgsk93xjf1wq9lrv0516lpnqqlp2rdd7m3nv7y"
+   "commit": "a8f6ab823453decf43f0764d02e554d05009a631",
+   "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs"
   },
   "stable": {
    "version": [
@@ -25358,25 +25486,6 @@
    "sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5"
   }
  },
- {
-  "ename": "envdir",
-  "commit": "79c1497f709f6d23e4886359e09ab0456ed61777",
-  "sha256": "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8",
-  "fetcher": "github",
-  "repo": "proofit404/envdir-mode",
-  "unstable": {
-   "version": [
-    20160221,
-    1923
-   ],
-   "deps": [
-    "dash",
-    "f"
-   ],
-   "commit": "f29346c55ccf11d8c75628edc6d430ed63c36917",
-   "sha256": "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6"
-  }
- },
  {
   "ename": "eopengrok",
   "commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545",
@@ -25647,14 +25756,14 @@
   "repo": "atomontage/erc-crypt",
   "unstable": {
    "version": [
-    20200103,
-    1329
+    20200424,
+    2024
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "26e16e0fc3af78e70b095f47995d2a368f8de61d",
-   "sha256": "197sj97j7mc9jwhamra4narnypdg3xpxy5rb95an5gqqzhy9bccm"
+   "commit": "ba36632666ea0a631d23b6fc54c16ada55673b02",
+   "sha256": "1q7bia9l672dfa0q4mrhv2cnxk2c8vhpl7n649zw7zwfpkqnzh70"
   },
   "stable": {
    "version": [
@@ -26069,18 +26178,18 @@
     20200313,
     1030
    ],
-   "commit": "f805a35f696d965b297de3988a2340f86bfe88ba",
-   "sha256": "102yzbgmqyy5m74zhr8kaai17dyhg8k6w0ykxyvmb0q7ghwaq01s"
+   "commit": "7ec0ad6ed076b76de8cd52e28445f324a5f2853a",
+   "sha256": "0r0sn8vfmgamf3mnjjkkv9y0r8a6xkn5f5axw1av0liiv95kgrm8"
   },
   "stable": {
    "version": [
     23,
     0,
     -1,
-    2
+    3
    ],
-   "commit": "a24425668beed38e04039c292361e09c4826683f",
-   "sha256": "1i91p2hsajcwjqv10ri6jj2a94g68mb6fmxqx47g50fbc5f0dqj5"
+   "commit": "9f17d424ada5353db1e5b31296484d95679f8ca8",
+   "sha256": "0012fbf9a1whq2bzii73m645bvf4vww403fcd54j9k27916vcfx5"
   }
  },
  {
@@ -26870,14 +26979,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20200328,
-    1547
+    20200419,
+    1920
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "1c2387fdba509c1c9d072150f65ccc318a570870",
-   "sha256": "0llsjqrvabcvpd2nhixiklwmm2lisywif77iwfrsdc6lfxp8cdd0"
+   "commit": "007fa4b5192154db3d90e6e861f96193c1b145f5",
+   "sha256": "12kj006yxl84fav2ryxx6ajk284rskgy6imi9wjpfl8qqfcykcm0"
   },
   "stable": {
    "version": [
@@ -27326,16 +27435,16 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20200304,
-    1421
+    20200417,
+    1238
    ],
    "deps": [
     "cl-lib",
     "goto-chg",
     "undo-tree"
    ],
-   "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa",
-   "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3"
+   "commit": "d243eae8649272799ec3864fde14c1164f036940",
+   "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4"
   },
   "stable": {
    "version": [
@@ -27529,16 +27638,16 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20200327,
-    722
+    20200426,
+    848
    ],
    "deps": [
     "annalist",
     "cl-lib",
     "evil"
    ],
-   "commit": "2df9bedfa48bdc22e46bf4d43f6e2792d4cafbea",
-   "sha256": "17737k612gl5bhkkq8fdivk9rxbcypfl9hnm3mbp5v2wpr8chw3a"
+   "commit": "695e941d8ac59dc7534524e5cd27ced9490259a1",
+   "sha256": "0fdqxgkp0fl5862b15qxnl2njs97vznsydw5jm6hw8fq94a1crhn"
   },
   "stable": {
    "version": [
@@ -27611,15 +27720,15 @@
   "repo": "PythonNut/evil-easymotion",
   "unstable": {
    "version": [
-    20180114,
-    654
+    20200424,
+    135
    ],
    "deps": [
     "avy",
     "cl-lib"
    ],
-   "commit": "79c13ed3bce018ac09d358e642e5bd7025e93603",
-   "sha256": "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73"
+   "commit": "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9",
+   "sha256": "0xsva9bnlfwfmccm38qh3yvn4jr9za5rxqn4pwxbmhnx4rk47cch"
   }
  },
  {
@@ -28063,15 +28172,15 @@
   "repo": "emacs-evil/evil-magit",
   "unstable": {
    "version": [
-    20200302,
-    1611
+    20200409,
+    1909
    ],
    "deps": [
     "evil",
     "magit"
    ],
-   "commit": "0b79aa33a478770865716dc0e09f95d91ec042a2",
-   "sha256": "0qxapq9nl1yr3ryg1q9n2ajffm308fai115mbvwmjl9sd6x2p3ly"
+   "commit": "253c644807013fe92429acdef418748794b8f254",
+   "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5"
   },
   "stable": {
    "version": [
@@ -28131,8 +28240,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "11d98debf8b051b10068137668eb54c2fede0e30",
-   "sha256": "1jppiqz1mlmz9wnxmaymg15sz6j59kghhrv95r6hkv90zwdvbqvw"
+   "commit": "076ace3ee22a61890f375ae492c634f71ce84301",
+   "sha256": "0d4xdrqa8ylh67wgyywxsh0crm06y31babc8sksrpwxlr12xyaww"
   },
   "stable": {
    "version": [
@@ -28260,11 +28369,11 @@
   "repo": "redguardtoo/evil-nerd-commenter",
   "unstable": {
    "version": [
-    20200324,
-    2310
+    20200417,
+    59
    ],
-   "commit": "4387407615258d5e95f71bfb425cbe92dd813290",
-   "sha256": "0v31gbn423g20lqksvbc72z325lh0qjmgz8nhy8ygqli4b2msvzb"
+   "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b",
+   "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n"
   },
   "stable": {
    "version": [
@@ -28672,15 +28781,15 @@
   "repo": "hlissner/evil-snipe",
   "unstable": {
    "version": [
-    20200103,
-    923
+    20200422,
+    519
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "3ec8adfd4990f95fa0fab2b7019ead3596857673",
-   "sha256": "0q689f52saky3rfap351n4bkjn0kpg7xkjias926affqpghywb1r"
+   "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1",
+   "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2"
   },
   "stable": {
    "version": [
@@ -28863,8 +28972,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa",
-   "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3"
+   "commit": "d243eae8649272799ec3864fde14c1164f036940",
+   "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4"
   },
   "stable": {
    "version": [
@@ -29617,11 +29726,11 @@
   "repo": "extemporelang/extempore-emacs-mode",
   "unstable": {
    "version": [
-    20200312,
-    224
+    20200408,
+    2253
    ],
-   "commit": "9f370d6cba7f115896579b634c7550923503a4ab",
-   "sha256": "11qm9f850zm8l26q75j9mlbl5ydiyw7alan47h4nyfihpl4498qz"
+   "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e",
+   "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp"
   }
  },
  {
@@ -30549,11 +30658,11 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20200206,
-    2001
+    20200405,
+    1935
    ],
-   "commit": "c02f4a9ed1b9c26f9cfc3237906c2844f5937622",
-   "sha256": "1bcdicgp3wlxpdzardx1ry9js192dy26q8af6pdlvrnxqvdl2asm"
+   "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d",
+   "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6"
   }
  },
  {
@@ -30635,16 +30744,16 @@
  },
  {
   "ename": "figlet",
-  "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
-  "sha256": "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj",
-  "fetcher": "bitbucket",
+  "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203",
+  "sha256": "0p5xnq3c4bvvy7nqgi18ylsha7kz9r7apw7lz84kq5hwhni298k5",
+  "fetcher": "github",
   "repo": "jpkotta/figlet",
   "unstable": {
    "version": [
     20160218,
     2237
    ],
-   "commit": "70ca269d706eedd34838fe2435073c6860be470b",
+   "commit": "19a38783a90e151faf047ff233a21a729db0cea9",
    "sha256": "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs"
   }
  },
@@ -30959,11 +31068,11 @@
   "repo": "jming422/fira-code-mode",
   "unstable": {
    "version": [
-    20200316,
-    1708
+    20200415,
+    2356
    ],
-   "commit": "64c4e655ea6ef29c7e720a5bf9281e865f2e3fa7",
-   "sha256": "0c11lfwdibx35wwvpq3vl4img4rz2slslqhlqaqbab212ii9jsmy"
+   "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b",
+   "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz"
   }
  },
  {
@@ -31022,20 +31131,20 @@
   "repo": "johanvts/emacs-fireplace",
   "unstable": {
    "version": [
-    20181211,
-    1927
+    20200402,
+    2206
    ],
-   "commit": "571ffa7dd0ce46edca838df74d055aaa83da4d78",
-   "sha256": "1iw17rkihsn50p3zljag82v09zyav8bzgfn6mfa267fkf4f1fgjy"
+   "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527",
+   "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c"
   },
   "stable": {
    "version": [
     1,
-    1,
-    2
+    2,
+    0
    ],
-   "commit": "2b966ed65b714c613f79e9144d004dfa3b28f1ed",
-   "sha256": "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8"
+   "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527",
+   "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c"
   }
  },
  {
@@ -31325,6 +31434,21 @@
    "sha256": "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f"
   }
  },
+ {
+  "ename": "flatfluc-theme",
+  "commit": "de15ce71674965c5e0a8564ae2e640bc05dbd589",
+  "sha256": "0rpmiw71scdl3dgrvf2j9d909wmafyvlgraxfg5hsxngcyj5gjk0",
+  "fetcher": "github",
+  "repo": "seblemaguer/flatfluc-theme",
+  "unstable": {
+   "version": [
+    20200419,
+    1033
+   ],
+   "commit": "42f93b2ffb651901d6bad7eb5587790298dda371",
+   "sha256": "035zm6dh416jk1ipg35qnkr8cbfsjkb92dhc4ryay4p30rp1yljz"
+  }
+ },
  {
   "ename": "flatland-black-theme",
   "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c",
@@ -31442,16 +31566,16 @@
  },
  {
   "ename": "flex-isearch",
-  "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
-  "sha256": "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3",
-  "fetcher": "bitbucket",
+  "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203",
+  "sha256": "0y5j90y4ssw3kwqhji9h4icy8xj2pa5fjvkbkl4x7rxs8kwwm989",
+  "fetcher": "github",
   "repo": "jpkotta/flex-isearch",
   "unstable": {
    "version": [
     20170308,
     2010
    ],
-   "commit": "8b934ea6f1e4324088f055454a2e8b714961854a",
+   "commit": "b1f7e04de762282c276343cc2709af9ff4abc9d2",
    "sha256": "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh"
   }
  },
@@ -31481,14 +31605,11 @@
   "repo": "IvanMalison/flimenu",
   "unstable": {
    "version": [
-    20170418,
-    147
+    20200415,
+    2353
    ],
-   "deps": [
-    "dash"
-   ],
-   "commit": "9351201d89b05cbdaec312a6ebd7fd10c38d6112",
-   "sha256": "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va"
+   "commit": "f110bc77415a7594742f3b12551571c4069c9157",
+   "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql"
   }
  },
  {
@@ -31633,11 +31754,11 @@
   "repo": "amake/flutter.el",
   "unstable": {
    "version": [
-    20200226,
-    640
+    20200416,
+    1225
    ],
-   "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d",
-   "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy"
+   "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563",
+   "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga"
   }
  },
  {
@@ -31655,8 +31776,8 @@
     "flutter",
     "flycheck"
    ],
-   "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d",
-   "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy"
+   "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563",
+   "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga"
   }
  },
  {
@@ -31766,8 +31887,8 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20200329,
-    2344
+    20200425,
+    1426
    ],
    "deps": [
     "dash",
@@ -31775,8 +31896,8 @@
     "pkg-info",
     "seq"
    ],
-   "commit": "1751a4e9f8f6f20706a1620429422f101eabcd38",
-   "sha256": "10w9fgcwyni5iid7sfzrza155wrh481gdylwrwa7v640a9jmbyls"
+   "commit": "c8218044c849f21cc628b6c077e41c690f046bc0",
+   "sha256": "11n3h7x9nszqljd0awi6jzrhrkac7sdyrwvb94bikrj1d7yin25g"
   },
   "stable": {
    "version": [
@@ -32053,14 +32174,14 @@
   "repo": "borkdude/flycheck-clj-kondo",
   "unstable": {
    "version": [
-    20190619,
-    1743
+    20200414,
+    1444
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "f652a8dc4cff01e78bba50b555bae7ba6115b552",
-   "sha256": "09k87wfz4m16r32g6ry4jl2zagh1gpgfd9sik54wvyky24s605y4"
+   "commit": "5472c26ffdf754a0661357564874ffd4f8598805",
+   "sha256": "0nb88mil1nlhv0nalswl3xwndzz91yah52zpri2jfbyvivshpfm4"
   },
   "stable": {
    "version": [
@@ -32491,8 +32612,8 @@
     "let-alist",
     "seq"
    ],
-   "commit": "debd0af563cb6c2944367a691c7fa3021d9378c1",
-   "sha256": "1vl0lss2n50pz5wscqj6vhjwb4hbg8xx2chh5vafsrnn0a3fryrd"
+   "commit": "1b60050efd4729bfba548f3e5adbcb58436667cb",
+   "sha256": "1kjms9d2c98ffd1qxs879qhg0n4jzic0r5kni9y4gz3v09ww8zms"
   }
  },
  {
@@ -32637,20 +32758,20 @@
  },
  {
   "ename": "flycheck-grammalecte",
-  "commit": "fdd82aa0568d998a3d176b5ee47b8a227438ea09",
-  "sha256": "0xqg995a42cl6mvmpi68ay56fgs636cbzg65q5si5yc1yzgl74nv",
+  "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395",
+  "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn",
   "fetcher": "git",
   "url": "https://git.deparis.io/flycheck-grammalecte/",
   "unstable": {
    "version": [
-    20200308,
-    1452
+    20200416,
+    1620
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "ca4b87d22474d3337db72e19f88105f557f44867",
-   "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj"
+   "commit": "d99833992eb874cbbd25e991e3037642e125bb59",
+   "sha256": "07ph5kk9zb375nkdqryzpfzqn9rr89minf2jgyzlnv58fzqiwpjp"
   },
   "stable": {
    "version": [
@@ -32805,14 +32926,26 @@
   "repo": "gexplorer/flycheck-indicator",
   "unstable": {
    "version": [
-    20190729,
-    1501
+    20200331,
+    1142
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "6b1386296ddf2ccc11ca8fa719dc0b2f16808424",
-   "sha256": "0bd8k3jzipm0r0242hpl2lkcdfnb367yf4xpj6r23g3y99f6f0yk"
+   "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8",
+   "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    1
+   ],
+   "deps": [
+    "flycheck"
+   ],
+   "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8",
+   "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn"
   }
  },
  {
@@ -32920,26 +33053,26 @@
   "repo": "candid82/flycheck-joker",
   "unstable": {
    "version": [
-    20180913,
-    504
+    20200412,
+    2346
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "51e99e697761ee8dab863930910abdba7607c1bd",
-   "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48"
+   "commit": "93576295fef7a749bf779eeece5edd85e21868e2",
+   "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln"
   },
   "stable": {
    "version": [
     1,
-    3,
+    5,
     0
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "51e99e697761ee8dab863930910abdba7607c1bd",
-   "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48"
+   "commit": "93576295fef7a749bf779eeece5edd85e21868e2",
+   "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln"
   }
  },
  {
@@ -33162,8 +33295,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "12a77ee8ee3f6e774365f63be3cd5aede6462dd5",
-   "sha256": "187v8877wh247j26d5h2qcnc8i3fmqgyzfvjjjlw9sswqgrln6m7"
+   "commit": "5b4e14ab0cbce2ff35fee7e69b5b95eafd609c80",
+   "sha256": "1cx1rm40ns3y5bdbk8hfycdaq16p4zxkjjss02xs6hl96yvc4kaj"
   }
  },
  {
@@ -33374,28 +33507,28 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20200122,
-    1256
+    20200411,
+    531
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "a1c30ca634107551c20c846b5316ca5697adb06d",
-   "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1"
+   "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101",
+   "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w"
   },
   "stable": {
    "version": [
     0,
-    3,
-    3
+    5,
+    0
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a",
-   "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk"
+   "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1",
+   "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1"
   }
  },
  {
@@ -33406,16 +33539,16 @@
   "repo": "Wilfred/flycheck-pkg-config",
   "unstable": {
    "version": [
-    20180430,
-    2243
+    20200409,
+    501
    ],
    "deps": [
     "dash",
     "flycheck",
     "s"
    ],
-   "commit": "e72e4c1b8153611ed82695673af84096f4d52795",
-   "sha256": "07zyrbib9qzy4kj3p7kljcfi53qhb28nf0sjhhkqzdj09iv2k9wf"
+   "commit": "b76b24ea1f4800f5fb96ce9c6c4788e0e63133d3",
+   "sha256": "01wzzrpfgh3z28qsynxvkfm92xy98vyvkkv31qh53kxxdicnzlh0"
   }
  },
  {
@@ -33575,14 +33708,14 @@
   "repo": "msherry/flycheck-pycheckers",
   "unstable": {
    "version": [
-    20200206,
-    2158
+    20200414,
+    1901
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74",
-   "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5"
+   "commit": "467f9b94d9eecc8a8027cf204d304e258f72edaa",
+   "sha256": "03yiva5lmbfawdjjfsmqlqgvrdgfni1gh1qbdpma5gqhckz5j0d7"
   },
   "stable": {
    "version": [
@@ -33679,8 +33812,8 @@
     "flycheck",
     "rtags"
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -34778,6 +34911,36 @@
    "sha256": "1z6m3bggd3gmxvx92j16jmqm5h9jjxnmsd7adyf12ziy5n5rqcbc"
   }
  },
+ {
+  "ename": "flymake-phpstan",
+  "commit": "bc0ea837b6813002826d861acb7f3cc506c337ba",
+  "sha256": "0fg2skkzd9xn42a5jdxg69bjg0jw26p5jrq6i5v815vgisxfgjbv",
+  "fetcher": "github",
+  "repo": "emacs-php/phpstan.el",
+  "unstable": {
+   "version": [
+    20200415,
+    1637
+   ],
+   "deps": [
+    "phpstan"
+   ],
+   "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101",
+   "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w"
+  },
+  "stable": {
+   "version": [
+    0,
+    5,
+    0
+   ],
+   "deps": [
+    "phpstan"
+   ],
+   "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1",
+   "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1"
+  }
+ },
  {
   "ename": "flymake-puppet",
   "commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f",
@@ -34980,8 +35143,8 @@
     20200329,
     2005
    ],
-   "commit": "bb413006afc23105a0f84df6fb82504a06483a55",
-   "sha256": "09cqn0255pxim34v5zfypbzr4clfd2ajlsyxpc9h64wg6v9876y5"
+   "commit": "78956f0e5bb9c4d35989657a55929e8e3f5691e6",
+   "sha256": "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix"
   }
  },
  {
@@ -35097,8 +35260,8 @@
     20200215,
     1408
    ],
-   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
-   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
+   "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5",
+   "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3"
   },
   "stable": {
    "version": [
@@ -35125,8 +35288,8 @@
     "avy-menu",
     "flyspell-correct"
    ],
-   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
-   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
+   "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5",
+   "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3"
   },
   "stable": {
    "version": [
@@ -35157,8 +35320,8 @@
     "flyspell-correct",
     "helm"
    ],
-   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
-   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
+   "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5",
+   "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3"
   },
   "stable": {
    "version": [
@@ -35189,8 +35352,8 @@
     "flyspell-correct",
     "ivy"
    ],
-   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
-   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
+   "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5",
+   "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3"
   },
   "stable": {
    "version": [
@@ -35221,8 +35384,8 @@
     "flyspell-correct",
     "popup"
    ],
-   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
-   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
+   "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5",
+   "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3"
   },
   "stable": {
    "version": [
@@ -35505,8 +35668,8 @@
     20200321,
     533
    ],
-   "commit": "1a54066611da213626ab69ea426ba3c63ece3438",
-   "sha256": "1c7n099b8dkrcrvxsva7da1m1z01p0acbyj271lix9w331h9gbf6"
+   "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e",
+   "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd"
   }
  },
  {
@@ -35710,8 +35873,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20200309,
-    937
+    20200425,
+    2225
    ],
    "deps": [
     "closql",
@@ -35723,8 +35886,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "2e2d26cf428012f0ece53a81cde02179e72648aa",
-   "sha256": "0mpim6699cda3ds8gv1f2y021gssjrw9rg7w9b8h1ifhrl54x0qn"
+   "commit": "e2da80660a0550f613400ce3b238025589800417",
+   "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av"
   },
   "stable": {
    "version": [
@@ -35758,8 +35921,8 @@
     20160102,
     2253
    ],
-   "commit": "799ca3e72b20a59a755a094b8cead57f654f3170",
-   "sha256": "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i"
+   "commit": "15bbcb2d2df21910af3b9686b671e0c7d1c93b26",
+   "sha256": "1vfnpm6kp4xf3qc73i41rg73bhbym1sd4z6jam4k1f44iny0zqxz"
   },
   "stable": {
    "version": [
@@ -35779,15 +35942,15 @@
   "repo": "lassik/emacs-format-all-the-code",
   "unstable": {
    "version": [
-    20200219,
-    1628
+    20200422,
+    1731
    ],
    "deps": [
     "cl-lib",
     "language-id"
    ],
-   "commit": "8c8c47a863a397d947999fff4358caf20bafca0a",
-   "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss"
+   "commit": "c157b57e963da0b44a079b0477d6c742e9c5a10b",
+   "sha256": "15pqff80ydcvkvbiyi50aix5mnwgrhvvajk60i6cwgkb2xghs20r"
   },
   "stable": {
    "version": [
@@ -35924,26 +36087,26 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20200312,
-    1315
+    20200416,
+    841
    ],
    "deps": [
     "seq"
    ],
-   "commit": "92fdd9c8a5e405cd77ee6f338351b9ebc8976038",
-   "sha256": "0wa28wdd3kgxwaaiay0mha4w87x2p8z01vfn93y1256awx8kgg78"
+   "commit": "5998d977ca84930e124558007dc65370164ed960",
+   "sha256": "1hmc3pacscr0f02cw6hbbv444k07k5gf1909lyz8jpfr5r5wi2in"
   },
   "stable": {
    "version": [
     3,
-    0,
-    3
+    1,
+    0
    ],
    "deps": [
     "seq"
    ],
-   "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4",
-   "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d"
+   "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d",
+   "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s"
   }
  },
  {
@@ -36210,20 +36373,50 @@
   "repo": "rnkn/freeze-it",
   "unstable": {
    "version": [
-    20200322,
-    700
+    20200416,
+    1605
    ],
-   "commit": "0e2ddd99dc1211800d55e874c1bd078f879e0d9c",
-   "sha256": "08jdlwn8da8cgkpwpx8834rhx8is5iigq0cv3abbydmz5lrd72nl"
+   "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146",
+   "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    1
+   ],
+   "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146",
+   "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn"
+  }
+ },
+ {
+  "ename": "friendly-tramp-path",
+  "commit": "cb18ad238792570e5ef825a101059bfdc293949f",
+  "sha256": "120g9w1l4i544km5d1jx5g4vsfb92lizn7ibxl767zffgahqhbdf",
+  "fetcher": "github",
+  "repo": "p3r7/friendly-tramp-path",
+  "unstable": {
+   "version": [
+    20200419,
+    851
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "ce7d15dd96300d376d483d685aa4a34357da8d6a",
+   "sha256": "01v311c8w86s954adl1ncmbhmk07acm8pnak70gn93dpz77vl9g4"
   },
   "stable": {
    "version": [
     0,
     1,
-    2
+    0
    ],
-   "commit": "cf53f31e4f266b7f0b12e091de074e763c7d565b",
-   "sha256": "0drznbwci4swfxmmdvkm14qmpb9y9pykyflhh69l5fdxiigpdlb8"
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "be2714118876c592fae199aaa877c49475b6176a",
+   "sha256": "1z1rcm8pc8p2d7zzf02nms6cz2ik8y1b95a58lqxlp8n75rz4c5i"
   }
  },
  {
@@ -36349,8 +36542,8 @@
   "repo": "FStarLang/fstar-mode.el",
   "unstable": {
    "version": [
-    20200305,
-    1654
+    20200424,
+    2235
    ],
    "deps": [
     "company",
@@ -36360,8 +36553,8 @@
     "quick-peek",
     "yasnippet"
    ],
-   "commit": "aaaf2568881d3e5e08f8cbd04a9add49912552ad",
-   "sha256": "1wqbfz8sbvfl7v31a1i6mc6c8p5fyp8yflj87lavpk1d0h5dl8ly"
+   "commit": "d8b586518f32d4acde049852d81902670d1ee277",
+   "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi"
   },
   "stable": {
    "version": [
@@ -36391,8 +36584,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "2d85dafa9872fa34b463f6473e61a1ed71c17788",
-   "sha256": "0zwrlvp2i0n4imba84cc0hsivyaxv4sy98bsqfwpy65xm94h0d96"
+   "commit": "298bbddeb1dcc135c075d484f283f409f0d0d055",
+   "sha256": "199a1gs7ja9l3bc2sw9cwv9jv0zvqqaa2pp6hibbyl00rsk2xs58"
   },
   "stable": {
    "version": [
@@ -36545,14 +36738,14 @@
   "repo": "diku-dk/futhark-mode",
   "unstable": {
    "version": [
-    20200123,
-    931
+    20200415,
+    1228
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ca22b1e5fe46125b968c3da46e0bc9780b32e346",
-   "sha256": "1zkqlacxmiwprx8xbnp6phf3gh3faxghxv0j90019k0g3dq9l3ws"
+   "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645",
+   "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm"
   }
  },
  {
@@ -36821,11 +37014,11 @@
   "repo": "koral/gcmh",
   "unstable": {
    "version": [
-    20200315,
-    950
+    20200409,
+    1456
    ],
-   "commit": "9e241e0a9f921b04407050a0f0fada3d0c3b254a",
-   "sha256": "0k2qwkj0lacdb5kmvx2ip17wn7bg01y5166bi9lk9zzk3jbh70d3"
+   "commit": "b1bde5089169a74f62033d027e06e98cbeedd43f",
+   "sha256": "0k0gh1dr3hipg73mpgkw6hlg27c7c5r8aa61p4vj2rpmf6k90pc5"
   }
  },
  {
@@ -36836,20 +37029,20 @@
   "repo": "GDQuest/emacs-gdscript-mode",
   "unstable": {
    "version": [
-    20200328,
-    1820
+    20200404,
+    112
    ],
-   "commit": "56a864ecff99ae314b838b755cf26af66f4f9323",
-   "sha256": "0mlvvagdr2bj13ibms1vq8p9zp10ag4qhyfklkj93lg6j744qav4"
+   "commit": "9a74dd3b6cfe73dd7510faf26ee7bc14e3c7dbc6",
+   "sha256": "1rrwhb6ak0gajcci4kk7fdyfm0c5wfhj6zys9f4m5xjya9pb3wb4"
   },
   "stable": {
    "version": [
     1,
-    0,
-    2
+    1,
+    0
    ],
-   "commit": "361439f28bd10649c9f58f1d3290b4ee63ee4f54",
-   "sha256": "1ymblv04as076yfi3inmc3s66j0nqslqvfx34s3da6s8g8zi0ash"
+   "commit": "86577f81dc2640d5388565d0430b4df241bdd38e",
+   "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d"
   }
  },
  {
@@ -36937,11 +37130,11 @@
   "repo": "jaor/geiser",
   "unstable": {
    "version": [
-    20200327,
-    2213
+    20200419,
+    2111
    ],
-   "commit": "9b45785173dc61a2897b17edf27df9407d1d94ce",
-   "sha256": "0r21fs262jzzpilynnlnqc9bd42fbq7hn522dfnx93jjmni35kjc"
+   "commit": "07912e512a7bf1507d0dd5ba3774b684c5ac3287",
+   "sha256": "0w2rhk04x4wqcx6brfacqx3r7whyzdnbgwzfgmba0xsrpb2x7rpz"
   },
   "stable": {
    "version": [
@@ -36961,14 +37154,14 @@
   "repo": "noctuid/general.el",
   "unstable": {
    "version": [
-    20200320,
-    2340
+    20200425,
+    1425
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "14ad4c888b34eb8ebd946d26917aaf2dd4fcce29",
-   "sha256": "09hp8aavimlhasnxl5z74pk6afvjpcpd6fpv7j2amdmyhbflxv9h"
+   "commit": "42e38034cd2305fa7432866323c923979d8f9b06",
+   "sha256": "0aalp4x5gp0yhv037ymspsj4n3vqzxld0c1nk8ihl50k6krl4kxy"
   }
  },
  {
@@ -37384,15 +37577,15 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20200309,
-    936
+    20200425,
+    2233
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "a8bf337534ec583906db77a3d56f7d1b84bda952",
-   "sha256": "0cpbz79k6q5ang47qw4j3i99qz093xc40k8lsc9j21g07fihxiv5"
+   "commit": "03d2546614619f42ac2983e79d0069ca4cbcfbfc",
+   "sha256": "0j0j86cbv87i2wfcvcyjb53wdzd003770krlnpx0gjkq036vvkwk"
   },
   "stable": {
    "version": [
@@ -37668,15 +37861,15 @@
   "repo": "walseb/git-backup-ivy",
   "unstable": {
    "version": [
-    20191224,
-    1254
+    20200424,
+    1049
    ],
    "deps": [
     "git-backup",
     "ivy"
    ],
-   "commit": "0a6226c37b63660e6b246bc9bbcf919e44270a99",
-   "sha256": "081dfbxs417zv2dds4i16ak6dri41cfn012sbfmalp8qslpclb6z"
+   "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a",
+   "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag"
   }
  },
  {
@@ -37743,8 +37936,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
-   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
+   "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10",
+   "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw"
   },
   "stable": {
    "version": [
@@ -38015,11 +38208,11 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20191119,
-    1420
+    20200331,
+    2329
    ],
-   "commit": "2fb0e4be8801e7d53e02fc7f14ec0f9a14586ba2",
-   "sha256": "1y5qw5iyblj14zjvw4is51qyvmy2z0f0iba7cqr628zn9q1fqll6"
+   "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87",
+   "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c"
   },
   "stable": {
    "version": [
@@ -38811,11 +39004,11 @@
   "repo": "jimhourihan/glsl-mode",
   "unstable": {
    "version": [
-    20191017,
-    2148
+    20200420,
+    1839
    ],
-   "commit": "43d906688a8e2fe650005806eb69bea131d9321a",
-   "sha256": "1783gimn1adfgs2xybz15nrx8wsz1xb4xk8mxrc18hyci7fwk04r"
+   "commit": "9bf168017eb3af7a396165a79a7b870572d59666",
+   "sha256": "13k4am1bk20b6pncg145g4p9abw42ksgaj0zq2bz7b4b8pnfdzp0"
   }
  },
  {
@@ -39272,8 +39465,8 @@
    "deps": [
     "auto-complete"
    ],
-   "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9",
-   "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9"
+   "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c",
+   "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb"
   },
   "stable": {
    "version": [
@@ -39517,8 +39710,8 @@
     "cl-lib",
     "go-mode"
    ],
-   "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9",
-   "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db"
+   "commit": "734d5232455ffde088021ea5908849ac570e890f",
+   "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps"
   },
   "stable": {
    "version": [
@@ -39610,11 +39803,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20200309,
-    303
+    20200425,
+    1740
    ],
-   "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9",
-   "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db"
+   "commit": "734d5232455ffde088021ea5908849ac570e890f",
+   "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps"
   },
   "stable": {
    "version": [
@@ -39718,8 +39911,8 @@
    "deps": [
     "go-mode"
    ],
-   "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9",
-   "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db"
+   "commit": "734d5232455ffde088021ea5908849ac570e890f",
+   "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps"
   },
   "stable": {
    "version": [
@@ -39850,20 +40043,20 @@
   "repo": "emacsorphanage/god-mode",
   "unstable": {
    "version": [
-    20200329,
-    209
+    20200413,
+    2144
    ],
-   "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15",
-   "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4"
+   "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7",
+   "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k"
   },
   "stable": {
    "version": [
     2,
     16,
-    0
+    2
    ],
-   "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15",
-   "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4"
+   "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7",
+   "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k"
   }
  },
  {
@@ -39939,11 +40132,11 @@
   "repo": "jixiuf/golden-ratio-scroll-screen",
   "unstable": {
    "version": [
-    20170224,
-    229
+    20200419,
+    451
    ],
-   "commit": "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791",
-   "sha256": "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv"
+   "commit": "1b6ff0e3e8822423335d3f7d88c1fcb4cf43ce42",
+   "sha256": "0kniznqdbaim9llf76zi0cbwpa21xcf07w970hrspffjpzkcadnv"
   }
  },
  {
@@ -40038,8 +40231,8 @@
     20180130,
     1736
    ],
-   "commit": "305ac8725a166ed42e3f5dd3f80d6de2cf840ef1",
-   "sha256": "05znbhy98pyc6r7dii8drw4p8vy6f5b3zk0hmlw8w73vcwia59ay"
+   "commit": "43f20c361143beba2e0f3f737597f2f1f8725160",
+   "sha256": "0md3y2vr113sdgyf5q692fzif10bl0is96ly2hfgh6z27awb76l6"
   }
  },
  {
@@ -40401,8 +40594,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "a01612b9850519603bfef116bd7bddd9c8e3b975",
-   "sha256": "0kbnhm6m7sf1j63yykrn4p7ykkjvvair3x95wi4b59icc6ydvwv7"
+   "commit": "3decde69e9aa0bcc8a831e3f87acae26c2151c4a",
+   "sha256": "1zvnhcbqqiv8671x3zizrpm789ci8z74xb6qr2ik6h4z79agmri8"
   },
   "stable": {
    "version": [
@@ -41325,6 +41518,30 @@
    "sha256": "1nl2ji5wvmfzchxpnmsgxn4v2lybyymyyh99lw3riqg6gb0phl9l"
   }
  },
+ {
+  "ename": "gtk-variant",
+  "commit": "12bcbebf4b604e29cee443825c56336f5249e088",
+  "sha256": "1dcj0k2j89yx7k0cqqinb4xnhl0i2yivlvrb87xbj89zbijss967",
+  "fetcher": "github",
+  "repo": "bepvte/gtk-variant.el",
+  "unstable": {
+   "version": [
+    20200416,
+    2136
+   ],
+   "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd",
+   "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    4
+   ],
+   "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd",
+   "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70"
+  }
+ },
  {
   "ename": "guess-language",
   "commit": "6e78cb707943fcaaba0414d7af2af717efce84d0",
@@ -41592,14 +41809,14 @@
   "repo": "hhvm/hack-mode",
   "unstable": {
    "version": [
-    20191218,
-    1628
+    20200421,
+    157
    ],
    "deps": [
     "s"
    ],
-   "commit": "fd6a661b091490920804d043303596f9e60a5dd7",
-   "sha256": "1x4nymp53rdm1d0jjkz0mha4d8y8wzmakf65d56fn5mnziqh2l5d"
+   "commit": "330df61f7297344cff9cf9e2d802a4d041279de3",
+   "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1"
   },
   "stable": {
    "version": [
@@ -42043,11 +42260,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20200315,
-    140
+    20200408,
+    247
    ],
-   "commit": "7032966ee76b23520001af916d9184b4a2d7a689",
-   "sha256": "0mk2fw33j1k8m6w0b6p15n7zl52kbwjda0p2zzvxbhlk3cvqmgd0"
+   "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61",
+   "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww"
   },
   "stable": {
    "version": [
@@ -42377,30 +42594,30 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200325,
-    757
+    20200426,
+    534
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "0181b7ef468def6ef5547c7241b5c4c854816166",
-   "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq"
+   "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd",
+   "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f"
   },
   "stable": {
    "version": [
     3,
     6,
-    0
+    1
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8",
-   "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7"
+   "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd",
+   "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf"
   }
  },
  {
@@ -42500,14 +42717,14 @@
   "repo": "emacsorphanage/helm-ag",
   "unstable": {
    "version": [
-    20200328,
-    533
+    20200426,
+    1427
    ],
    "deps": [
     "helm"
    ],
-   "commit": "ad3ef038584007fbf1b7d6e727be1f18e39a8730",
-   "sha256": "06gjbc1rkxg13nb2hr3gm65zyzpxv77pvsz7b7c9i3qfw782zsax"
+   "commit": "6387437acf687a64af66138649f8604d65eb6789",
+   "sha256": "177grx9flqg6d9vcl2ln7gflvh3r2in8va39sgd7a4vl6qn2w1lh"
   },
   "stable": {
    "version": [
@@ -42638,26 +42855,22 @@
  },
  {
   "ename": "helm-bibtex",
-  "commit": "f4118a7721435240cf8489daa4dd39369208855b",
-  "sha256": "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z",
+  "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3",
+  "sha256": "0ciz4lczfv9b4n12jd9r5w81yj884pmi53xmm9cqzvrv3hh9n8hs",
   "fetcher": "github",
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20191028,
-    1313
+    20200415,
+    1311
    ],
    "deps": [
-    "biblio",
+    "bibtex-completion",
     "cl-lib",
-    "dash",
-    "f",
-    "helm",
-    "parsebib",
-    "s"
+    "helm"
    ],
-   "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9",
-   "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j"
+   "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5",
+   "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7"
   },
   "stable": {
    "version": [
@@ -42810,6 +43023,37 @@
    "sha256": "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh"
   }
  },
+ {
+  "ename": "helm-bufler",
+  "commit": "4ba5657f237eea9073a46a4127be5795be07c687",
+  "sha256": "0wb1ds3acc36hl7798phbvhygfljjc6br11lf4y3043q8v0lz6gi",
+  "fetcher": "github",
+  "repo": "alphapapa/bufler.el",
+  "unstable": {
+   "version": [
+    20200409,
+    1253
+   ],
+   "deps": [
+    "bufler",
+    "helm"
+   ],
+   "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f",
+   "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "bufler",
+    "helm"
+   ],
+   "commit": "d6c79f04b7d288174d8294fb30488b567586364d",
+   "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3"
+  }
+ },
  {
   "ename": "helm-bundle-show",
   "commit": "2f10f7387cca102696c38af1d8dc0fe5da5e366f",
@@ -43232,26 +43476,26 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200306,
-    1417
+    20200424,
+    607
    ],
    "deps": [
     "async"
    ],
-   "commit": "0181b7ef468def6ef5547c7241b5c4c854816166",
-   "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq"
+   "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd",
+   "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f"
   },
   "stable": {
    "version": [
     3,
     6,
-    0
+    1
    ],
    "deps": [
     "async"
    ],
-   "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8",
-   "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7"
+   "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd",
+   "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf"
   }
  },
  {
@@ -43415,14 +43659,14 @@
   "repo": "emacs-helm/helm-dictionary",
   "unstable": {
    "version": [
-    20191110,
-    2202
+    20200406,
+    1632
    ],
    "deps": [
     "helm"
    ],
-   "commit": "6a21ac1ba424ffa87b3b3e1b53d0fdd529844a28",
-   "sha256": "1qpcly4v7yf6ncp951gl1c18riln86xgyasf66n56qj26mfq8bhq"
+   "commit": "1dfec049c7851754a5967329a60e9e9a9f805423",
+   "sha256": "042rn38myq8b2024mdpisakmqysp34mmhvbdnw433vl9qxw6pikd"
   }
  },
  {
@@ -44430,14 +44674,14 @@
   "repo": "emacsorphanage/helm-gtags",
   "unstable": {
    "version": [
-    20200321,
-    1456
+    20200409,
+    1559
    ],
    "deps": [
     "helm"
    ],
-   "commit": "ff4329fec2cc1f53b404054ddab4cd16faef7241",
-   "sha256": "14jjjk258hg2d47d8fgg6qb410ij16400anx5kcghi2680a92f2w"
+   "commit": "25b81d7774622911c1e95d9020209ae4ace1542b",
+   "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk"
   },
   "stable": {
    "version": [
@@ -44949,16 +45193,16 @@
   "repo": "emacs-lsp/helm-lsp",
   "unstable": {
    "version": [
-    20200103,
-    1659
+    20200420,
+    1546
    ],
    "deps": [
     "dash",
     "helm",
     "lsp-mode"
    ],
-   "commit": "6f62659cc528b7e37ffcc8fb356633acd7031be8",
-   "sha256": "1gf3pzrcxrymlj677mghxf4yrqiqa90y3ip1g1f1h186wnwa2vcg"
+   "commit": "db243993ea70be6343949759b4f2c556d9130751",
+   "sha256": "0yaik74g61iyrg9inarl7s9r6vnj75q5vxzxc5bkl224w49hf5bh"
   }
  },
  {
@@ -45145,16 +45389,17 @@
   "repo": "emacs-helm/helm-navi",
   "unstable": {
    "version": [
-    20181226,
-    29
+    20200401,
+    904
    ],
    "deps": [
     "helm",
+    "helm-org",
     "navi-mode",
     "s"
    ],
-   "commit": "3b9abcc39ce7c657bc2dcc054b850dc2a7cf0448",
-   "sha256": "1kxv8qx7s51fnzrslwqrgayqvyq30ycnb84p5qy7jf0rf69hxxjh"
+   "commit": "9bba79119edd8959d26484326c2f6868b7d942c0",
+   "sha256": "136shiqwr7k95gqywrlqqykx1pgpvyjbfzggwj7q1akqjslxfffn"
   }
  },
  {
@@ -45280,6 +45525,42 @@
    "sha256": "0j3xz59hl84asv332fk94j5c06w3ix6b14zrkhxr8vb5ci1b2b1k"
   }
  },
+ {
+  "ename": "helm-org-multi-wiki",
+  "commit": "536cf8f9a0b16e6e9bda30de67d0da44bb1b5877",
+  "sha256": "0wk08m6y2rvjbj28h3hqf9w3cgx0ykiv8z6f6kqjfpik8fl2bzbj",
+  "fetcher": "github",
+  "repo": "akirak/org-multi-wiki",
+  "unstable": {
+   "version": [
+    20200419,
+    1833
+   ],
+   "deps": [
+    "dash",
+    "helm",
+    "helm-org",
+    "org-multi-wiki",
+    "org-ql"
+   ],
+   "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0",
+   "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    0
+   ],
+   "deps": [
+    "dash",
+    "org-multi-wiki",
+    "org-ql"
+   ],
+   "commit": "80791ea872939df0578dc3a2992a2f7fd5618971",
+   "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0"
+  }
+ },
  {
   "ename": "helm-org-rifle",
   "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615",
@@ -45999,8 +46280,8 @@
     "helm",
     "rtags"
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -46866,25 +47147,26 @@
   "repo": "jjzmajic/hercules.el",
   "unstable": {
    "version": [
-    20190929,
-    637
+    20200420,
+    747
    ],
    "deps": [
     "which-key"
    ],
-   "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e",
-   "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb"
+   "commit": "557da39878d0637395fdded91243b340c37eff7b",
+   "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc"
   },
   "stable": {
    "version": [
     0,
-    3
+    3,
+    1
    ],
    "deps": [
     "which-key"
    ],
-   "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e",
-   "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb"
+   "commit": "557da39878d0637395fdded91243b340c37eff7b",
+   "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc"
   }
  },
  {
@@ -46925,11 +47207,11 @@
   "repo": "kuanyui/hexo.el",
   "unstable": {
    "version": [
-    20180815,
-    219
+    20200416,
+    1410
    ],
-   "commit": "6bca18f911f6b2cd5c055ed73ddec98c385f9f86",
-   "sha256": "1zawz3nry832rhx80hyfqfs0gfw3hyrn96060zj3n75avx13rr8j"
+   "commit": "d600b6c2d51959f1331c8abf3953365544322afa",
+   "sha256": "07w6jlq3z5y019n5kplqn38gw60ffk2yx4vchp6qgif98lhcjiyr"
   }
  },
  {
@@ -47267,11 +47549,11 @@
   "repo": "DarthFennec/highlight-indent-guides",
   "unstable": {
    "version": [
-    20190108,
-    3
+    20200412,
+    2328
    ],
-   "commit": "0b10f38c54ffc099861ce8463e16a1b07ddbb203",
-   "sha256": "0fa41y9gdci60417zksj9bgjx1knwh781i3dfphkgr7qbx25iky7"
+   "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4",
+   "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs"
   }
  },
  {
@@ -47345,16 +47627,16 @@
  },
  {
   "ename": "highlight-operators",
-  "commit": "e7bd74b7a3484e437c6db4f18613744ebae030f5",
-  "sha256": "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn",
-  "fetcher": "bitbucket",
+  "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203",
+  "sha256": "1l0ci20r0qm4lc9chvvwxgyi3vg41n3ccj0csfgzilzicsvjs9ic",
+  "fetcher": "github",
   "repo": "jpkotta/highlight-operators",
   "unstable": {
    "version": [
     20170213,
     2220
    ],
-   "commit": "3938e88e78c592936fc8fc6eabbfaf7205a967c8",
+   "commit": "7696b43419505d6e3511ad2781f9f1dd3c55ef8c",
    "sha256": "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y"
   }
  },
@@ -47729,11 +48011,11 @@
   "repo": "ideasman42/emacs-hl-block-mode",
   "unstable": {
    "version": [
-    20200118,
-    310
+    20200404,
+    702
    ],
-   "commit": "6a8f871d7aa5d0d58b7c6ede281f8f8965124c9e",
-   "sha256": "1jdqz3cfncka4rdqxa4qg7f8dhkwx2h9s16gd3xqjwh8xrpf9qnd"
+   "commit": "6dc75e71b0b179d7c087cf7de51823f5810d671a",
+   "sha256": "142nrxq72dkl45lq93c076nl2ifdl6vdgiydpcs4lwg0crja8qzl"
   }
  },
  {
@@ -47744,14 +48026,14 @@
   "repo": "laishulu/hl-fill-column",
   "unstable": {
    "version": [
-    20190608,
-    203
+    20200404,
+    306
    ],
    "deps": [
     "names"
    ],
-   "commit": "612441e69772c24f9ce67ae73e47c84f29ee653d",
-   "sha256": "0b7770prp5sj4yinrdgzvblqky05vm245i40d38frcbghwqr2jl4"
+   "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22",
+   "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z"
   }
  },
  {
@@ -48142,17 +48424,17 @@
     20200321,
     1819
    ],
-   "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f",
-   "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals"
+   "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008",
+   "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    3
    ],
-   "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f",
-   "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals"
+   "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008",
+   "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s"
   }
  },
  {
@@ -48538,11 +48820,11 @@
   "repo": "humanoid-colors/emacs-humanoid-themes",
   "unstable": {
    "version": [
-    20200310,
-    940
+    20200403,
+    1939
    ],
-   "commit": "57d7db70904faeeba9ccd0151e4ebf889403a40d",
-   "sha256": "0vxfq6gycgkfypyk91mwf2jg1mkldxpkd2v39j2nmlgbbw1ldaka"
+   "commit": "22c9a0987c7d746d7eb9fe850f93f232d91cae14",
+   "sha256": "1h3v76p17mzigwr0kpjlm5fgas4vvrm59g73l1699pnq1n1i5kgx"
   }
  },
  {
@@ -48979,6 +49261,21 @@
    "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5"
   }
  },
+ {
+  "ename": "icomplete-vertical",
+  "commit": "1a952162da476b4a0f496d9dc15d2d7a8d0964f6",
+  "sha256": "10rbsxp3jp8xyzcklpcc2zs0sv4pvvkqb7i96js9cp13nc9a7rgz",
+  "fetcher": "github",
+  "repo": "oantolin/icomplete-vertical",
+  "unstable": {
+   "version": [
+    20200417,
+    1755
+   ],
+   "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef",
+   "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90"
+  }
+ },
  {
   "ename": "icsql",
   "commit": "bf2a7e6572418d2f252d63068edd82c21eab874e",
@@ -49651,11 +49948,11 @@
   "repo": "victorhge/iedit",
   "unstable": {
    "version": [
-    20190419,
-    803
+    20200412,
+    756
    ],
-   "commit": "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f",
-   "sha256": "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc"
+   "commit": "0fb3d380866664c3ab543acede606d343c257406",
+   "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0"
   },
   "stable": {
    "version": [
@@ -50030,16 +50327,16 @@
  },
  {
   "ename": "immortal-scratch",
-  "commit": "1f9f4a59d88106ddfee740653abd28e305f6dfe0",
-  "sha256": "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6",
-  "fetcher": "bitbucket",
+  "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203",
+  "sha256": "00g68abnssf9xw233zs09jyjqbm0720isamc97rfr95d7wvrb2cr",
+  "fetcher": "github",
   "repo": "jpkotta/immortal-scratch",
   "unstable": {
    "version": [
     20160517,
     2118
    ],
-   "commit": "b354aba33d91a16a1878c87a931564505f6a0ee1",
+   "commit": "faeab0ad6c33c74c0cbd1dfcebffaa0690de40c6",
    "sha256": "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b"
   }
  },
@@ -50382,26 +50679,26 @@
   "repo": "clojure-emacs/inf-clojure",
   "unstable": {
    "version": [
-    20200118,
-    1533
+    20200425,
+    1648
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "49390d9dfde1d6354629b7662edd0ee422477f4a",
-   "sha256": "1jhh4ablxmwy4diai6jhki5ifiw1d0fcza7l9gy8iqqnd1yc2m25"
+   "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6",
+   "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw"
   },
   "stable": {
    "version": [
     2,
-    1,
+    2,
     0
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "247ca70f8ba5104be292aea20fbde6adb37e359f",
-   "sha256": "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412"
+   "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1",
+   "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk"
   }
  },
  {
@@ -50527,9 +50824,9 @@
  },
  {
   "ename": "info-buffer",
-  "commit": "3c44a1d69725b687444329d8af43c9799112b407",
-  "sha256": "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4",
-  "fetcher": "github",
+  "commit": "6a7caa8c4fea7ef2211f01bc8340c660a6e6c5f3",
+  "sha256": "1si3sz34bmzcnqm4bc6nq7q2rmsyksh0610bn0r9frf12vakg28p",
+  "fetcher": "gitlab",
   "repo": "llvilanova/info-buffer",
   "unstable": {
    "version": [
@@ -50724,8 +51021,8 @@
     20191218,
     2038
    ],
-   "commit": "ed488fcbc8c015121a4b1acd8d08db229fd6735a",
-   "sha256": "14y87fvav10wjc88bbi1pwy8lxnqcdk4cahwhd9cg5bhsqwhm32m"
+   "commit": "8b648afaaab5eaddb7afcd602b8a76cbfb12412b",
+   "sha256": "0zfv4cnj11i7lagfyqmy4ch01szj450458yqffjn84hfikbf4q78"
   }
  },
  {
@@ -51578,11 +51875,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200319,
-    1247
+    20200425,
+    1938
    ],
-   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
-   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
+   "commit": "47ec37b395cc1b304bbf91e804f138634544a9df",
+   "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74"
   },
   "stable": {
    "version": [
@@ -51596,26 +51893,22 @@
  },
  {
   "ename": "ivy-bibtex",
-  "commit": "c23c09225c57a9b9abe0a0a770a9184ae2e58f7c",
-  "sha256": "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2",
+  "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3",
+  "sha256": "0ri0f8cfzyymx9jrw0bldwzx74bzdd5gc90yv16hv239g65scbvx",
   "fetcher": "github",
   "repo": "tmalsburg/helm-bibtex",
   "unstable": {
    "version": [
-    20191028,
-    1313
+    20200415,
+    1311
    ],
    "deps": [
-    "biblio",
+    "bibtex-completion",
     "cl-lib",
-    "dash",
-    "f",
-    "parsebib",
-    "s",
     "swiper"
    ],
-   "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9",
-   "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j"
+   "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5",
+   "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7"
   },
   "stable": {
    "version": [
@@ -51889,15 +52182,15 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20191018,
-    1251
+    20200421,
+    1120
    ],
    "deps": [
     "hydra",
     "ivy"
    ],
-   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
-   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
+   "commit": "47ec37b395cc1b304bbf91e804f138634544a9df",
+   "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74"
   },
   "stable": {
    "version": [
@@ -52061,15 +52354,15 @@
   "repo": "tumashu/ivy-posframe",
   "unstable": {
    "version": [
-    20191226,
-    637
+    20200331,
+    536
    ],
    "deps": [
     "ivy",
     "posframe"
    ],
-   "commit": "6d697ff00ac406b919eba8665b1bc18a2b423cda",
-   "sha256": "05zhfhml8bd1zi1msy6zjkimirwq59i9fwa0mxy9l88si3dmb2hb"
+   "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50",
+   "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1"
   }
  },
  {
@@ -52080,27 +52373,27 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20191224,
-    220
+    20200415,
+    1457
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5",
-   "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p"
+   "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63",
+   "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h"
   },
   "stable": {
    "version": [
     4,
-    0
+    1
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387",
-   "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr"
+   "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
+   "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
   }
  },
  {
@@ -52179,8 +52472,8 @@
     "ivy",
     "rtags"
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -52742,11 +53035,11 @@
   "repo": "donderom/jazz-theme",
   "unstable": {
    "version": [
-    20170411,
-    1411
+    20200417,
+    2042
    ],
-   "commit": "b1cb78a97cc4050f19d88a89e455c3e52d98240e",
-   "sha256": "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm"
+   "commit": "b6694f09e10aa7df14836aac2f6615c32aa572dd",
+   "sha256": "1mjzfr2iz72n3ds6d0sqhqd2a5kcfn8d2kji9hqmydmplg247apx"
   }
  },
  {
@@ -53127,15 +53420,15 @@
   "repo": "nyyManni/jiralib2",
   "unstable": {
    "version": [
-    20190927,
-    2010
+    20200331,
+    1940
    ],
    "deps": [
     "dash",
     "request"
    ],
-   "commit": "e913f8e4a994850d2cff18ce2b1f4177cac62c91",
-   "sha256": "022jndjwj0ml2w829id0nx43p24h6jpmilc12n9hiy4p80vjgy1y"
+   "commit": "ccf69e417911e091ec4c28d47d178ee63196c626",
+   "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc"
   }
  },
  {
@@ -53757,14 +54050,14 @@
   "repo": "skeeto/elisp-json-rpc",
   "unstable": {
    "version": [
-    20180104,
-    1528
+    20200417,
+    1629
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0992ae71964055230aa5d4d934a1b93b5dfd7eb4",
-   "sha256": "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s"
+   "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56",
+   "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm"
   }
  },
  {
@@ -53917,11 +54210,11 @@
   "repo": "JuliaEditorSupport/julia-emacs",
   "unstable": {
    "version": [
-    20200324,
-    1652
+    20200331,
+    1658
    ],
-   "commit": "1c122f1dff8dd2674245b2ce5e43b62504864bfd",
-   "sha256": "1ki42xx7vws8hb5vr1rgm2aih4qadf9qva8c4zq1hzmzq5j74jry"
+   "commit": "88d7d875ef32eb9fb76917c97150654bb91ac96a",
+   "sha256": "1zsqj31avcil6ml2clfxk7hnmg5fx014xqbbvhm17ii7ggky4qdn"
   },
   "stable": {
    "version": [
@@ -53985,8 +54278,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20200327,
-    602
+    20200423,
+    2236
    ],
    "deps": [
     "cl-lib",
@@ -53997,16 +54290,16 @@
     "spinner",
     "vterm"
    ],
-   "commit": "c293f0db0203708e49139cb3b32e5826056ef972",
-   "sha256": "1fyw36c5f70j53jl03yk79pgr0x4q89mwyb77n9xcbscdhaxv3s2"
+   "commit": "e14c5590a79ee5529f574f6d4b0701d608e3e47b",
+   "sha256": "1xckmrdg41ai9qbpy9lxva4b1yq5jji9xff4fz9d4v72nqz7qn0w"
   },
   "stable": {
    "version": [
     1,
     0,
     0,
-    -2,
-    6
+    -1,
+    3
    ],
    "deps": [
     "cl-lib",
@@ -54017,8 +54310,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "596f59774edf213c4c4885992dda158de145be03",
-   "sha256": "0x8mlvq264ihhcdbkljhaij6hsvlh8s4fmrd8x970c7i3qi3hh7k"
+   "commit": "483d088853584a9f1603a062bce5705f0a7d99fe",
+   "sha256": "0k3lwq6r1y23gmlqx7a70psgzncf4k1zcykc7plzl79xas28rbrz"
   }
  },
  {
@@ -54153,8 +54446,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20200329,
-    828
+    20200417,
+    1907
    ],
    "deps": [
     "cl-lib",
@@ -54162,14 +54455,14 @@
     "websocket",
     "zmq"
    ],
-   "commit": "b691d38483b6540d42d482a32d35eb54178e5658",
-   "sha256": "1lp6xg71snlsaffl7afrgjcs99l2axc5xrbkrncc50zjhxlimxrr"
+   "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e",
+   "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47"
   },
   "stable": {
    "version": [
     0,
     8,
-    1
+    2
    ],
    "deps": [
     "cl-lib",
@@ -54177,8 +54470,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "6650dd35887e0e987385a4fb74b0a3c1661e149b",
-   "sha256": "152g22bm970px2mi3bfr6f59mvvbk2p8prv5vs5b9n0cmviqm50w"
+   "commit": "403c70c83cb3754c83da0932b0efaf5e72bdca9a",
+   "sha256": "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p"
   }
  },
  {
@@ -54766,11 +55059,11 @@
   "repo": "tarsius/keycast",
   "unstable": {
    "version": [
-    20200103,
-    1239
+    20200418,
+    2028
    ],
-   "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b",
-   "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q"
+   "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c",
+   "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b"
   },
   "stable": {
    "version": [
@@ -54863,14 +55156,14 @@
   "repo": "tarsius/keymap-utils",
   "unstable": {
    "version": [
-    20191222,
-    2258
+    20200413,
+    1858
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e",
-   "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g"
+   "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705",
+   "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n"
   },
   "stable": {
    "version": [
@@ -55186,8 +55479,8 @@
     20180702,
     2029
    ],
-   "commit": "26228b202e821824afd8b2536234b26c23ae1b9d",
-   "sha256": "1329xyhriha7037lnsg8bf4xqkc20f0h3bv7xifm2i40ib0z3wlx"
+   "commit": "108a9151eb55b00f246613c511d88b7d58334595",
+   "sha256": "16wsaz29avmv9p3lfy0wjgxfwpszq8g3v9vl05azqkvjahf0lxib"
   },
   "stable": {
    "version": [
@@ -55209,15 +55502,15 @@
   "repo": "stardiviner/kiwix.el",
   "unstable": {
    "version": [
-    20200315,
-    332
+    20200426,
+    637
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "d5e5780f3c933f873e1a19458c1ea269e9a57afe",
-   "sha256": "1p7fqw1j1kphvqb09c8s5lyqkxi7fd0gfpvyp0g0v0shdxydb9ix"
+   "commit": "6c6c44386e00d352d96064cb25b50e960cd1ba22",
+   "sha256": "16k93w5xylx3v5q1hlzmlmg1ydg88bklgi2idd3h6k3sbi4linvs"
   },
   "stable": {
    "version": [
@@ -55474,16 +55767,16 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20200316,
-    207
+    20200406,
+    2112
    ],
    "deps": [
     "dash",
     "s",
     "transient"
    ],
-   "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e",
-   "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3"
+   "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018",
+   "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01"
   },
   "stable": {
    "version": [
@@ -55509,8 +55802,8 @@
     "evil",
     "kubel"
    ],
-   "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e",
-   "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3"
+   "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018",
+   "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01"
   },
   "stable": {
    "version": [
@@ -55741,6 +56034,25 @@
    "sha256": "1r8di1cmhcx2vfk3fsydx24spib1fi4wihnxa41favnkjzklz9jv"
   }
  },
+ {
+  "ename": "lambdapi-mode",
+  "commit": "86702d5ad9279f03bdae5facb0b546e133c1fedd",
+  "sha256": "0ha9k0wc5snb5j0bpzjj91b7kd9ppsk8wbcj454wdkx87x73npdd",
+  "fetcher": "github",
+  "repo": "Deducteam/lambdapi",
+  "unstable": {
+   "version": [
+    20200423,
+    1441
+   ],
+   "deps": [
+    "eglot",
+    "math-symbol-lists"
+   ],
+   "commit": "e205bd95602e120186a1e18ca825e6bbc3b6c4d1",
+   "sha256": "12y297h0hln7smy26nixqbjzy9nk1pwc2a7sab8dlzjkyz37zbfg"
+  }
+ },
  {
   "ename": "lammps-mode",
   "commit": "8f5471a8e17977c17ad84b12a77fe80f37eda25e",
@@ -55845,26 +56157,26 @@
   "repo": "lassik/emacs-language-id",
   "unstable": {
    "version": [
-    20200321,
-    724
+    20200409,
+    607
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "756f238b4fda63f6e0980f627869eb3c03d13f66",
-   "sha256": "18i1l7vpfa0y5zpy9hbcrkp79n30n7pkf0kasq718cj8ggczj120"
+   "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97",
+   "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c"
   },
   "stable": {
    "version": [
     0,
-    4,
-    2
+    5,
+    1
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2c7b8599fc7fb56b0c820a9ae9f08053c71a8738",
-   "sha256": "10vrx3vfg8glrqngbyhwgkg5maib8ihv03psdd6qjhd0kik83498"
+   "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97",
+   "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c"
   }
  },
  {
@@ -56197,20 +56509,40 @@
   "repo": "conao3/leaf.el",
   "unstable": {
    "version": [
-    20200327,
-    1411
+    20200422,
+    644
    ],
-   "commit": "199045bfe411afc30cb7c7d18b8a6b03edebeae1",
-   "sha256": "0apaa5w2zfycigdf8d7x3h8aw8m11mz8b6l2d546dlbvxr5yra28"
+   "commit": "27f21ed46a907a911222a72a31b41e414c956cfb",
+   "sha256": "041qgyskq39f91wjwr3d4ic5f1q7rvigannyyr9q4a2nbrn2dzhy"
   },
   "stable": {
    "version": [
-    3,
-    6,
+    4,
+    1,
     0
    ],
-   "commit": "c0a0fca2f9c83909c49729af75664411b4affab8",
-   "sha256": "18vrk19273xlg2nhkf7fvvhspnsfgk4dxa42x2q5599p9z7aph00"
+   "commit": "0841ab466a1542868b5448bb375ac9f0c33e2b3f",
+   "sha256": "0lpgkd2hhv98k7bi7zdplhlv0p3gbp4aq2cb0kyiwp2yxlnmkbzv"
+  }
+ },
+ {
+  "ename": "leaf-convert",
+  "commit": "db2fa6cdfe98aea41eeafb59527050edfa9ef6e5",
+  "sha256": "1hw6imdf8f7939r077zccv0sa23xfcmwpbhjyb49g4nhzs5grpnv",
+  "fetcher": "github",
+  "repo": "conao3/leaf-convert.el",
+  "unstable": {
+   "version": [
+    20200415,
+    1725
+   ],
+   "deps": [
+    "leaf",
+    "leaf-keywords",
+    "ppp"
+   ],
+   "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe",
+   "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp"
   }
  },
  {
@@ -56221,14 +56553,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20200328,
-    845
+    20200415,
+    419
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "3164f1f4b98be9efa9e28170cc9b8d14a10b3e56",
-   "sha256": "165x864rn9ha8dd3k62xgdp97fi961x75p6a7nldl0znzan65691"
+   "commit": "8c956f9e39cb589544a90861ac05b9b2ee4d320b",
+   "sha256": "0qy1hmg7ycbx898cx5cckmk5l8bysyvvdc5y2gl3bsxjwlv1wlrg"
   },
   "stable": {
    "version": [
@@ -56240,6 +56572,56 @@
    "sha256": "146h2n71f22gsqgh221ghx56qb9cq9qac3p77gxji535l2s9hbvk"
   }
  },
+ {
+  "ename": "leaf-manager",
+  "commit": "e1d80f4662a0f77360244fc4b34f2076db4fd478",
+  "sha256": "1pr5yljhif5ffm63g6w6544cy6m15kljbdvxs87ivnisblbl4s21",
+  "fetcher": "github",
+  "repo": "conao3/leaf-manager.el",
+  "unstable": {
+   "version": [
+    20200414,
+    543
+   ],
+   "deps": [
+    "leaf",
+    "leaf-convert",
+    "ppp"
+   ],
+   "commit": "f2ae35e02ebe218daa3076a0e9d83b4feadfbb0a",
+   "sha256": "09ll1vs9y6qmcl3qxil52mjw5bf7x896wjsij4kf0y5wd2fhra61"
+  }
+ },
+ {
+  "ename": "leaf-tree",
+  "commit": "2e51160b1e5d277e66b9cff493b1f6b3c6f9ee28",
+  "sha256": "1xnqxwa978wbvx181v48zd37vckrj6p6wa7gas3fj648mwdjnii3",
+  "fetcher": "github",
+  "repo": "conao3/leaf-tree.el",
+  "unstable": {
+   "version": [
+    20200412,
+    2355
+   ],
+   "deps": [
+    "imenu-list"
+   ],
+   "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175",
+   "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "imenu-list"
+   ],
+   "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175",
+   "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7"
+  }
+ },
  {
   "ename": "lean-mode",
   "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde",
@@ -56355,11 +56737,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20200328,
-    1927
+    20200425,
+    1517
    ],
-   "commit": "bfa25a92d0cf63c5316b5aa8d50bd6809297ea9e",
-   "sha256": "1gx9brcwdmwhk0w2p93szdla5bgn25f1bsi9lna2l8ax1sn3l5kd"
+   "commit": "021eff5f88bf6392d7b3e511593e07471eb7833d",
+   "sha256": "0g4fgy39jp072b4ib0yxaxd3ndzxd1gx8inqqn9z9d7lxgc12l1g"
   },
   "stable": {
    "version": [
@@ -56593,11 +56975,11 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20200122,
-    1934
+    20200425,
+    756
    ],
-   "commit": "4bf80c2bb1e679b6e42e8d6547d6f33996830f73",
-   "sha256": "152731dwf0q1i1p5cjd3fwznl100vzsjk45ks1wxw4zv0w59q399"
+   "commit": "444d36526382466e6bcf11c58066bcef759e4c1f",
+   "sha256": "1768r5gb8cpz8a03rgswf5mny539w96hjw1rpvfqvj4zbv7bvd7n"
   }
  },
  {
@@ -56951,15 +57333,15 @@
   "repo": "noctuid/link-hint.el",
   "unstable": {
    "version": [
-    20200205,
-    2244
+    20200405,
+    1607
    ],
    "deps": [
     "avy",
     "cl-lib"
    ],
-   "commit": "0d9cabcdb783ddc834ede6dcb1bed627c3acd303",
-   "sha256": "1ybzxc421wyy34w71lgbdfx7vgy9j6va9jjv1mkxa0zxqpdar974"
+   "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a",
+   "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v"
   }
  },
  {
@@ -57092,6 +57474,35 @@
    "sha256": "152vcp3mdlv33jf5va4rinl1d0k960gnfhbrqqrafazgx9j3ya8w"
   }
  },
+ {
+  "ename": "lisp-local",
+  "commit": "2ec3f57a05e1b2e28ce33700d8ea98758b0bb69d",
+  "sha256": "1kzg2v0x0xf99mwd88bblbjfm9js4f40pibq6297xc9i5wrp3bv4",
+  "fetcher": "github",
+  "repo": "lispunion/emacs-lisp-local",
+  "unstable": {
+   "version": [
+    20200409,
+    1330
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61",
+   "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61",
+   "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg"
+  }
+ },
  {
   "ename": "lispxmp",
   "commit": "ad10a684b4b2f01bc65883374f36fef156ff55d2",
@@ -57115,8 +57526,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20200323,
-    1616
+    20200425,
+    1041
    ],
    "deps": [
     "ace-window",
@@ -57125,8 +57536,8 @@
     "iedit",
     "zoutline"
    ],
-   "commit": "b07ab5d8374c75bd1401b320fda17486325bc96d",
-   "sha256": "0gknqazf8pihn903518a5hmy5ggqmmq40rxz4kq2nfblpm6s5zkz"
+   "commit": "3c3f092824113278c57e93be1a2565f987ca0a4a",
+   "sha256": "1g0gmdq1n8l33ls4x06594hl8ayw8365ixgxp096d7qv7n5mxzn6"
   },
   "stable": {
    "version": [
@@ -57521,11 +57932,20 @@
   "repo": "lassik/emacs-live-preview",
   "unstable": {
    "version": [
-    20190415,
-    2214
+    20200419,
+    2143
    ],
-   "commit": "bc3f79b58c4e428485b2cf800278004220f7433d",
-   "sha256": "1xlaq07wsgwzh3c0x50wgpj9i13nyk5ig45w1fx4156kmc69vjk8"
+   "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477",
+   "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "commit": "448d6d2b0912a46acd7d9a9b186b53425b1a7626",
+   "sha256": "1by62z8pch148ar47453bybg7q9drja73rq3pwcn9jb0yb6gn1xl"
   }
  },
  {
@@ -57536,20 +57956,20 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20200329,
-    2216
+    20200401,
+    420
    ],
-   "commit": "18587cf78fa22d61a7365238da852be4a55c0656",
-   "sha256": "0141svf43miy1xyfc4wi3lrv0jyx97qbg9yhnxwlxz5i6gdrnyza"
+   "commit": "ab15012313217114d3f3940a6578df31ad223010",
+   "sha256": "1layngy8whcxgrpwhjdy41g194lkzq9z1wgv5rc4cg9smsbd6abi"
   },
   "stable": {
    "version": [
     4,
-    0,
-    1
+    1,
+    0
    ],
-   "commit": "0cc8f0a31ef815e26eb7da314a516e908ba25838",
-   "sha256": "13wbsapnq5p75c27smzsgmmgzjbx7x2vbj7b7707bm6cakqjwdzv"
+   "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e",
+   "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl"
   }
  },
  {
@@ -57790,20 +58210,20 @@
   "repo": "aki2o/log4e",
   "unstable": {
    "version": [
-    20170401,
-    1304
+    20200420,
+    745
    ],
-   "commit": "c69424e407be0d9d0e54b427d8b18b1ac5a607e2",
-   "sha256": "1ng2cgqb83dhxm1hvsfdgzhfl80q9qkf07cr9hp7sxldy36hvxw8"
+   "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546",
+   "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv"
   },
   "stable": {
    "version": [
     0,
     3,
-    0
+    3
    ],
-   "commit": "6592682ab7de0e3d1915aa4d3c53e083be79fbeb",
-   "sha256": "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"
+   "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546",
+   "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv"
   }
  },
  {
@@ -57932,27 +58352,28 @@
   "repo": "doublep/logview",
   "unstable": {
    "version": [
-    20200125,
-    1808
+    20200331,
+    2111
    ],
    "deps": [
     "datetime",
     "extmap"
    ],
-   "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb",
-   "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc"
+   "commit": "c67298a215136617de60c9041904ee6a455dcd4f",
+   "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5"
   },
   "stable": {
    "version": [
     0,
-    13
+    13,
+    1
    ],
    "deps": [
     "datetime",
     "extmap"
    ],
-   "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb",
-   "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc"
+   "commit": "c67298a215136617de60c9041904ee6a455dcd4f",
+   "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5"
   }
  },
  {
@@ -58100,6 +58521,50 @@
    "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"
   }
  },
+ {
+  "ename": "lsp-dart",
+  "commit": "acbba6bc6f1bb6e1153f1f75ca1dc025bb5a8993",
+  "sha256": "0q2x3i5yydnrplfgk8fcngdsxf1g1vz1jzkbwhiqf46wrv5vxwl3",
+  "fetcher": "github",
+  "repo": "emacs-lsp/lsp-dart",
+  "unstable": {
+   "version": [
+    20200423,
+    2120
+   ],
+   "deps": [
+    "dap-mode",
+    "dart-mode",
+    "dash",
+    "f",
+    "ht",
+    "lsp-mode",
+    "lsp-treemacs",
+    "pkg-info"
+   ],
+   "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f",
+   "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj"
+  },
+  "stable": {
+   "version": [
+    1,
+    6,
+    10
+   ],
+   "deps": [
+    "dap-mode",
+    "dart-mode",
+    "dash",
+    "f",
+    "ht",
+    "lsp-mode",
+    "lsp-treemacs",
+    "pkg-info"
+   ],
+   "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f",
+   "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj"
+  }
+ },
  {
   "ename": "lsp-docker",
   "commit": "f592ec9b1d6a05e1e115d4b313be108c8e47ee67",
@@ -58145,15 +58610,15 @@
   "repo": "emacs-lsp/lsp-haskell",
   "unstable": {
    "version": [
-    20200309,
-    2144
+    20200407,
+    2216
    ],
    "deps": [
     "haskell-mode",
     "lsp-mode"
    ],
-   "commit": "582fa27c8894db888c92b5e53527b8deec82ea7f",
-   "sha256": "1jrvd8gnd7hc9xksryb35a2qzwwv7q6ncpcsb2l9ryfl5xd26i0a"
+   "commit": "f7d1f190ebacc96ddbc722e76730ca2db3c4ce38",
+   "sha256": "0wadna7y1ydx7d88rj15ylvy7gy2y30pr8wds6z10ds321qihs47"
   }
  },
  {
@@ -58182,16 +58647,16 @@
   "repo": "emacs-lsp/lsp-ivy",
   "unstable": {
    "version": [
-    20200327,
-    1007
+    20200418,
+    1500
    ],
    "deps": [
     "dash",
     "ivy",
     "lsp-mode"
    ],
-   "commit": "39b90e7aef755b6e7756f2ae306d66b01cb4d18d",
-   "sha256": "1nss84rzpa1lwxx9sr28nsq1p6z82ifs7n7dh4zl6xm7rl7cr9pz"
+   "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8",
+   "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9"
   }
  },
  {
@@ -58202,8 +58667,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20200327,
-    2019
+    20200425,
+    1842
    ],
    "deps": [
     "dash",
@@ -58215,8 +58680,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "5c6953441916c1e2e76ab0c41384ea6f57a18a5e",
-   "sha256": "13070b986jg1xd8chbr6am8915zg8wjk8mn9zlmn0d9k45zw1gsv"
+   "commit": "4f66649c2f02978145bd2e51ff8e6444b8631964",
+   "sha256": "08y81krxrfy9jm0qwmrszp1cainj37339503fqcnddaxgihvgnx1"
   },
   "stable": {
    "version": [
@@ -58263,28 +58728,58 @@
   "repo": "non-Jedi/lsp-julia",
   "unstable": {
    "version": [
-    20191011,
-    1005
+    20200408,
+    1412
    ],
    "deps": [
     "julia-mode",
     "lsp-mode"
    ],
-   "commit": "da66e78eb601b1652c3a9096e0ceea6b852aa6a0",
-   "sha256": "1xn7470lm322lqkkbg95qmzaadk85z3f2f3cx34iq00cmkkppcng"
+   "commit": "9f158a290168149fd301a1c1c2016600106ad5be",
+   "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv"
   },
   "stable": {
    "version": [
     0,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "julia-mode",
     "lsp-mode"
    ],
-   "commit": "6b0d1a3f32c5e6c5b4c0993f30303569a9e9e9bd",
-   "sha256": "11jisy6161j4mpqyi06slfr3l7cmmnp7xc6701hszmvl935znn3l"
+   "commit": "9f158a290168149fd301a1c1c2016600106ad5be",
+   "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv"
+  }
+ },
+ {
+  "ename": "lsp-latex",
+  "commit": "5e3c176af536155c8110006fd4bc63eeb2b2d12c",
+  "sha256": "01kn9faak6y1zfd1143yj453hl6rp1xykrg5rp196zf6brywj5a1",
+  "fetcher": "github",
+  "repo": "ROCKTAKEY/lsp-latex",
+  "unstable": {
+   "version": [
+    20200425,
+    920
+   ],
+   "deps": [
+    "lsp-mode"
+   ],
+   "commit": "6c5b0d926857b16c7cf6eae3111709393845f523",
+   "sha256": "1qgryycjbvdk2i11qsdzrrlmhsvrpwfn3kw4g73zri4vfwz9cr44"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "lsp-mode"
+   ],
+   "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f",
+   "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks"
   }
  },
  {
@@ -58295,8 +58790,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20200329,
-    1431
+    20200426,
+    440
    ],
    "deps": [
     "dash",
@@ -58307,8 +58802,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "9835e93f5526110bdeb164e42d8da16c1e39feb7",
-   "sha256": "0vd0vdbhfv31r63cygg40bzfj2v66k3zqd66hmkfzghhjl9d4q9f"
+   "commit": "9c1ab8adf1a7674e15b643a4dd3781c4bed6537f",
+   "sha256": "127b2j0gfrkzb4g5p7hfv505afllhspni4w91kwgccf4b1a9di99"
   },
   "stable": {
    "version": [
@@ -58399,6 +58894,24 @@
    "sha256": "0dd4n0c1rbqcy7hl6gb9nqjj7hfv4566d6ipdlnxjma0zjs84sjf"
   }
  },
+ {
+  "ename": "lsp-pascal",
+  "commit": "41e4088e4b0cd99aafac40c83188112a680a65f7",
+  "sha256": "08zvh9r1plnirdp8qb0p8xfq0y7qx7awq98gn8340f5zbwh9006q",
+  "fetcher": "github",
+  "repo": "arjanadriaanse/lsp-pascal",
+  "unstable": {
+   "version": [
+    20200422,
+    1610
+   ],
+   "deps": [
+    "lsp-mode"
+   ],
+   "commit": "b132bdf66748e4abe0d4140f6d061b1ccd56082a",
+   "sha256": "09v79p6wsp775ky1wy5fr0hwh5j33jvdvcarjs20zbdwnrs53am8"
+  }
+ },
  {
   "ename": "lsp-pyre",
   "commit": "5b243c6ab0a441531e02dc8fdd88c023ba505d25",
@@ -58425,15 +58938,15 @@
   "repo": "emacs-lsp/lsp-python-ms",
   "unstable": {
    "version": [
-    20200223,
-    2136
+    20200425,
+    555
    ],
    "deps": [
     "cl-lib",
     "lsp-mode"
    ],
-   "commit": "5d0c799099aa5810858174f390e28fff3894bc06",
-   "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp"
+   "commit": "19feb4aaaa03382e5d9841f237dd1685d8fe2994",
+   "sha256": "040qahn9h30n44ik0yrcdysx9lhvdnjxh1wj5nzylmzblxz9s2ga"
   },
   "stable": {
    "version": [
@@ -58494,8 +59007,8 @@
   "repo": "emacs-lsp/lsp-treemacs",
   "unstable": {
    "version": [
-    20200220,
-    534
+    20200414,
+    407
    ],
    "deps": [
     "dash",
@@ -58505,8 +59018,8 @@
     "lsp-mode",
     "treemacs"
    ],
-   "commit": "2e3606eebfa8bd909b45b88e59d8eecc6afea4a2",
-   "sha256": "08xpf677jj1cnfkbpb148h3wld8lvlarp2yq89539nfcmajx53ch"
+   "commit": "9d1a42b7d7abb112035f05f50ffde9834da034ae",
+   "sha256": "1kbr2ndbg0lqjcnsyvmpv513kzj3gy0kd0wa18ixh96i92a2znar"
   }
  },
  {
@@ -58517,8 +59030,8 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20200311,
-    1837
+    20200402,
+    839
    ],
    "deps": [
     "dash",
@@ -58526,8 +59039,8 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "134d9b725d21f8889f3dc72dddc418c6c6561f0e",
-   "sha256": "1ajza32nj4l5m0x9kghlwc2plavd507wajna6cdk5z276lyrn38a"
+   "commit": "242dfe859c3497c456eaacfd84942e12419529fe",
+   "sha256": "1sx4nn6mkqhxp67jvh8pp0i4g26rzyvlq2b59r7ipmxh91c2a4fh"
   },
   "stable": {
    "version": [
@@ -58552,11 +59065,11 @@
   "repo": "immerrr/lua-mode",
   "unstable": {
    "version": [
-    20191204,
-    1434
+    20200405,
+    1305
    ],
-   "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b",
-   "sha256": "0swnan2v2lc7s1jsnmkyzv7gajx08akgm6dvbsgm5hzp0mjbbpy4"
+   "commit": "658bf8f6c2bdcfe41cd14f5fb651563b41d0fbaa",
+   "sha256": "1qaqp2s5fnb2zz3bzc1yx79ilqxrf04lmd5gkk56nka4flyslp80"
   },
   "stable": {
    "version": [
@@ -58607,14 +59120,14 @@
   "repo": "sjbach/lusty-emacs",
   "unstable": {
    "version": [
-    20200115,
-    1413
+    20200415,
+    1456
    ],
    "deps": [
     "s"
    ],
-   "commit": "3f4be19e0c466399c680a355c402b09792123e4d",
-   "sha256": "1915w43dwvqkklxdh1scy4yxzmalyyrx76iy9wl024svwjq3i0np"
+   "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb",
+   "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510"
   },
   "stable": {
    "version": [
@@ -58673,26 +59186,26 @@
   "repo": "montag451/lxc-tramp",
   "unstable": {
    "version": [
-    20200321,
-    1815
+    20200414,
+    1445
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6",
-   "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y"
+   "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb",
+   "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg"
   },
   "stable": {
    "version": [
+    1,
     0,
-    2,
     0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6",
-   "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y"
+   "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb",
+   "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg"
   }
  },
  {
@@ -58973,8 +59486,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200318,
-    1224
+    20200425,
+    2117
    ],
    "deps": [
     "async",
@@ -58983,8 +59496,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
-   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
+   "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10",
+   "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw"
   },
   "stable": {
    "version": [
@@ -59019,8 +59532,8 @@
     "cl-lib",
     "magit"
    ],
-   "commit": "9ffebd50a18adba70a9cfc2710012dfd650c5376",
-   "sha256": "0sihrmk9snazdj1dana7q89a5qd7xjclhmfqh15gvxchs4a8jwqg"
+   "commit": "0bc96737634e78ac7c7f8a3f73190531c0890914",
+   "sha256": "1lm8412n2046fz8n7rfbadyww2074lsxq0w4gm1x1alraz5im5h4"
   },
   "stable": {
    "version": [
@@ -59311,8 +59824,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
-   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
+   "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10",
+   "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw"
   }
  },
  {
@@ -59460,14 +59973,14 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200318,
-    1224
+    20200425,
+    2044
    ],
    "deps": [
     "dash"
    ],
-   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
-   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
+   "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10",
+   "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw"
   },
   "stable": {
    "version": [
@@ -60322,14 +60835,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20191230,
-    1055
+    20200421,
+    2222
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e9dff50d572caa96b68a7466c18c97a8d6ed651c",
-   "sha256": "0v7a56fqwaqzqkpip7lpbsf9jnnwfjwd3jf61xnziv6j9sa46p1d"
+   "commit": "365697302345f8b9dc10bc975477452a282f7ae0",
+   "sha256": "1afjp0j5498zzbl8ycrz37cqdssfjlxcx5g4addzv0xaicfghgk6"
   },
   "stable": {
    "version": [
@@ -60909,6 +61419,24 @@
    "sha256": "10xxgvzjb7bl3lzgjkdsnnkd9wphkc2pm621agyjlayzcjnldz5p"
   }
  },
+ {
+  "ename": "mc-calc",
+  "commit": "a8cded39a6c14d34f618aba136d48e162a70c433",
+  "sha256": "1lphlavndz0m3pw2kcrbqkavvcgmzn2p3av0h60ghndz00psqbys",
+  "fetcher": "github",
+  "repo": "hatheroldev/mc-calc",
+  "unstable": {
+   "version": [
+    20200420,
+    1836
+   ],
+   "deps": [
+    "multiple-cursors"
+   ],
+   "commit": "74a046a5728919a4d1135ca62738326b0dde278c",
+   "sha256": "0498088pgbpywqdla8mzhpq4izzbdbqwq9cjzg0050y598pinpqq"
+  }
+ },
  {
   "ename": "mc-extras",
   "commit": "12747bb8603ebc09ce0873f3317a99e34d818313",
@@ -61208,6 +61736,25 @@
    "sha256": "05gfprcrh9p06arsni58nf60inlf1zbd18i678r9xd4q0v35k491"
   }
  },
+ {
+  "ename": "meow",
+  "commit": "b5515ad6f1b8e8296fba5bd91d7adf5e1fc229b4",
+  "sha256": "1s9wqmxg1g8crhsvwn4fh3hkn7pyfj5x71fal9yl0fk6gx59n1p0",
+  "fetcher": "github",
+  "repo": "DogLooksGood/meow",
+  "unstable": {
+   "version": [
+    20200425,
+    1327
+   ],
+   "deps": [
+    "cl-lib",
+    "dash"
+   ],
+   "commit": "f9e4296ed96ca31c8197ba8a5576fc94ee433755",
+   "sha256": "0dgdf6xlylnnsm7954xa8vf50x4mfcr8gvajrcii2shbcb23b8c8"
+  }
+ },
  {
   "ename": "merlin",
   "commit": "9338298a79b7f2d654df90b0f553aeed1428de13",
@@ -61219,17 +61766,17 @@
     20191025,
     851
    ],
-   "commit": "37e38e44f57fa2caac5ed8a1268e747a42174c85",
-   "sha256": "1r73dy1wyrdclcnp9dpk7r463fwkh2ybi31q1mmxym1xwvkg5ahl"
+   "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e",
+   "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va"
   },
   "stable": {
    "version": [
     3,
     3,
-    3
+    4
    ],
-   "commit": "73e9771bcc1c8f8575b505a62c58ad40004cf5f7",
-   "sha256": "12mh5p87rjwvkf6dqmxka4jbvhcd729972b726im6v0a27ncqh77"
+   "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e",
+   "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va"
   }
  },
  {
@@ -61269,14 +61816,14 @@
   "repo": "abrochard/mermaid-mode",
   "unstable": {
    "version": [
-    20200320,
-    1357
+    20200420,
+    2258
    ],
    "deps": [
     "f"
    ],
-   "commit": "a5b16bc4308e2a520711c2ef8a964e269115cbf7",
-   "sha256": "150a69rn0wkfb0bmyx21vywh7vcd5a3yfi7i9jgp8zf8hfclsymg"
+   "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9",
+   "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l"
   }
  },
  {
@@ -61397,8 +61944,8 @@
     20191018,
     242
    ],
-   "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f",
-   "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi"
+   "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b",
+   "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz"
   },
   "stable": {
    "version": [
@@ -61418,14 +61965,14 @@
   "repo": "ianxm/emacs-tracker",
   "unstable": {
    "version": [
-    20200126,
-    1851
+    20200419,
+    1758
    ],
    "deps": [
     "seq"
    ],
-   "commit": "4da64b60091c3d7b23c7c5fd3dba981122b0e1f7",
-   "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y"
+   "commit": "287ced1bd51080897b2d6084f72f4a697e9b7e94",
+   "sha256": "190jpvd1li2185d1m9k2md5x0fz156a7lwwl57n4ir54j4h0s8ri"
   }
  },
  {
@@ -61522,8 +62069,8 @@
     20200104,
     108
    ],
-   "commit": "3bce96bbd509ad5ffb35ead52128dec5c1a67abf",
-   "sha256": "01wx7cvk3bvdvkpldhbj7wvqyrra7ajqjkgnj4knjg8m2wrhilhj"
+   "commit": "e9af8a2595e336542c9dfc656fe808ddc6937a59",
+   "sha256": "1s72qvg1jwqk27axiqb2wn7y1q3x0rf2mb20yc9kqva553fk5vzd"
   },
   "stable": {
    "version": [
@@ -61549,8 +62096,8 @@
    "deps": [
     "calfw"
    ],
-   "commit": "86d3682ff9491893da671237be3cde0b0010ca85",
-   "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4"
+   "commit": "f9f048de9fe85a90d376d828ce3dad2a96c62c40",
+   "sha256": "1m6w12y9dcz85xm7lc7dhc7vjhw0bhdm0b4rcp1fr2sn9wv7c4wz"
   },
   "stable": {
    "version": [
@@ -61672,17 +62219,17 @@
  },
  {
   "ename": "minesweeper",
-  "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
-  "sha256": "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag",
-  "fetcher": "bitbucket",
-  "repo": "zck/minesweeper.el",
+  "commit": "d3828ad7599d13728b5571b882344c3ada434b85",
+  "sha256": "061l7xh7vjg5krz5lskj2jvrnsv2qq4bwg0qkkysmy4zp9f3m5iq",
+  "fetcher": "hg",
+  "url": "https://hg.sr.ht/~zck/minesweeper",
   "unstable": {
    "version": [
-    20150414,
-    522
+    20200416,
+    2342
    ],
-   "commit": "d29af12fc6115399c11bdf7461a74cb810c97336",
-   "sha256": "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av"
+   "commit": "d4248e3c9b3e9e7277cb9e6d081330611898f334",
+   "sha256": "0b648nsnwn461r2alg9v220v0c4djyvwn7xgwh8c8sb9pjwbmw90"
   }
  },
  {
@@ -61711,11 +62258,11 @@
   "repo": "muffinmad/emacs-mini-frame",
   "unstable": {
    "version": [
-    20200327,
-    2218
+    20200424,
+    852
    ],
-   "commit": "30000e659b0ad2501591343b4818e5877783483b",
-   "sha256": "07b4903i3h91rjdixqsyhfclwg936n538bpiglay9r2klaa6kjp1"
+   "commit": "3aa8de59d170d7bdc16e5f829d952d82abd7739c",
+   "sha256": "02j2w4c4wvqr1csmr94rzhbrwhqfb5wmjngxa9wl58z1plwy4d8m"
   }
  },
  {
@@ -61741,25 +62288,25 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20200319,
-    526
+    20200424,
+    647
    ],
    "deps": [
     "dash"
    ],
-   "commit": "efe3f9743004d7989ea3b82d2bc71960e990bdc0",
-   "sha256": "0wy52ixj16029xk5grh1531afdcmpfi25iacl9bhplsrivzjl7hf"
+   "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46",
+   "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0"
   },
   "stable": {
    "version": [
-    20200309,
-    413
+    20200408,
+    729
    ],
    "deps": [
     "dash"
    ],
-   "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382",
-   "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi"
+   "commit": "b761e41479a2564e801ac6c427956203de3d62ca",
+   "sha256": "1ngggz4n35bklgya6ymc98w7y2annxcpdkikd5afd5jn8w7x2vxg"
   }
  },
  {
@@ -62031,6 +62578,21 @@
    "sha256": "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf"
   }
  },
+ {
+  "ename": "mix",
+  "commit": "aaa1958ac6a0e59613e1b71e0eddbe4989d93e67",
+  "sha256": "1wflzfr7jgvd01il9zz96wasdyjxxi5nrzva9hlrkgqhp0h877sk",
+  "fetcher": "github",
+  "repo": "ayrat555/mix.el",
+  "unstable": {
+   "version": [
+    20200419,
+    820
+   ],
+   "commit": "37916fa5f7dfe448585fb83ea6253eb0f84df15f",
+   "sha256": "09pk4bakqz01ci06c79ywwb8ijdfgw3rxrz0wlaz4zmlbirkzma6"
+  }
+ },
  {
   "ename": "mixed-pitch",
   "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db",
@@ -62228,8 +62790,8 @@
     "f",
     "js2-mode"
    ],
-   "commit": "33e1b521a8a8d0225df353b51f1e8a4588ee32d0",
-   "sha256": "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q"
+   "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c",
+   "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4"
   },
   "stable": {
    "version": [
@@ -62476,11 +63038,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200330,
-    706
+    20200425,
+    1503
    ],
-   "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed",
-   "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"
+   "commit": "0344a1b534468bdf072040d467ac853215d4fa63",
+   "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7"
   },
   "stable": {
    "version": [
@@ -62500,11 +63062,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200330,
-    706
+    20200425,
+    1503
    ],
-   "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed",
-   "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"
+   "commit": "0344a1b534468bdf072040d467ac853215d4fa63",
+   "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7"
   },
   "stable": {
    "version": [
@@ -62691,11 +63253,11 @@
   "repo": "oneKelvinSmith/monokai-emacs",
   "unstable": {
    "version": [
-    20200329,
-    49
+    20200416,
+    2001
    ],
-   "commit": "1b937eab15326b3b2e4183229a01376c30e6781c",
-   "sha256": "0c2sfzxag01w2n61xy02aw2hwv7k1nm64iwbjyf0rsqcq0m64pz8"
+   "commit": "4281fc13dadef98942c8d43024de024f2392fec5",
+   "sha256": "0049ny3m1mgn0b97m0clcmmh2xzn66flbsd8k45dn0qxm5wlaj3n"
   },
   "stable": {
    "version": [
@@ -63566,14 +64128,14 @@
   "repo": "agpchil/mu4e-maildirs-extension",
   "unstable": {
    "version": [
-    20200302,
-    1228
+    20200410,
+    820
    ],
    "deps": [
     "dash"
    ],
-   "commit": "bd81c3e1c1f690b124937960acd2a819e9a2483e",
-   "sha256": "0v6aih6gqzg631kpqrqgkj8nw6d7i5ih2qnmraf3i29m5y6gqync"
+   "commit": "36b1f3a561af173eccc7bebf10ee060af44ed6e7",
+   "sha256": "1k8xar4yal5nc4ixx78gvs4fvlxpa2c4fzkq3xzh6jwfbrc7g013"
   },
   "stable": {
    "version": [
@@ -63782,6 +64344,25 @@
    "sha256": "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi"
   }
  },
+ {
+  "ename": "multi-vterm",
+  "commit": "c87a280364597340baee7711aa33302c0a349fa7",
+  "sha256": "1dn1m30qmhv4sl84gki8l46rrkabn3ka7nb075q25h1b8lhhijci",
+  "fetcher": "github",
+  "repo": "suonlight/multi-vterm",
+  "unstable": {
+   "version": [
+    20200329,
+    940
+   ],
+   "deps": [
+    "projectile",
+    "vterm"
+   ],
+   "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f",
+   "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj"
+  }
+ },
  {
   "ename": "multi-web-mode",
   "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -64580,11 +65161,11 @@
   "repo": "CeleritasCelery/emacs-native-shell-complete",
   "unstable": {
    "version": [
-    20200321,
-    2300
+    20200424,
+    1635
    ],
-   "commit": "11803df3706fb23d58e418a14ce981204a64e847",
-   "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1"
+   "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d",
+   "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic"
   }
  },
  {
@@ -64740,11 +65321,11 @@
   "repo": "nickav/naysayer-theme.el",
   "unstable": {
    "version": [
-    20200326,
-    1937
+    20200405,
+    123
    ],
-   "commit": "e4d80cb70324a45102075ea923af454a563e9133",
-   "sha256": "0kxlbvpszb0lrj5dzfmzc1iaxgvhcjwq4hwykif22mkgdigxppx3"
+   "commit": "9d0bef898f31368cd30e063d53d443dee29683b0",
+   "sha256": "1jbp8p58bjc0wxs548niv02q9889blnwwfs64h5sm96nzhyzrkn0"
   }
  },
  {
@@ -64969,6 +65550,26 @@
    "sha256": "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj"
   }
  },
+ {
+  "ename": "neuron-mode",
+  "commit": "6e4b79bc01b9ff2b00a4d0c80614f738a9e76dd6",
+  "sha256": "15ddpc64432013vn43amx0shnhr32cx1vkvn95chmddlkhx7ln16",
+  "fetcher": "github",
+  "repo": "felko/neuron-mode",
+  "unstable": {
+   "version": [
+    20200426,
+    1310
+   ],
+   "deps": [
+    "counsel",
+    "f",
+    "markdown-mode"
+   ],
+   "commit": "aa97a6fbb5c3b33ad73a1ba31c7e50c8842091a1",
+   "sha256": "18nr1ayw9j3zfwj79qsqvf5nw36fqpyr2bq3cl93kck1adv949d8"
+  }
+ },
  {
   "ename": "never-comment",
   "commit": "ef3f8e712c10d63fea009951d7916fe376267cbe",
@@ -65215,8 +65816,8 @@
     20181024,
     1439
    ],
-   "commit": "8900fa55b56ba1e2f83b3f3ba2a1b336c97e5dc3",
-   "sha256": "0x6l5r5i1q7pbvziynbvb395q8rihkr1zyhp4xzw35xn55qyskiy"
+   "commit": "112217185e0351f9ad7fa17542862ac3c0922653",
+   "sha256": "0shby25dqy9hkb3chgshr2c3hqq6k35261sv3lw7zj5lxv9jrrkp"
   },
   "stable": {
    "version": [
@@ -65498,8 +66099,8 @@
   "repo": "dickmao/nndiscourse",
   "unstable": {
    "version": [
-    20200315,
-    2046
+    20200418,
+    2355
    ],
    "deps": [
     "anaphora",
@@ -65508,8 +66109,8 @@
     "json-rpc",
     "rbenv"
    ],
-   "commit": "280ac4943af307e6fe8d43a350c663c18c9c7ea8",
-   "sha256": "11ncy09y4lbivsp72l1lbg45ahqhgdzn56p9j4dxkczv5pnsg6p1"
+   "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a",
+   "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5"
   }
  },
  {
@@ -65520,8 +66121,8 @@
   "repo": "dickmao/nnhackernews",
   "unstable": {
    "version": [
-    20200323,
-    1803
+    20200407,
+    1525
    ],
    "deps": [
     "anaphora",
@@ -65529,8 +66130,8 @@
     "dash-functional",
     "request"
    ],
-   "commit": "ab0db2b7e76efa8efc72c0f587a33da1f0dc9905",
-   "sha256": "10scn7y0v0hirwlckwxb8cr98qmdl0r6c605qdh8jigmcp4c782j"
+   "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95",
+   "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz"
   }
  },
  {
@@ -65556,8 +66157,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20200327,
-    413
+    20200417,
+    1757
    ],
    "deps": [
     "anaphora",
@@ -65566,8 +66167,8 @@
     "request",
     "virtualenvwrapper"
    ],
-   "commit": "ccba00ddd62f06e9f085f7f58532b961369d1677",
-   "sha256": "0fkcp3masas1sdrhp27c017b4r2gw2gp65lcjkvcfck2k9hnypip"
+   "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0",
+   "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s"
   }
  },
  {
@@ -65593,14 +66194,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20200328,
-    1359
+    20200413,
+    2118
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "92661bc9b33af1e9d405d23f226c1fc80c0c9c01",
-   "sha256": "1c1zrfnzr7vh4fsrzyr1ivsf07ydxyr4v1776z2xv9bynvwb6lhz"
+   "commit": "ea8d8654365eeeea366a3ee0f51689987f2803a8",
+   "sha256": "02mgcz04xz9wkid3gkykbpjw3vriai7anyq3b61iv3pk9kcdp6x3"
   },
   "stable": {
    "version": [
@@ -65646,8 +66247,8 @@
     "dash",
     "request"
    ],
-   "commit": "532eb14328027ee29e124768feec23a8ef7ee798",
-   "sha256": "1qc9im01fw7k9907a9d2a87hndyyn3sk1kw31cylsvrzsb7ss9f9"
+   "commit": "ebc6a4a1cc56c01d2bb882e4a40934a6a1f4e9ca",
+   "sha256": "04zhhz8v6bx627g1vhvd0s8bl5g3d6a1mfgf7pb13627npsvbrdx"
   }
  },
  {
@@ -65914,11 +66515,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20200323,
-    121
+    20200416,
+    1058
    ],
-   "commit": "1fcf068e331b9b79e14f79c8b126711fc3d72cbb",
-   "sha256": "1pf9xds5csw6vwkb4b15isrw29psdifx8gl8y61la7d1k7b6m517"
+   "commit": "7b756d1e3885b70e81647a85432e0f2d043167c9",
+   "sha256": "0n0f6wsm6j980vxli6j6slixws45vgdbmw2xvwrs1j1h91vd0pc6"
   },
   "stable": {
    "version": [
@@ -66068,14 +66669,14 @@
   "repo": "shaneikennedy/npm.el",
   "unstable": {
    "version": [
-    20200329,
-    1904
+    20200406,
+    1429
    ],
    "deps": [
     "transient"
    ],
-   "commit": "2201ab1d9d424146c725d5e9ad24cc8e0219ba95",
-   "sha256": "18bm31f6zaskyncn97mfwxdih6b31jpm8v858m920i5j45gh78r5"
+   "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1",
+   "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx"
   }
  },
  {
@@ -66562,8 +67163,8 @@
    "deps": [
     "axiom-environment"
    ],
-   "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f",
-   "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67"
+   "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164",
+   "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6"
   }
  },
  {
@@ -67423,14 +68024,14 @@
   "repo": "clemera/objed",
   "unstable": {
    "version": [
-    20200312,
-    1817
+    20200403,
+    1500
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9bb351313799bf4fb39f1b680cdf0a7ddccccbb4",
-   "sha256": "0lp7j4s2w3qmk288nnmh92ad58340srxq20nqiybgrijc0kxkx5a"
+   "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d",
+   "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x"
   },
   "stable": {
    "version": [
@@ -67641,20 +68242,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20200325,
-    946
+    20200413,
+    1503
    ],
-   "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a",
-   "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n"
+   "deps": [
+    "org-re-reveal"
+   ],
+   "commit": "6db38600d651f4aea77e0d411466be7fb6314f39",
+   "sha256": "11akmygscph5pq1zc889pmlp8ab91qk29lwrrp3gxmgy2s5x9mgf"
   },
   "stable": {
    "version": [
     2,
-    7,
-    2
+    9,
+    0
    ],
-   "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a",
-   "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n"
+   "deps": [
+    "org-re-reveal"
+   ],
+   "commit": "eec26a088d19cd202417f662bb487b550230d11f",
+   "sha256": "1vj99sj71qf622gc9fy6kafp4ki7arqljj1dwkl4k2fnf4hv3af7"
   }
  },
  {
@@ -67717,20 +68324,20 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20200320,
-    1154
+    20200417,
+    607
    ],
-   "commit": "5dc27716c706166e1932f4a0e9f94384b6d17cb0",
-   "sha256": "0im6ds8mvnwfrh3z0cd05g32w9rklhl56xmhzl9i2180pv6qwil8"
+   "commit": "fa9757fbaa392be622ddf66c2535dfe4b5cca898",
+   "sha256": "196g4n2cr1w77k2a6582rc3c8fnnfps83f1kh76k8k3lvkjg8pjb"
   },
   "stable": {
    "version": [
     1,
     9,
-    3
+    4
    ],
-   "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d",
-   "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3"
+   "commit": "9005661e18d9eaaf1105018d084916e4927cc66b",
+   "sha256": "0ca80z6drsw9jkwijn6f05y1n7rmcypvh0yvsb77wnqrzd7y4p68"
   }
  },
  {
@@ -68186,8 +68793,8 @@
     "request",
     "s"
    ],
-   "commit": "6819b6271960dcdc7c32981dadd48968a3640cef",
-   "sha256": "12frm9w6xh5rkfyvvvpwhdd55nlgsv8w4f52pch0sl437vidcsqg"
+   "commit": "4c15049079878fcd386cca5dba20b99296a1de84",
+   "sha256": "1avci3avwhrw040wwjgcv1hayk893y8iwln10vsjyb5rd78y9gsi"
   },
   "stable": {
    "version": [
@@ -68222,16 +68829,16 @@
  },
  {
   "ename": "openwith",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx",
-  "fetcher": "bitbucket",
+  "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203",
+  "sha256": "0swza74ndw0vkr7q513wp12c2yasla7aaqv0z98mzr0ssx12jld8",
+  "fetcher": "github",
   "repo": "jpkotta/openwith",
   "unstable": {
    "version": [
     20120531,
     2136
    ],
-   "commit": "aeb78782ec87680ea9f082a3f20a3675b3770cf9",
+   "commit": "1dc89670822966fab6e656f6519fdd7f01e8301a",
    "sha256": "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01"
   }
  },
@@ -68274,6 +68881,21 @@
    "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds"
   }
  },
+ {
+  "ename": "orderless",
+  "commit": "3f1f2c378e63c5ce8a8d37735f914ce0663a76d3",
+  "sha256": "102jfzq2zskaa8jcb4mmmndcdc8221qp0hqlgvwirnzkxms9ij4a",
+  "fetcher": "github",
+  "repo": "oantolin/orderless",
+  "unstable": {
+   "version": [
+    20200425,
+    855
+   ],
+   "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3",
+   "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm"
+  }
+ },
  {
   "ename": "ordinal",
   "commit": "ea3dd6fe4cacc229dd1371cb66dd1cfd07321bf4",
@@ -68572,14 +69194,14 @@
   "repo": "Kungsgeten/org-brain",
   "unstable": {
    "version": [
-    20200328,
-    1700
+    20200426,
+    1410
    ],
    "deps": [
     "org"
    ],
-   "commit": "ec4bd9dd290459657426bb06e78f666ac0310420",
-   "sha256": "18937fm3np1ngxc1rmjsg0mzrf7jr56gd87ygsi84y5cmw4j08zb"
+   "commit": "ae7fe0f628bd093526786ece6917f7a4310e5e4d",
+   "sha256": "0szav8idqq2gmckaxqnjgcah978as2nhv43nl9vvvfkc9dc2l5x4"
   }
  },
  {
@@ -68677,14 +69299,14 @@
   "repo": "Chobbes/org-chef",
   "unstable": {
    "version": [
-    20200220,
-    2016
+    20200408,
+    1328
    ],
    "deps": [
     "org"
    ],
-   "commit": "61686fd87892e60268fc43348282abbfd879e5c9",
-   "sha256": "0n493p9dqx9bb6jcrb34s1rk8afwpz1fdgwrm64g7a0y2mbfga74"
+   "commit": "67f50aa2a2839ffdb1c1a5e2f135e69f868e4b26",
+   "sha256": "041z6f5fyzc46grwqllz81hixkdqdic3a6zird7i0yy7cr2hqhcf"
   }
  },
  {
@@ -68760,11 +69382,11 @@
   "repo": "justintaft/org-clock-split",
   "unstable": {
    "version": [
-    20200315,
-    1716
+    20200331,
+    526
    ],
-   "commit": "322379f1bf08c74c034c5c86d8a3045675ee64ac",
-   "sha256": "0nigylzzxwm4wn8zp5vyrj4y41czcpkvglvy3p4dqn35agklz5mw"
+   "commit": "39e1d2912a7a7223e2356a5fc4dff03507ae084d",
+   "sha256": "0yvpmv0v56rsn43ffmwfhw8jjvfklw703qpmkx6d6paljjgy9k8l"
   }
  },
  {
@@ -68822,11 +69444,11 @@
   "repo": "thisirs/org-context",
   "unstable": {
    "version": [
-    20200217,
-    1006
+    20200418,
+    1540
    ],
-   "commit": "f354108ecd3d33cadee05a4aec95d2df4bc61ae9",
-   "sha256": "1zlqciqadhwkhmzlag7w0i83pn9gg0gikfcrv2qlr9nsn5rzzvj4"
+   "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0",
+   "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8"
   }
  },
  {
@@ -68852,16 +69474,16 @@
   "url": "https://git.spwhitton.name/org-d20",
   "unstable": {
    "version": [
-    20190628,
-    1356
+    20200416,
+    2010
    ],
    "deps": [
     "dash",
     "s",
     "seq"
    ],
-   "commit": "0ca1b0a8d9ab0a7d687a9f2edb6eae2e57851129",
-   "sha256": "0wg95wirq964klpihhgv2flnkyjwwpdqiafn2b2l1785906csrcg"
+   "commit": "7ede5726d640c4f81146585f6eb907f51a0f6a19",
+   "sha256": "1p4irzcsq2sxmvpyrkrqs9ylp153mzwr31hvsnfh1f2nlghpicfk"
   },
   "stable": {
    "version": [
@@ -68945,14 +69567,14 @@
   "repo": "abo-abo/org-download",
   "unstable": {
    "version": [
-    20200311,
-    1049
+    20200410,
+    1444
    ],
    "deps": [
     "async"
    ],
-   "commit": "b96fd7ba02cbdae95cc37970ebcfae8afa8b25d2",
-   "sha256": "1fx621ll5kjw10n2xhba7h39m1cqvink61kyhb228p6h8cl63kss"
+   "commit": "46417e2bd30c9bcd1e8a1f4c554ad44543e869e6",
+   "sha256": "1jzmyr6v33x7012ljbc45w2ww3lb96i4nh1ydxzdjwnbvpj2j17s"
   },
   "stable": {
    "version": [
@@ -69003,16 +69625,16 @@
   "repo": "phillord/org-drill",
   "unstable": {
    "version": [
-    20200216,
-    1336
+    20200412,
+    1812
    ],
    "deps": [
     "org",
     "persist",
     "seq"
    ],
-   "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4",
-   "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy"
+   "commit": "35c1ce349949cc213f3076799211210f49431850",
+   "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn"
   },
   "stable": {
    "version": [
@@ -69256,16 +69878,17 @@
   "repo": "kidd/org-gcal.el",
   "unstable": {
    "version": [
-    20191018,
-    921
+    20200424,
+    1929
    ],
    "deps": [
     "alert",
+    "persist",
     "request",
     "request-deferred"
    ],
-   "commit": "6821e349673e9ba8d7ae7b84789f931889273dc0",
-   "sha256": "12alwnk50gsiz5b9mw8qvn317f7phb5vh2x7yvi9m72zdrdaf8pz"
+   "commit": "1667aba7c0a33e3c23c3a47fc04e89670684eddc",
+   "sha256": "1zzibnvsdq3iv874x6g6zrjb17mb036dln68mn4a1xlcwvv1king"
   },
   "stable": {
    "version": [
@@ -69365,20 +69988,20 @@
   "repo": "marcIhm/org-index",
   "unstable": {
    "version": [
-    20200323,
-    1404
+    20200413,
+    1609
    ],
-   "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567",
-   "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524"
+   "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3",
+   "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4"
   },
   "stable": {
    "version": [
     6,
     1,
-    2
+    3
    ],
-   "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567",
-   "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524"
+   "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3",
+   "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4"
   }
  },
  {
@@ -69444,11 +70067,14 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20200311,
-    710
+    20200424,
+    1917
    ],
-   "commit": "664c08e12cde19ce7dca645ba9accecda7266c32",
-   "sha256": "02gla6cs8w08jg8czl5855vxvs1jyxq839rh9f95d40x4jgc1rwy"
+   "deps": [
+    "org"
+   ],
+   "commit": "8bf06b28d6f14f52d4968123e2b4b91930c8f947",
+   "sha256": "0k70k07c4lq20rqljmfkx1pfp8gq4qr0y46n8mh1smzxdznk9nlb"
   },
   "stable": {
    "version": [
@@ -69603,29 +70229,29 @@
   "repo": "alphapapa/org-make-toc",
   "unstable": {
    "version": [
-    20200110,
-    1804
+    20200409,
+    1436
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1",
-   "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw"
+   "commit": "26fbd6a7e1e7f8e473fe3a5f74faec715c3a05aa",
+   "sha256": "08gkzl0cbgkyg31sxafqmq6v1hjgr2q62vnvncrdnhs3ly54inf8"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1",
-   "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw"
+   "commit": "43d4a2490a048b01ca5a6f44c5b4f24a458dfc95",
+   "sha256": "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr"
   }
  },
  {
@@ -69636,26 +70262,26 @@
   "repo": "org-mime/org-mime",
   "unstable": {
    "version": [
-    20200323,
-    130
+    20200416,
+    1048
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "778f818ad3d101f27786556c2a7a9995d5da47c6",
-   "sha256": "0w3yyqn225c5y0if5pjvvszpasrvh3rh4f0bqjabrvqvrhf1q8ny"
+   "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97",
+   "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg"
   },
   "stable": {
    "version": [
     0,
     1,
-    6
+    7
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c",
-   "sha256": "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h"
+   "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97",
+   "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg"
   }
  },
  {
@@ -69727,14 +70353,50 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20200303,
-    1716
+    20200422,
+    1615
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "2f521a89b106750ebafa94503cdeb043a02c5ab5",
-   "sha256": "1wr8qdkf75swf4jfqbv0r2hw7d5bw73nyyv7xa0msbc1hyw33b6l"
+   "commit": "d41426854e6804d752b25346cf6ae79b0612784c",
+   "sha256": "0f3lvcgx60j2m97mxgzbxaw9ki37g3yxr6arv54b87572a7wdj8m"
+  }
+ },
+ {
+  "ename": "org-multi-wiki",
+  "commit": "8138002578ef14e30561cac159e9a66406a4201a",
+  "sha256": "0wbybr9vf4hcwyi9rab8sm1xwxqmy7mbjv1jmm78j51kjh0cpgkj",
+  "fetcher": "github",
+  "repo": "akirak/org-multi-wiki",
+  "unstable": {
+   "version": [
+    20200419,
+    1833
+   ],
+   "deps": [
+    "dash",
+    "org",
+    "org-ql",
+    "s"
+   ],
+   "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0",
+   "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    0
+   ],
+   "deps": [
+    "dash",
+    "org",
+    "org-ql",
+    "s"
+   ],
+   "commit": "80791ea872939df0578dc3a2992a2f7fd5618971",
+   "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0"
   }
  },
  {
@@ -69819,6 +70481,27 @@
    "sha256": "1vwfpdi7hfkxx4vi0cwg7rvqby3i0mymzdkyzrqzv30dazmcjpag"
   }
  },
+ {
+  "ename": "org-noter-pdftools",
+  "commit": "caa6bf82ea660f8e1d68e45cc99c6f6427cf1327",
+  "sha256": "0k11njy2l8pxwpmxspy6qwvp1041p99xp9ha6pjxp3m3f7rik32h",
+  "fetcher": "github",
+  "repo": "fuxialexander/org-pdftools",
+  "unstable": {
+   "version": [
+    20200418,
+    929
+   ],
+   "deps": [
+    "org",
+    "org-noter",
+    "org-pdftools",
+    "pdf-tools"
+   ],
+   "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505",
+   "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08"
+  }
+ },
  {
   "ename": "org-octopress",
   "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b",
@@ -69943,21 +70626,21 @@
  },
  {
   "ename": "org-parser",
-  "commit": "28d55005cbce276cda21021a8d9368568cb4bcc6",
-  "sha256": "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h",
-  "fetcher": "bitbucket",
-  "repo": "zck/org-parser.el",
+  "commit": "d3828ad7599d13728b5571b882344c3ada434b85",
+  "sha256": "1galc2w2n2qnwxknym4wid1ldinf8fyf8vvh4ihnckcbh081nrhb",
+  "fetcher": "hg",
+  "url": "https://hg.sr.ht/~zck/org-parser",
   "unstable": {
    "version": [
-    20190207,
-    521
+    20200417,
+    301
    ],
    "deps": [
     "dash",
     "ht"
    ],
-   "commit": "8610aef8dc878fc001975780bcbcbab30dc929b7",
-   "sha256": "0vqh37y2b0dc8p9c04ici1h9n9ghd1jizcr1c2zvp75cyqsz09wv"
+   "commit": "fd4cb7035ff649378cc968b1ec2c386b5c565706",
+   "sha256": "1hnd4zhhwrd6gr1skvc64a3z9k3nmhwgcyy1cp2jfyhk0iwsrqfm"
   }
  },
  {
@@ -70001,16 +70684,16 @@
   "repo": "fuxialexander/org-pdftools",
   "unstable": {
    "version": [
-    20200329,
-    1507
+    20200422,
+    1350
    ],
    "deps": [
     "org",
     "org-noter",
     "pdf-tools"
    ],
-   "commit": "96fe7275c75842732c3fd1527619088f66b6a80a",
-   "sha256": "1ri58hyksp4fhmm6323ndc1h3ljkxjgbzcp588h76fkpk19lzhq1"
+   "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505",
+   "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08"
   }
  },
  {
@@ -70293,8 +70976,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20200315,
-    2004
+    20200407,
+    1706
    ],
    "deps": [
     "dash",
@@ -70309,8 +70992,8 @@
     "transient",
     "ts"
    ],
-   "commit": "ab5e9aa9116010e5da1995bf19ff26f55b93c214",
-   "sha256": "0h90vagb91zskvmy06yq0b1vjbkqry0fkxiagg4d076rbx3ryc0n"
+   "commit": "f4d7399e677904cdc7e220440610704e4bd668bc",
+   "sha256": "0vfnxmk6k9f4zqbcg4gsg2ga4xr2gqx81sq2hcimx49wvyxh2bwn"
   },
   "stable": {
    "version": [
@@ -70409,15 +71092,15 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20200206,
-    712
+    20200413,
+    856
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "e4460a98b6bfa01720c287a171252f49c1949801",
-   "sha256": "0hhwc6yfy69qwiyxca8r12rdxvrj44vzdsnvdk0yc9szsfnmn4hz"
+   "commit": "61549f4c00284a30e34caa3d76001b233ea5d2ad",
+   "sha256": "00r324nnci2l0jwx4jhzcrbyai5wmj5cjrav4253c23aqdn5ny96"
   },
   "stable": {
    "version": [
@@ -70541,8 +71224,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20200309,
-    1231
+    20200421,
+    1354
    ],
    "deps": [
     "dash",
@@ -70556,8 +71239,8 @@
     "pdf-tools",
     "s"
    ],
-   "commit": "e3eb9215a540ba62a0b0253d003c704b7740deeb",
-   "sha256": "152wzlavx5b4ap9wdl3dql5idvsjl5zq6zjwcilp9pni6dn34w12"
+   "commit": "1eb4ddda003b04b49a9a00828347a46f2863ac9e",
+   "sha256": "19vvcipfhir39qd3qwirrrr6221k8kjviifva0qm6aqxv7hlfaqm"
   },
   "stable": {
    "version": [
@@ -70681,8 +71364,8 @@
   "repo": "jethrokuan/org-roam",
   "unstable": {
    "version": [
-    20200329,
-    1330
+    20200426,
+    1107
    ],
    "deps": [
     "dash",
@@ -70692,13 +71375,13 @@
     "org",
     "s"
    ],
-   "commit": "b86d2c8637f5eafd587c4cf4fe85e7d0380844f4",
-   "sha256": "04i8i3dixf50vqp8jrwcbf4c8d7m47g9lyzj76h49jd8bv2fqang"
+   "commit": "41423005010f2f78c3e9301b97f1b0db83fd29b5",
+   "sha256": "1w8xv4wiskibwla7ga5bcjqpvzgmcxm52zazqpjp210vp22v545z"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
    "deps": [
@@ -70709,8 +71392,46 @@
     "org",
     "s"
    ],
-   "commit": "1433dbc31602c412914c71ecc81aa5dcf6b03daf",
-   "sha256": "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a"
+   "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f",
+   "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv"
+  }
+ },
+ {
+  "ename": "org-roam-bibtex",
+  "commit": "cc4e4ea60d2363eb691cb87ca3105bd25fc405ed",
+  "sha256": "1q9l49q478zlmcz0wi239qsz2pvmqxyb9qac2k42p19zqnfgkmsg",
+  "fetcher": "github",
+  "repo": "zaeph/org-roam-bibtex",
+  "unstable": {
+   "version": [
+    20200425,
+    1114
+   ],
+   "deps": [
+    "bibtex-completion",
+    "f",
+    "org",
+    "org-roam",
+    "s"
+   ],
+   "commit": "6bbdebb39d7edf9b369c16311afa18cf00cecffc",
+   "sha256": "0fp9cmgn9g4hnqsj9bn5885him0wxbs3qwvnw9anrwyybg6sv2i6"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "bibtex-completion",
+    "f",
+    "org",
+    "org-roam",
+    "s"
+   ],
+   "commit": "9c224890ef9b8fb38b48d48d6f029be00f1c2166",
+   "sha256": "14f3d1yiidglwbygb5swk44fvky7cla3r11i4zx56hrf8lxjzhp6"
   }
  },
  {
@@ -70731,6 +71452,46 @@
    "sha256": "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2"
   }
  },
+ {
+  "ename": "org-runbook",
+  "commit": "1ddf4d4e4bd22cc85150c8cbf635ace1f54d64fc",
+  "sha256": "0dih8kv6fhqbfmw2x8ndl6gygssl3g0jr5qkbgbf4wkl5xjls3cg",
+  "fetcher": "github",
+  "repo": "tyler-dodge/org-runbook",
+  "unstable": {
+   "version": [
+    20200412,
+    403
+   ],
+   "deps": [
+    "dash",
+    "f",
+    "ht",
+    "mustache",
+    "s",
+    "seq"
+   ],
+   "commit": "8bec754c3007238d4e1c7296454815bf7000b31d",
+   "sha256": "10bfc8pr576ia16w5mwkksg9yn0jhcsbrkzw9yrjkvq2yzqsgpc0"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    6
+   ],
+   "deps": [
+    "dash",
+    "f",
+    "ht",
+    "mustache",
+    "s",
+    "seq"
+   ],
+   "commit": "53e8876a1587190ec4d103f9e94380f34797ce49",
+   "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n"
+  }
+ },
  {
   "ename": "org-scrum",
   "commit": "8315b6834d76180fd050b0d5cc2239d604fe2f3b",
@@ -70937,11 +71698,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20200324,
-    747
+    20200415,
+    623
    ],
-   "commit": "635ec9901be9d03402dd3d4b11e71f07bf1cf6f9",
-   "sha256": "1fc0r53209igflfxm2dncpmdh8zncr40y1ylj1j2pcyrdlghqpvw"
+   "commit": "ce92384b364de6421ab67e6399ae56b8ea51df49",
+   "sha256": "09i23m9knhr8px1f71wx4csddmrzgy9k4s9a2mq4la1wmj1jy627"
   },
   "stable": {
    "version": [
@@ -71028,26 +71789,26 @@
   "repo": "integral-dw/org-superstar-mode",
   "unstable": {
    "version": [
-    20200311,
-    1848
+    20200416,
+    2354
    ],
    "deps": [
     "org"
    ],
-   "commit": "715a9681d31968807df349280f96932f1a986f37",
-   "sha256": "0klq0khb59hmkwhay0dln5zhii8mbk3d7rn7rddixrrh5x5ghrlv"
+   "commit": "09ddc28383d363a4b353348a433e24535b4af0e3",
+   "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0"
   },
   "stable": {
    "version": [
     1,
-    0,
-    0
+    2,
+    1
    ],
    "deps": [
     "org"
    ],
-   "commit": "2f9f9d6b21cb54c2ce6af15ab0e3c73e2b962d78",
-   "sha256": "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz"
+   "commit": "09ddc28383d363a4b353348a433e24535b4af0e3",
+   "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0"
   }
  },
  {
@@ -71247,8 +72008,8 @@
     "alert",
     "cl-lib"
    ],
-   "commit": "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18",
-   "sha256": "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb"
+   "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0",
+   "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9"
   },
   "stable": {
    "version": [
@@ -71360,15 +72121,15 @@
   "repo": "jplindstrom/emacs-org-transform-tree-table",
   "unstable": {
    "version": [
-    20150110,
-    1433
+    20200413,
+    1959
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "0a9bf07f01bc5fc3b349aff64e83999a8de83b52",
-   "sha256": "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3"
+   "commit": "d84e7fb87bf2d5fc2be252500de0cddf20facf4f",
+   "sha256": "16zi7rg3hdfspifr46gbvpnr1rr144a777whr1w3gp6m46xmgzhs"
   },
   "stable": {
    "version": [
@@ -71428,6 +72189,25 @@
    "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh"
   }
  },
+ {
+  "ename": "org-treeusage",
+  "commit": "8868893e4109db9b348a62bc012c89648384994e",
+  "sha256": "1vxal0a4k348sqpivvahjlchk7w5a02dkqvxpqgjs1rlbs7vfv90",
+  "fetcher": "github",
+  "repo": "mtekman/org-treeusage.el",
+  "unstable": {
+   "version": [
+    20200418,
+    1904
+   ],
+   "deps": [
+    "dash",
+    "org"
+   ],
+   "commit": "fe4323bc500e2d949848c75e8f59340971b35562",
+   "sha256": "0v9zd2lnzvdxz3wqvw0j3bzd7228x6k8dyr7pzmimkl4l26cybqm"
+  }
+ },
  {
   "ename": "org-trello",
   "commit": "188ed8dc1ce2704838f7a2883c41243598150a46",
@@ -71446,8 +72226,8 @@
     "request-deferred",
     "s"
    ],
-   "commit": "e8e88239b5130307368f554b96fbf05ff4c207b5",
-   "sha256": "0kzvyv8rs0fsfbqsvgdjxlfa0qyi7wsdnfjw7c0hbwi25al39zm7"
+   "commit": "cd7bf366d40bb4af4a1a9801446dc98f713eac8a",
+   "sha256": "08pgn3llbk0sz5v50jqa7mvdv6dw507kgkrkk0ciii1jalg4786a"
   },
   "stable": {
    "version": [
@@ -71602,19 +72382,20 @@
   "repo": "marcIhm/org-working-set",
   "unstable": {
    "version": [
-    20200207,
-    2036
+    20200416,
+    813
    ],
-   "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5",
-   "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8"
+   "commit": "344d92ee5c117077317616e33d5945703059ac00",
+   "sha256": "1hzvv23bx4mscl3sw6nr8gggch8rdlyg33fhdv89xpgr700dx1nx"
   },
   "stable": {
    "version": [
     2,
-    0
+    1,
+    6
    ],
-   "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5",
-   "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8"
+   "commit": "d6fff111930befa52a5cce128c986b0162ddf8c4",
+   "sha256": "1s9rqjn6c52kvz4v1ma6icdykvkvrvbyllpy5i1mg0pb4acbbwym"
   }
  },
  {
@@ -71656,8 +72437,8 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f",
-   "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi"
+   "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b",
+   "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz"
   },
   "stable": {
    "version": [
@@ -71683,11 +72464,11 @@
   "repo": "tumashu/org2ctex",
   "unstable": {
    "version": [
-    20191024,
-    610
+    20200331,
+    550
    ],
-   "commit": "d4af170f5190dad3aa31ab1cf4c6f087d56ab111",
-   "sha256": "0m28mxsq1d5ggr8phfn94pb38lj8x3sxykh7hfqbwhphaza3by5q"
+   "commit": "2e40aa5e78b0562516f46f689e7b74cdf451cc2a",
+   "sha256": "06ip9663xvygpr484r09v7c55nn0pxmr30455iqpmxi32dwx974g"
   }
  },
  {
@@ -71816,11 +72597,11 @@
   "repo": "kostafey/organic-green-theme",
   "unstable": {
    "version": [
-    20200301,
-    1916
+    20200418,
+    2058
    ],
-   "commit": "9374259e1b22d68f30a1f5376052ab09dbad606d",
-   "sha256": "13jpfn4sjsw0lssrq0n75085j2g41ppmwky5mq0nyv8j0c0mmqpk"
+   "commit": "5218473fb500e58ccad3f73cfc4245f161869f89",
+   "sha256": "07l10mjgz0il5z7qpn2bw7621m5frgcmsb2pl9pyhfrjykvf8mih"
   }
  },
  {
@@ -71897,16 +72678,15 @@
   "repo": "magit/orgit",
   "unstable": {
    "version": [
-    20191205,
-    2300
+    20200417,
+    1720
    ],
    "deps": [
-    "dash",
     "magit",
     "org"
    ],
-   "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8",
-   "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07"
+   "commit": "e147f055772cc934fe1f1d8619059badeb647c93",
+   "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8"
   },
   "stable": {
    "version": [
@@ -71931,15 +72711,15 @@
   "repo": "tarsius/orglink",
   "unstable": {
    "version": [
-    20190919,
-    1859
+    20200413,
+    2124
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161",
-   "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q"
+   "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b",
+   "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm"
   },
   "stable": {
    "version": [
@@ -71963,15 +72743,15 @@
   "repo": "yoshinari-nomura/orglue",
   "unstable": {
    "version": [
-    20171220,
-    1226
+    20200411,
+    311
    ],
    "deps": [
     "epic",
     "org"
    ],
-   "commit": "ae2a45c19b52e45db7891093a3ff17ba2e51c507",
-   "sha256": "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0"
+   "commit": "9d5a8e24be9acb8c55bb4d6aa8b98e30e2677401",
+   "sha256": "1n2l9acc54sbpbv5d1h2ib9cn7nbidmkvhhlwihqzpvvh7bhjfj7"
   }
  },
  {
@@ -72002,11 +72782,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20190812,
-    604
+    20200423,
+    2123
    ],
-   "commit": "1a13f7f70357f369e16bfa3038a9fb760cbffb46",
-   "sha256": "11qygmgvjqc53gy5f3pz0hh5zsam1li8vbyr42wflfkv6cwxypdb"
+   "commit": "b4d8ee2b8e0062eaa15eac6805374c02b776bb88",
+   "sha256": "1p187hfll4jz44g7xxdhnnm0qjcf4gdxbrywdqxpdqvqs74pa18l"
   }
  },
  {
@@ -72017,11 +72797,11 @@
   "repo": "tbanel/orgtblasciiplot",
   "unstable": {
    "version": [
-    20151215,
-    2151
+    20200411,
+    711
    ],
-   "commit": "cd91f6ae26a7402e192a1f4fd6248f5797edf19e",
-   "sha256": "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z"
+   "commit": "59618630205fc8c0fcc74fb34c4581d9712a5181",
+   "sha256": "1qx6la70cdxr556d2kna4ra76kdliaqkwm97jahd20nhs2izvpl1"
   }
  },
  {
@@ -72032,14 +72812,14 @@
   "repo": "tbanel/orgtbljoin",
   "unstable": {
    "version": [
-    20150121,
-    2246
+    20200423,
+    2129
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ccf5e0d96e053dc289da39a048715fcf36835ff2",
-   "sha256": "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg"
+   "commit": "9a197de6c3036fbdb6309cbfd35ec31a69b3ebe7",
+   "sha256": "0fhq36g5k4nib5ykb92j12l3fnqj09xh2jai92l8c5nslgm00slr"
   }
  },
  {
@@ -72074,16 +72854,16 @@
   "repo": "gregsexton/origami.el",
   "unstable": {
    "version": [
-    20180101,
-    1553
+    20200331,
+    1019
    ],
    "deps": [
     "cl-lib",
     "dash",
     "s"
    ],
-   "commit": "1f38085c8f9af7842765ed63f7d6dfe4dab59366",
-   "sha256": "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"
+   "commit": "e558710a975e8511b9386edc81cd6bdd0a5bda74",
+   "sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf"
   }
  },
  {
@@ -72367,11 +73147,11 @@
   "repo": "tarsius/outline-minor-faces",
   "unstable": {
    "version": [
-    20200103,
-    1239
+    20200416,
+    2211
    ],
-   "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49",
-   "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf"
+   "commit": "d431b13e3d47cf2564a04a096d2162ca38593050",
+   "sha256": "05szncxfm7595ah63k1z3zmivk2z1lv28jcwb1fylx0s93f51z0c"
   },
   "stable": {
    "version": [
@@ -72391,11 +73171,11 @@
   "repo": "abingham/outline-toc.el",
   "unstable": {
    "version": [
-    20170730,
-    1130
+    20200401,
+    1208
    ],
-   "commit": "31f04bea19cfcfb01a94d1fd2b72391cb02b7463",
-   "sha256": "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j"
+   "commit": "81d373633b40628cc3a6b6fb534fd7730076bcdb",
+   "sha256": "1ad6bxa5x95n6i1197p13qy5fgzn1pslwbzqsf4rfy9bvr49g6q3"
   }
  },
  {
@@ -72538,11 +73318,11 @@
   "repo": "myTerminal/overcast-theme",
   "unstable": {
    "version": [
-    20190326,
-    1646
+    20200425,
+    1601
    ],
-   "commit": "afb8098ad2234a65ec614f4028f7cf2555134f46",
-   "sha256": "1fp8awdhpr92fygp6pbx9bdnkc1amngbwsr6c2haj7xb8717zckj"
+   "commit": "e02b835a08919ead079d7221d513348ac02ba92e",
+   "sha256": "0fy8739fbhmixgjxgd1j5v2rjkwhsqac5kczx3mdjlfd2w55k3h7"
   },
   "stable": {
    "version": [
@@ -72605,6 +73385,21 @@
    "sha256": "0qcinx4gpfzngirwfis7byrdbgbwk3pak7f8mx5fsbcdnybkk8sj"
   }
  },
+ {
+  "ename": "owcmd",
+  "commit": "13e6df2397380eba31ecbf4a7c1214dedaf9cfad",
+  "sha256": "0lg6mk5bmfkiifzxz4ijr10nibr5zcbfxzy9cvg6bnzxns6nhgq5",
+  "fetcher": "github",
+  "repo": "fishyfriend/owcmd",
+  "unstable": {
+   "version": [
+    20200424,
+    2314
+   ],
+   "commit": "af0f79c16f573f4dbaafe77a430d7621857e706b",
+   "sha256": "0mjg5563bka3cc6rysw7fhhh51w4fpysa9ni9v5iv89d8i7mz0yd"
+  }
+ },
  {
   "ename": "owdriver",
   "commit": "f3f9c1bb19345c6027a945e7f265632da1a391cb",
@@ -72613,30 +73408,30 @@
   "repo": "aki2o/owdriver",
   "unstable": {
    "version": [
-    20200326,
-    1608
+    20200410,
+    1901
    ],
    "deps": [
     "log4e",
     "smartrep",
     "yaxception"
    ],
-   "commit": "a243051365eb7ac0d1845c8b468b90510998f66e",
-   "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn"
+   "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae",
+   "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d"
   },
   "stable": {
    "version": [
     0,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "log4e",
     "smartrep",
     "yaxception"
    ],
-   "commit": "a243051365eb7ac0d1845c8b468b90510998f66e",
-   "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn"
+   "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae",
+   "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d"
   }
  },
  {
@@ -72798,14 +73593,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20200305,
-    1413
+    20200420,
+    324
    ],
    "deps": [
     "org"
    ],
-   "commit": "1c1e3ec46785d93f4de2e71fc32604bd7c0fed40",
-   "sha256": "1cgwpj9x10z6y9ykbma39xakzisly5jhp5pkdiwrc5zq5psr2ddx"
+   "commit": "5106b430a139bb9e37beda177a082dfe36b407f5",
+   "sha256": "1x5hmvxy9dl88ix4ir1jshjavc99l8884if8c0v9gkjqb31ka9n7"
   },
   "stable": {
    "version": [
@@ -73417,14 +74212,14 @@
   "repo": "UndeadKernel/pacfiles-mode",
   "unstable": {
    "version": [
-    20181028,
-    1744
+    20200418,
+    1806
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ff58f387e0f85ca20c4c9f119bf13303bf8b5a76",
-   "sha256": "1my9qhnla61wgrhf0izjx0kyjrxwyz3cfh3xp80mmnxhxrrf21kl"
+   "commit": "222ae3f540cddee306067c83451cfece1112c09e",
+   "sha256": "1ps6blv2jhm4i2gr1fbsr1lii9cpr99prhwnxvhxxxy08c9b6mrx"
   },
   "stable": {
    "version": [
@@ -73544,15 +74339,15 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20200313,
-    2338
+    20200419,
+    406
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "0e27abf2e65340dc1523b27b923650b863472a5a",
-   "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px"
+   "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f",
+   "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l"
   },
   "stable": {
    "version": [
@@ -73581,8 +74376,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "0e27abf2e65340dc1523b27b923650b863472a5a",
-   "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px"
+   "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f",
+   "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l"
   },
   "stable": {
    "version": [
@@ -73855,16 +74650,16 @@
   "repo": "abo-abo/pamparam",
   "unstable": {
    "version": [
-    20200309,
-    1703
+    20200410,
+    1155
    ],
    "deps": [
     "hydra",
     "lispy",
     "worf"
    ],
-   "commit": "ed730f17074cb12a8fb9a0daa852d1abbfb34372",
-   "sha256": "0shzsgs5ds4lzw1fv13vdphbhxyqad5s7jwk5zqa5wg42sidxq3r"
+   "commit": "f9d83bbf5eb883bce6873dd6fd97484b6805215c",
+   "sha256": "0av69k6psrpmyadm2r0frwdbqyvpa4flzkrmi88w0vx3g0cxiv2k"
   }
  },
  {
@@ -73875,11 +74670,11 @@
   "repo": "sebasmonia/panda",
   "unstable": {
    "version": [
-    20200317,
-    1932
+    20200424,
+    2206
    ],
-   "commit": "2a17e3e5c57132777cfef9704565f6bfa129dbe2",
-   "sha256": "02aysxdb660dh19l07g6h2qvckrrd4aj79lryd6h7j3in1s0sn05"
+   "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43",
+   "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9"
   }
  },
  {
@@ -74063,14 +74858,14 @@
   "repo": "ajgrf/parchment",
   "unstable": {
    "version": [
-    20200322,
-    1714
+    20200424,
+    1524
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "bf158a064e4a00a47d24ed0c1725204ce6675064",
-   "sha256": "1vqvfxrwrlmnmp0bidagphajwlxs6kf480xajkpz590m0zf1xfp3"
+   "commit": "766efdbd444cbefd9d01e7c6f55956d4c9a8db6c",
+   "sha256": "1jz9vf8wfjnnbbsnxzcpfvj19556w1z9887xvvwn6rsiqqlxgray"
   },
   "stable": {
    "version": [
@@ -74408,15 +75203,15 @@
   "repo": "clojure-emacs/parseedn",
   "unstable": {
    "version": [
-    20191113,
-    831
+    20200419,
+    1124
    ],
    "deps": [
     "a",
     "parseclj"
    ],
-   "commit": "f42ff988338484815ccd925c8f83a32c5d52319b",
-   "sha256": "0cx1zf82mjwlnj6znas8b94ws1f3n2h0imyybi9qirvsp90qd4sl"
+   "commit": "92bf875962e62f8c6370b56991d546f122536c6b",
+   "sha256": "0xli6cf0fzydnd683v3hk5kfsbxwh83s916fd64j8ak0wzjnlsfr"
   },
   "stable": {
    "version": [
@@ -74556,8 +75351,8 @@
     "s",
     "with-editor"
    ],
-   "commit": "98193d3bbb3538eda457d0db4ccccbcc4b04ce3d",
-   "sha256": "133b2m49jd2bw0k5f77y8gc2w53vhp3rym5mzqx7mlfgssgd795k"
+   "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2",
+   "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v"
   },
   "stable": {
    "version": [
@@ -75049,6 +75844,21 @@
    "sha256": "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z"
   }
  },
+ {
+  "ename": "pdb-capf",
+  "commit": "f0b7e12b9f49dc4ed1cc5a6893accc882896f334",
+  "sha256": "0656a2s8r8dg11in8r5xx984lcxd5g5l3x6vnha50s0c4nx93x3y",
+  "fetcher": "github",
+  "repo": "muffinmad/emacs-pdb-capf",
+  "unstable": {
+   "version": [
+    20200419,
+    1237
+   ],
+   "commit": "2f4099aa1330f87df4e9cd526de057ee9b71de6c",
+   "sha256": "0fdzhsz3784lf50mdabz9h2b6992cab2nnn4xv7rx2a8hsyyq1mq"
+  }
+ },
  {
   "ename": "pdb-mode",
   "commit": "6aee132aa24322fe1ac88ae17ee6e77ae1ec8d11",
@@ -75275,24 +76085,6 @@
    "sha256": "02k379nig43j85wfm327pw6sh61kxrs1gwz0vgcbx9san4dp83bk"
   }
  },
- {
-  "ename": "perl6-mode",
-  "commit": "4e912dccdee12f745272d26ea10d5f106a27cabc",
-  "sha256": "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0",
-  "fetcher": "github",
-  "repo": "perl6/perl6-mode",
-  "unstable": {
-   "version": [
-    20180619,
-    1159
-   ],
-   "deps": [
-    "pkg-info"
-   ],
-   "commit": "88de065795d6863b23b6042576b9e90f8cbf8798",
-   "sha256": "0m8kc8j1rwy30439k4l5f351jkfjjp38mjm891ax8ghp9zk5pr7h"
-  }
- },
  {
   "ename": "perlbrew",
   "commit": "24bd9c2cd848f5003a244a7127e8fc5ef46bdca4",
@@ -75497,25 +76289,25 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20200326,
-    2358
+    20200418,
+    1815
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2ac6aff0569923993a251beddb3046ec44841408",
-   "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had"
+   "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9",
+   "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0"
   },
   "stable": {
    "version": [
     2,
-    6
+    7
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2ac6aff0569923993a251beddb3046ec44841408",
-   "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had"
+   "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9",
+   "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0"
   }
  },
  {
@@ -75567,19 +76359,19 @@
   "repo": "Alexander-Miller/pfuture",
   "unstable": {
    "version": [
-    20200113,
-    620
+    20200425,
+    1357
    ],
-   "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d",
-   "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy"
+   "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef",
+   "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf"
   },
   "stable": {
    "version": [
     1,
-    8
+    9
    ],
-   "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d",
-   "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy"
+   "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef",
+   "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf"
   }
  },
  {
@@ -75979,11 +76771,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20200323,
-    1215
+    20200415,
+    1405
    ],
-   "commit": "b5d99881002e3c62ebe874ad9f48474afc16c62d",
-   "sha256": "0pq7nccmrbvrf7120d48aqymdwh5jgjvzwi2820hdw8j6b7prm4h"
+   "commit": "4d0b4a04401a2b9f9ff834f6ed58bc7cc5b878c0",
+   "sha256": "0lgw1lghib0vv4byrhjimldxyqyav4qypprk9ppvwjbad1j0hfkn"
   },
   "stable": {
    "version": [
@@ -76071,8 +76863,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20200324,
-    1347
+    20200405,
+    1544
    ],
    "deps": [
     "async",
@@ -76081,8 +76873,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05",
-   "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5"
+   "commit": "860d7e8784b261ee71deba354d01c3038cd777ab",
+   "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3"
   },
   "stable": {
    "version": [
@@ -76136,20 +76928,26 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20200122,
-    1256
+    20200411,
+    531
    ],
-   "commit": "a1c30ca634107551c20c846b5316ca5697adb06d",
-   "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1"
+   "deps": [
+    "php-mode"
+   ],
+   "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101",
+   "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w"
   },
   "stable": {
    "version": [
     0,
-    3,
-    3
+    5,
+    0
    ],
-   "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a",
-   "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk"
+   "deps": [
+    "php-mode"
+   ],
+   "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1",
+   "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1"
   }
  },
  {
@@ -76351,25 +77149,25 @@
   "repo": "davep/pinboard.el",
   "unstable": {
    "version": [
-    20191203,
-    1015
+    20200402,
+    919
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9351a2320f1e75896f56032959c7bcbf9d9aa560",
-   "sha256": "080fzpr7is05cb8fj0rzhfc8pmb1rwfmkqnydj36d56da1ndrfmw"
+   "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9",
+   "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw"
   },
   "stable": {
    "version": [
     1,
-    2
+    3
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8",
-   "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91"
+   "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9",
+   "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw"
   }
  },
  {
@@ -76673,11 +77471,11 @@
   "repo": "juergenhoetzel/pkgbuild-mode",
   "unstable": {
    "version": [
-    20181216,
-    1331
+    20200425,
+    616
    ],
-   "commit": "e30e37730b5f30bc0dd5b9328fbf4cb3e6f46fdd",
-   "sha256": "1ijx067hlbr4yz9b9h58pwlqd4rgjgm27f5s1f9f3rwb249s36s1"
+   "commit": "bc22301198b3f581d89352510e847454fb1cb9ff",
+   "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1"
   },
   "stable": {
    "version": [
@@ -76983,11 +77781,11 @@
   "repo": "flexibeast/plisp-mode",
   "unstable": {
    "version": [
-    20190914,
-    513
+    20200403,
+    613
    ],
-   "commit": "02738af25707e39d8a608b09a24173bb05f5be9f",
-   "sha256": "133wm5fd91z9k3zpflb455nglpgy1dqyz3mz2s694xyppw4rvkia"
+   "commit": "03dcd523295a0dec76356d23043428d850b03b70",
+   "sha256": "0g9bwd137z543pbdq4j74j0ql8j2657yxh4kb809jps9kxq8dc0k"
   }
  },
  {
@@ -77718,11 +78516,11 @@
   "repo": "polymode/polymode",
   "unstable": {
    "version": [
-    20200316,
-    1314
+    20200411,
+    915
    ],
-   "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8",
-   "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn"
+   "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a",
+   "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq"
   },
   "stable": {
    "version": [
@@ -77801,14 +78599,14 @@
   "repo": "ponylang/pony-snippets",
   "unstable": {
    "version": [
-    20160205,
-    411
+    20200418,
+    354
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "b921bd943b528f04d4293625b28fd2d4a013a1bf",
-   "sha256": "183vml7090w1fx99rz9d8qjfbf089wqilyflk0512xz8al3gcd8q"
+   "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441",
+   "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw"
   },
   "stable": {
    "version": [
@@ -77861,28 +78659,28 @@
   "repo": "aki2o/emacs-pophint",
   "unstable": {
    "version": [
-    20200322,
-    737
+    20200420,
+    1429
    ],
    "deps": [
     "log4e",
     "yaxception"
    ],
-   "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708",
-   "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s"
+   "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d",
+   "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8"
   },
   "stable": {
    "version": [
     1,
-    1,
+    3,
     0
    ],
    "deps": [
     "log4e",
     "yaxception"
    ],
-   "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708",
-   "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s"
+   "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d",
+   "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8"
   }
  },
  {
@@ -78096,30 +78894,30 @@
   "repo": "jcaw/porthole",
   "unstable": {
    "version": [
-    20190721,
-    1428
+    20200404,
+    1454
    ],
    "deps": [
-    "elnode",
     "f",
-    "json-rpc-server"
+    "json-rpc-server",
+    "web-server"
    ],
-   "commit": "0e73b8e527cfc9ecba2fa4f88382f588fb4a300d",
-   "sha256": "06nf12cvxk2dxqljrga59vp8wkvsif1mm3ahvy1nbjsq6s8zryq4"
+   "commit": "9e68b419acf9245208f8094e10041b7f04511473",
+   "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z"
   },
   "stable": {
    "version": [
     0,
-    2,
-    5
+    3,
+    0
    ],
    "deps": [
-    "elnode",
     "f",
-    "json-rpc-server"
+    "json-rpc-server",
+    "web-server"
    ],
-   "commit": "481a3a247586417b7643d393113ff8faf95b327e",
-   "sha256": "1gdywyb1vq7i983d4bdhwdkk0vk0x09rms83xyk4j75qlqb05vp1"
+   "commit": "9e68b419acf9245208f8094e10041b7f04511473",
+   "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z"
   }
  },
  {
@@ -78154,20 +78952,20 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20200319,
-    907
+    20200426,
+    819
    ],
-   "commit": "c15800a8388696474fe9f8466fce1b40735b9304",
-   "sha256": "14xjly5cqziqb0gnklsgg28vimdrpq8273z2inf1c0jnak8x2vzn"
+   "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e",
+   "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw"
   },
   "stable": {
    "version": [
     0,
-    6,
+    7,
     0
    ],
-   "commit": "9638b9d9cf8b9727a13c86f70b5d33bf938497a5",
-   "sha256": "12r1as9lqqc6anckq455dqv8dbqahnbdzj437i11053wv33cv5vd"
+   "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013",
+   "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax"
   }
  },
  {
@@ -78372,11 +79170,14 @@
   "repo": "conao3/ppp.el",
   "unstable": {
    "version": [
-    20200318,
-    806
+    20200418,
+    1551
    ],
-   "commit": "bfb9ddfbc124b8b97d7a12610947b76794c0fd06",
-   "sha256": "1632y0vaxv043w4js5jpd9zr36bzy9pwxnhmlh44hmkvgfw07qvn"
+   "deps": [
+    "leaf"
+   ],
+   "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae",
+   "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y"
   },
   "stable": {
    "version": [
@@ -78434,19 +79235,19 @@
   "repo": "raxod502/prescient.el",
   "unstable": {
    "version": [
-    20191224,
-    220
+    20200412,
+    1607
    ],
-   "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5",
-   "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p"
+   "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63",
+   "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h"
   },
   "stable": {
    "version": [
     4,
-    0
+    1
    ],
-   "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387",
-   "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr"
+   "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
+   "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
   }
  },
  {
@@ -78622,25 +79423,26 @@
   "repo": "alphapapa/prism.el",
   "unstable": {
    "version": [
-    20200315,
-    1926
+    20200407,
+    1148
    ],
    "deps": [
     "dash"
    ],
-   "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2",
-   "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0"
+   "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036",
+   "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "dash"
    ],
-   "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2",
-   "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0"
+   "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036",
+   "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs"
   }
  },
  {
@@ -79041,8 +79843,8 @@
    "deps": [
     "pkg-info"
    ],
-   "commit": "56e18fcefa2f286edfec98853189985823d0e53c",
-   "sha256": "0iq93ghwj96xxfsa5s90g36ngwpa92bj91zvkkk40zn9faqkdllc"
+   "commit": "2aa3a663fc9a9a75c3bf73699e40ecc0c3567268",
+   "sha256": "1cw4bgj9iglcs71zrbx8rjk19dfvnws795qbm52hm7zs95lfprxn"
   },
   "stable": {
    "version": [
@@ -79156,8 +79958,8 @@
   "repo": "asok/projectile-rails",
   "unstable": {
    "version": [
-    20200203,
-    1226
+    20200417,
+    1711
    ],
    "deps": [
     "f",
@@ -79166,8 +79968,8 @@
     "projectile",
     "rake"
    ],
-   "commit": "0398d940a201128946f619de842b0d1f9f0fffbd",
-   "sha256": "0cfrm56bxdwb96xqpdih6hqh61gvc1wal4yp7d7c414j8h0s7d02"
+   "commit": "11980b2bcb99208888856a9b8666ff329b6f0142",
+   "sha256": "0crb08byq1i9wcjmcl645wc03p1jadm4f9nd138rii69nzancwfl"
   },
   "stable": {
    "version": [
@@ -79233,8 +80035,8 @@
     "projectile",
     "sift"
    ],
-   "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a",
-   "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9"
+   "commit": "cdddba2d183146c340915003f1b5d09d13712c22",
+   "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if"
   },
   "stable": {
    "version": [
@@ -79407,11 +80209,11 @@
   "repo": "chuntaro/emacs-promise",
   "unstable": {
    "version": [
-    20200320,
-    341
+    20200425,
+    617
    ],
-   "commit": "02c470bd6c7bf4ea4244d304f57997bad37c9bb7",
-   "sha256": "1sjwwram45pb9bjap6h24m6734qr5yhnai2lqbdvxd0nplfv91ng"
+   "commit": "2a8e71420e8c9d2d4ce951d4342762aeedaae654",
+   "sha256": "1drz8qbcw5qjh5v0vkvflni14g58nmkmyn11ksjd49ck296mfsp7"
   },
   "stable": {
    "version": [
@@ -79487,11 +80289,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20200326,
-    1804
+    20200416,
+    1351
    ],
-   "commit": "9196749d55413224355409d55003f7f8c8ba0f79",
-   "sha256": "17ak2nbgiqwldk6y4cg4qq49hnvzw32jm4m3dqag2smvkl6rjw19"
+   "commit": "e901c0bb73e0e66c95879bbb3738ac79e91ffeaa",
+   "sha256": "1j6dwcpplh98wf3mncidc8gn96pv58g71igim28gkqx21g8p2i40"
   },
   "stable": {
    "version": [
@@ -79594,8 +80396,8 @@
     20170526,
     1650
    ],
-   "commit": "dec4939439d9ca2adf2bb14edccf876c2587faf2",
-   "sha256": "0kxrgv1pb38lsgpgilaqjlvw6inmlbs8rdrm2bfilzcwwrr92bi9"
+   "commit": "dddeed298bf84505f4d123a068f911025b351661",
+   "sha256": "10a70drfyanrjpx157aip402vd56ynm85ryzripd3w0symn9k1c3"
   },
   "stable": {
    "version": [
@@ -79806,8 +80608,8 @@
   "repo": "fvdbeek/emacs-pubmed",
   "unstable": {
    "version": [
-    20200315,
-    1938
+    20200426,
+    1239
    ],
    "deps": [
     "deferred",
@@ -79815,14 +80617,14 @@
     "s",
     "unidecode"
    ],
-   "commit": "cc5d258ac83650ad6e8043c8c01d9162c2460308",
-   "sha256": "13n7i80734848by8f0b3z0mqv0rh9x42hglkc8abhmilc0sg4i0y"
+   "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6",
+   "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz"
   },
   "stable": {
    "version": [
     0,
     4,
-    2
+    3
    ],
    "deps": [
     "deferred",
@@ -79830,8 +80632,8 @@
     "s",
     "unidecode"
    ],
-   "commit": "f6e13137ad7731c8b0eb1720aed48d1a1edf4719",
-   "sha256": "1nanaj0liilnplh1njbmch7qsa2h7izkc51bpd4hxw6k4bslplqc"
+   "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6",
+   "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz"
   }
  },
  {
@@ -79872,11 +80674,11 @@
   "repo": "flexibeast/pulseaudio-control",
   "unstable": {
    "version": [
-    20190828,
-    1136
+    20200406,
+    752
    ],
-   "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241",
-   "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3"
+   "commit": "a931533140547510decdc368f39b2d2b97ca725f",
+   "sha256": "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76"
   }
  },
  {
@@ -79956,26 +80758,25 @@
   "repo": "voxpupuli/puppet-mode",
   "unstable": {
    "version": [
-    20180813,
-    1947
+    20200419,
+    1236
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "7dee1b5a5debac6e56f9107492a413b6c0edb94d",
-   "sha256": "01isn90h50p5c6cgzwhb1jq8yacj0fxw9ppfqrnynckg6ydpvg74"
+   "commit": "0197b405c79a5d0718979f31df760bb3bfca38de",
+   "sha256": "0k1r0r1cvk6z3lj5shgd8ly78sfl8bbkmld6x5cvw481ynyb7rgy"
   },
   "stable": {
    "version": [
     0,
-    3
+    4
    ],
    "deps": [
-    "cl-lib",
     "pkg-info"
    ],
-   "commit": "d943149691abd7b66c85d58aee9657bfcf822c02",
-   "sha256": "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14"
+   "commit": "73ea35bc7a3ad663c5b73f65cb6377eb0ae11d6f",
+   "sha256": "0c5q8qmbligzjsn05di4wh6ggpd3944j4yqb78vzd441b8ssq70i"
   }
  },
  {
@@ -80418,8 +81219,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20200326,
-    719
+    20200426,
+    505
    ],
    "deps": [
     "async",
@@ -80427,21 +81228,22 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "84af8e80a4ac8fa19e7b01a3f9984280e7d501b4",
-   "sha256": "0351mvnnm0xzmlm71byxlbn8dp7qnpw8d12ghwdmd53q87pfgz9s"
+   "commit": "b934273bb33d6be6aea6e20e68930bc5aaf4a48a",
+   "sha256": "01ykgpzkv06gxiaqj4z1qwf00pwdfm0zxzbsy4xr8ciyhhxbc9pj"
   },
   "stable": {
    "version": [
     1,
-    8
+    9
    ],
    "deps": [
     "async",
     "popup",
-    "pyim-basedict"
+    "pyim-basedict",
+    "xr"
    ],
-   "commit": "8648d467d79b3bf1c3a99623f9329939cacc40da",
-   "sha256": "16rma4cv7xgky0g3x4an27v30jdi6i1sqw43cl99zhkqvp43l3f9"
+   "commit": "8fe9897f57e410a7637692d98c40876cb3bd6c2d",
+   "sha256": "1n9syy39rnma0giz2g1dhdfjj4nn5bls2qzswy48snfl5z5mfm5j"
   }
  },
  {
@@ -80494,14 +81296,14 @@
   "repo": "tumashu/pyim-wbdict",
   "unstable": {
    "version": [
-    20190201,
-    2300
+    20200331,
+    542
    ],
    "deps": [
     "pyim"
    ],
-   "commit": "9799b689643052078f53d69342a82315251490f4",
-   "sha256": "1rqlckmlmwmnqvk8bbcyvwr54p6x9b1fph5f17anzlvwffdjsw5c"
+   "commit": "daa223e2603a5ef3e6c8e33575d8f4e4604a8d3c",
+   "sha256": "0inl29fa2l5grn6z2wszj43bv17yf7n9x8l77zk2xp8q3gkswd86"
   },
   "stable": {
    "version": [
@@ -80573,8 +81375,8 @@
     20170402,
     1255
    ],
-   "commit": "53e5406b9279008f3ae8b5f045e5cd5773771d70",
-   "sha256": "0c6d0pmbinj65kacnqzbsa6acb3as8blrl5f202s8bbb9zd62vam"
+   "commit": "be5a61b13e48a129613e0c659bfd28bf9824f53c",
+   "sha256": "124pf14z2yc56bvn0vvg0irzl39q3bbng4zp75qjzgb7d387n4hb"
   }
  },
  {
@@ -80758,8 +81560,8 @@
     20190716,
     921
    ],
-   "commit": "0d2f783f5a868ded8a37aa5881f8952aa36b053f",
-   "sha256": "1cqcxdg4bv8ybw5ds5av4id39fyk711bfadc779ilj5dn0mcd4h7"
+   "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb",
+   "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh"
   }
  },
  {
@@ -80815,11 +81617,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20200224,
-    1148
+    20200417,
+    648
    ],
-   "commit": "5bf2c0dafb086684124c3997a618d40ac8db0fb0",
-   "sha256": "1hz9j8k4bybvi3kgq51rqi0rwy3d7c5wqvx2kkljh6734m9x8xp2"
+   "commit": "9c336295c830f684dbf043fbbde432c54a2b4678",
+   "sha256": "0h02d02wv5hkz3lnjr9zxr8dwd4b1v2r6wf808g0x6xqnm01wspm"
   },
   "stable": {
    "version": [
@@ -81139,11 +81941,11 @@
   "repo": "lbolla/emacs-quasi-monochrome",
   "unstable": {
    "version": [
-    20181213,
-    827
+    20200415,
+    705
    ],
-   "commit": "68060dbbc0bbfe4924387392874186c5a29bb434",
-   "sha256": "0zp2xr0bjfqrpb0bqczzick1vvbjmipjavrdi70kw6a9caynvq22"
+   "commit": "b38d71860fdea945e10e8a766ac9dfa1410ade67",
+   "sha256": "0jcwfmamvpd22r5sbicbf9442b22lvldfrqldysm4l9yyxs11jy3"
   },
   "stable": {
    "version": [
@@ -81437,15 +82239,15 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20200329,
-    1841
+    20200420,
+    1412
    ],
    "deps": [
     "faceup",
     "pos-tip"
    ],
-   "commit": "c8ac9971814ca9df8ec406f3b76c9ba4878a5d57",
-   "sha256": "0jnw9plmw3r2c12kcy4435v2kf0vmmla9ljb670zhcg690a5cjqh"
+   "commit": "2827e95c5a2605cc25a549b260763922ecd68983",
+   "sha256": "0f6k9nlg8kz739pla0hkyp010cgdw9jd0qcii1d6dd1w3a84xk3v"
   }
  },
  {
@@ -81608,6 +82410,24 @@
    "sha256": "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n"
   }
  },
+ {
+  "ename": "raku-mode",
+  "commit": "e9831cc66d9a9e6b6441e6a75d54ce57146571fd",
+  "sha256": "08c9mgvmcnhn2q1ldqsaabj623b9kxd7blgfjabbwrl7bqkqpwzp",
+  "fetcher": "github",
+  "repo": "Raku/raku-mode",
+  "unstable": {
+   "version": [
+    20200426,
+    1156
+   ],
+   "deps": [
+    "pkg-info"
+   ],
+   "commit": "e4d8b0230a503f315087443e24708a78ad8665d9",
+   "sha256": "1864kwd5ixghsr219jlqmgg5gpv802q8xfsk8i8yi5dcy1jn1ckr"
+  }
+ },
  {
   "ename": "rally-mode",
   "commit": "0914825c6d5ad26d2a8035fc33ad98df42df3c53",
@@ -82045,11 +82865,11 @@
   "repo": "ChillarAnand/real-auto-save",
   "unstable": {
    "version": [
-    20190224,
-    1446
+    20200418,
+    405
    ],
-   "commit": "824ad04121493723b08838c8b96559947dca7ed9",
-   "sha256": "1szpjv04rp9x9ph44a5s56a2y96z5x474bccsjnmn6yhingh5qik"
+   "commit": "d55c63106f6000c065f9c256fc4491ea07b2745e",
+   "sha256": "0b4drlzc384rp43m5454g86d866hx1lj4qdi3mlaz835nl8m86ki"
   },
   "stable": {
    "version": [
@@ -82068,16 +82888,16 @@
   "repo": "realgud/realgud",
   "unstable": {
    "version": [
-    20191123,
-    1341
+    20200418,
+    1721
    ],
    "deps": [
     "load-relative",
     "loc-changes",
     "test-simple"
    ],
-   "commit": "94f283593304c2f673cb4940900197d9cb099faa",
-   "sha256": "00dzw6nqqsgdlcvpnq1zc2568l5hz7vynqx6vkvvbj3jafc6nwj7"
+   "commit": "e03446f54c7ee0b4ed3ec7300597046cf1de2bb8",
+   "sha256": "160pv9jx66ygl3z1g8yrw7f786403lbb182nz972yl4nyjchbdw7"
   },
   "stable": {
    "version": [
@@ -82325,11 +83145,11 @@
   "repo": "xendk/reaper",
   "unstable": {
    "version": [
-    20200120,
-    2006
+    20200420,
+    1703
    ],
-   "commit": "6602e74d6190d2e8dd61358bebb513c3ae8b89fb",
-   "sha256": "1pywz6xm3wjkbcj5zr7w5xh5wfggvivnw94mmsm6lybnv2zgjg1d"
+   "commit": "c594d2fb9a027f360e98539a1debf5db639846b7",
+   "sha256": "0md3aqzy8rgvpafh6f8f2dwwrc43q317bk7p1whghfvji52aindv"
   },
   "stable": {
    "version": [
@@ -82352,8 +83172,8 @@
     20190710,
     1037
    ],
-   "commit": "5e6205cfede8c10c6821dfd9f9757a9d8035ec04",
-   "sha256": "0w25z5v551w7fcjwk73dwxhp4lydjrn4rc99swd1ffxyzp5cap56"
+   "commit": "7cf6fbf4e8e86ebb76d118b2703e20b968e030d4",
+   "sha256": "0b8p7lh0ifrw9rqvv15q3ib206d1wfv3xafpqwc70zzwaxswvk06"
   },
   "stable": {
    "version": [
@@ -82453,7 +83273,7 @@
     20180205,
     556
    ],
-   "commit": "6cb762efbd0aa323f96c687b6bebc9bf00a3ceb3",
+   "commit": "84bbac534cb114d8d11b86790435b65d36e99e68",
    "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx"
   }
  },
@@ -82769,11 +83589,11 @@
   "repo": "purcell/reformatter.el",
   "unstable": {
    "version": [
-    20200327,
-    2358
+    20200426,
+    818
    ],
-   "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696",
-   "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq"
+   "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031",
+   "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr"
   },
   "stable": {
    "version": [
@@ -82930,6 +83750,24 @@
    "sha256": "18mskl1w5n2cksjds27d1gcrwb065vp9n6hnw9402j3n6z0w8srv"
   }
  },
+ {
+  "ename": "rego-mode",
+  "commit": "fbc0b93675f6baab6ab023b596e65658c9e2a534",
+  "sha256": "0qdmn6kh4bh514qh0ii881c03p3hcdp1qlmdwpp5nlzxlkxbgp07",
+  "fetcher": "github",
+  "repo": "psibi/rego-mode",
+  "unstable": {
+   "version": [
+    20200413,
+    450
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "41c99057d0406c7fb3895a03da777af3961a648d",
+   "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj"
+  }
+ },
  {
   "ename": "related",
   "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8",
@@ -83568,8 +84406,8 @@
     20200324,
     1113
    ],
-   "commit": "030e89a38df6d194546b0629f90c9e1898370eb7",
-   "sha256": "1mfjwxf1l0py2ididzdv86r118ws9iscdv23a0kgf2cjd6ydpbjc"
+   "commit": "a2a75a929fc022e752759ed2a38accc639128dbe",
+   "sha256": "0s6jmxq9sqi6pm2kdrdik30nyz136kk2gqzdibb0wcvpfylhwawn"
   }
  },
  {
@@ -83822,8 +84660,8 @@
   "repo": "DogLooksGood/emacs-rime",
   "unstable": {
    "version": [
-    20200329,
-    1205
+    20200415,
+    1454
    ],
    "deps": [
     "cl-lib",
@@ -83831,8 +84669,8 @@
     "popup",
     "posframe"
    ],
-   "commit": "f78719e5d8c8d2ec6da0f66e0b1e7d660d3a5a89",
-   "sha256": "0pcncx1w7y8rnsg23lf055cc38xrwhx26yhrqwzdf996cad54y6w"
+   "commit": "9afeb4aa45771ef20c83d1208744d954273cbaf3",
+   "sha256": "00lnsxi2j1kvd28vq10ixj16qfkn22bw2m02zrs022d9jwcsza5r"
   }
  },
  {
@@ -84265,8 +85103,8 @@
     20200221,
     36
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -84291,8 +85129,8 @@
    "deps": [
     "rtags"
    ],
-   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
-   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
+   "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7",
+   "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3"
   },
   "stable": {
    "version": [
@@ -84763,11 +85601,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20200322,
-    1749
+    20200414,
+    2105
    ],
-   "commit": "2df6cf72163db57fd0c79fefd0e79f38f29f7d93",
-   "sha256": "1f8fbzkc6ifx91kcf5blx22bh3713qmm5kj95i06k8cn10nlx11f"
+   "commit": "a364b24af412659cc1074f533752356d1858b893",
+   "sha256": "1yj3b5li2flgxc3frmb7zjc92nhdq526jj6105zrsnj7ndxqycp4"
   },
   "stable": {
    "version": [
@@ -84879,8 +85717,8 @@
     20180406,
     808
    ],
-   "commit": "03410e6a7a2b11e47e1fea3b7d9899c7df26435e",
-   "sha256": "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83"
+   "commit": "43ba8b563bee3426cead0e6d4ddc09398e1a349d",
+   "sha256": "0bqdlcg5pah9a50dww8n5n0lzc8bzmpc230fdkinw8zrxph13p12"
   },
   "stable": {
    "version": [
@@ -85270,8 +86108,8 @@
     20190413,
     1246
    ],
-   "commit": "cc2dfa14eb3922d93c15f30734e8211c77ceada1",
-   "sha256": "11n26dksppjylg5jafxf4j859n6c1062v85qci8fx762wicz0bkf"
+   "commit": "f13d03efece7c1f31e9c3fe2e99b71a33cc43e1c",
+   "sha256": "04b63yww5yz4jn18mzpv53yzs6g6kmxs61m2ycnf59cb6ax2ajbd"
   }
  },
  {
@@ -85465,14 +86303,14 @@
   "repo": "technomancy/scpaste",
   "unstable": {
    "version": [
-    20190228,
-    2151
+    20200415,
+    40
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "568faaa70fa0413e2d165ad232cd4c6ec2815197",
-   "sha256": "160m4w0i9cj4zxmmsknmnvycscj9y8da39y1362kv7dpmwnxsxcp"
+   "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176",
+   "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9"
   },
   "stable": {
    "version": [
@@ -85633,11 +86471,11 @@
   "repo": "ideasman42/emacs-scroll-on-drag",
   "unstable": {
    "version": [
-    20200328,
-    116
+    20200411,
+    1050
    ],
-   "commit": "2d79a6d9c2497f701335fd66154a67cd51073c9f",
-   "sha256": "0m2605k8i2z44mqw5ibviwsbn3j8g8hs4q9cih5ip14lik6hhrdz"
+   "commit": "42d96a60a207cd73e7a58111358deb05f084c59e",
+   "sha256": "00l2n5kx5p18qdlfh2y355w34yp2fy401canrglz6dq1f7615lnz"
   }
  },
  {
@@ -85980,6 +86818,60 @@
    "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg"
   }
  },
+ {
+  "ename": "selectrum",
+  "commit": "4273a6e55cf797d1fab1825618aab7e9b6c01886",
+  "sha256": "012jmgr7w6x0gy8ygpzyyk23adyzmr7cknz2w51zjapcilkf6ghv",
+  "fetcher": "github",
+  "repo": "raxod502/selectrum",
+  "unstable": {
+   "version": [
+    20200425,
+    1449
+   ],
+   "commit": "dc1c8e8704f5eb73c540f2b4ca3eed213d2c3246",
+   "sha256": "0acifs68m6y5zfwadvvvlg7s4zhgazmrg6al7piy1nycq7dmng6b"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4",
+   "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm"
+  }
+ },
+ {
+  "ename": "selectrum-prescient",
+  "commit": "5724ebca5ab5a1c3087cc13ae0693548666ed62b",
+  "sha256": "1zr83pq39i56v5bx78cp5cg2lrwz01975ng4h1ziv6nrh9p7vvr0",
+  "fetcher": "github",
+  "repo": "raxod502/prescient.el",
+  "unstable": {
+   "version": [
+    20200404,
+    1550
+   ],
+   "deps": [
+    "prescient",
+    "selectrum"
+   ],
+   "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63",
+   "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h"
+  },
+  "stable": {
+   "version": [
+    4,
+    1
+   ],
+   "deps": [
+    "prescient",
+    "selectrum"
+   ],
+   "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0",
+   "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3"
+  }
+ },
  {
   "ename": "semaphore",
   "commit": "1cffd8c7720e5a262b8635a5fd1ca36766f4c824",
@@ -86022,14 +86914,14 @@
   "repo": "wanderlust/semi",
   "unstable": {
    "version": [
-    20190708,
-    1302
+    20200413,
+    839
    ],
    "deps": [
     "flim"
    ],
-   "commit": "16228dc2d147d6ba8762c10fb25c54a3757ee9b0",
-   "sha256": "1hccmz9g1rl3qz77214ybnai143zay48kai214gk43dw05bcfavc"
+   "commit": "1d6e21e9ee42c2c5bf1a4422d2fe7af20aa7ff1e",
+   "sha256": "0pkqh95i6pj7iwghapa8hld78h1q5n50f1lah2l1k2hz4lm6r8zz"
   }
  },
  {
@@ -86040,16 +86932,16 @@
   "repo": "conao3/seml-mode.el",
   "unstable": {
    "version": [
-    20200323,
-    220
+    20200419,
+    1022
    ],
    "deps": [
     "htmlize",
     "impatient-mode",
     "web-mode"
    ],
-   "commit": "32f0dbf5a9b39535bc079c9c70456479d0dd3fb2",
-   "sha256": "1284fdraamjsbaslyk8k75a3m1rfa1i8pwrh56k3vsmfmd8a0cib"
+   "commit": "4ca9d275948898602640a46573cb95d7eef913e5",
+   "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci"
   },
   "stable": {
    "version": [
@@ -86140,15 +87032,15 @@
   "repo": "twlz0ne/separedit.el",
   "unstable": {
    "version": [
-    20200325,
-    1711
+    20200407,
+    728
    ],
    "deps": [
     "dash",
     "edit-indirect"
    ],
-   "commit": "2ee55780eeced9b0bb086a9d731526ee1a9c3658",
-   "sha256": "08xxl3z7abqk0m4lwflp0cnz7pcy66f6hps8dmxfas2hgl0qyz7i"
+   "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3",
+   "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b"
   }
  },
  {
@@ -86806,6 +87698,35 @@
    "sha256": "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2"
   }
  },
+ {
+  "ename": "shfmt",
+  "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685",
+  "sha256": "1k4rr658473vd6xad2z40dl7f26sb1zv9nc1938cg61pqi10bjan",
+  "fetcher": "github",
+  "repo": "purcell/emacs-shfmt",
+  "unstable": {
+   "version": [
+    20200421,
+    103
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34",
+   "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "cd94266badc71c1e981e904e10f28c6a80237a2f",
+   "sha256": "09w50l938phcpxvbg4ahyxl43k995ywavwac364nmcnvmip021qy"
+  }
+ },
  {
   "ename": "shift-number",
   "commit": "b06be6b25078ddfabc1ef1145c817552f679c41c",
@@ -86856,11 +87777,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20190930,
-    730
+    20200406,
+    2209
    ],
-   "commit": "cbb15424431cd5f579b12307b8fa03122d525006",
-   "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h"
+   "commit": "e522a44b151d69d4a176e8809225598ab540fc4d",
+   "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz"
   }
  },
  {
@@ -87156,20 +88077,20 @@
   "repo": "riscy/shx-for-emacs",
   "unstable": {
    "version": [
-    20200308,
-    2356
+    20200410,
+    639
    ],
-   "commit": "0fec00c1eef75feeae0f71591762ba6a80bc2725",
-   "sha256": "0zl5lcy80m1pzwl4239lhcf0zb6px5jwbgjib136zh94l5k35wdb"
+   "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397",
+   "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73"
   },
   "stable": {
    "version": [
     1,
-    3,
-    1
+    4,
+    0
    ],
-   "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5",
-   "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr"
+   "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397",
+   "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73"
   }
  },
  {
@@ -87195,11 +88116,11 @@
   "repo": "webframp/sicp-info",
   "unstable": {
    "version": [
-    20180823,
-    1222
+    20200421,
+    242
    ],
-   "commit": "26bc593aeae01da34ad92363b5bbd6aedab66da2",
-   "sha256": "0qvgdrzdp92mskqfh0x5garq0zcr8r7n834jlx5ky8q00xvb1a06"
+   "commit": "3efcd37eb7888845c5f3292beeb18219f9993e92",
+   "sha256": "1qlgg7r9v62mcw07svdkzrf5ccm6n9vg64h4p704rfzkxys1cwfs"
   }
  },
  {
@@ -87234,11 +88155,11 @@
   "repo": "nlamirault/sift.el",
   "unstable": {
    "version": [
-    20190521,
-    823
+    20200421,
+    1423
    ],
-   "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a",
-   "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9"
+   "commit": "cdddba2d183146c340915003f1b5d09d13712c22",
+   "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if"
   },
   "stable": {
    "version": [
@@ -87383,6 +88304,29 @@
    "sha256": "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb"
   }
  },
+ {
+  "ename": "simple-modeline",
+  "commit": "054a7c164fae0c76ad2b3c6891d37a03f3e08823",
+  "sha256": "0c2wvwxwaa62r4vrw9g1lcgr8cv57mlfpsszynkn00cb7fhlhdmk",
+  "fetcher": "github",
+  "repo": "gexplorer/simple-modeline",
+  "unstable": {
+   "version": [
+    20200419,
+    900
+   ],
+   "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51",
+   "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51",
+   "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m"
+  }
+ },
  {
   "ename": "simple-mpc",
   "commit": "62d762308c1ec0c1d8f7b4755b7deb285cbac018",
@@ -87721,8 +88665,8 @@
   "repo": "yuya373/emacs-slack",
   "unstable": {
    "version": [
-    20200320,
-    457
+    20200402,
+    1656
    ],
    "deps": [
     "alert",
@@ -87732,8 +88676,8 @@
     "request",
     "websocket"
    ],
-   "commit": "03345aabe728da3f5238954eaa0ddbce604807d5",
-   "sha256": "0kyd959a9113vd7d4prgfga7sj6y6n8zrw6nkqxsfkm5sfpv31iv"
+   "commit": "d53a57a18fb7034182c3d02503f937761e6a2a64",
+   "sha256": "1xcfgyw9cky6msai2ap9fgcdasvmvn3k73rjmvnwcj4axh6vjvyx"
   }
  },
  {
@@ -87794,15 +88738,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20200326,
-    1453
+    20200414,
+    1444
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "faa0c6a0b7c77f6a2db8d3244f24563106857944",
-   "sha256": "1dgmakfazz3p6s64qmy03schapxi1010sa8g7p1paqkpawr9d5qp"
+   "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9",
+   "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461"
   },
   "stable": {
    "version": [
@@ -87825,27 +88769,27 @@
   "repo": "anwyn/slime-company",
   "unstable": {
    "version": [
-    20200304,
-    1107
+    20200424,
+    1045
    ],
    "deps": [
     "company",
     "slime"
    ],
-   "commit": "e9153e42ec8f2089ea129ce24488dd3b5e0b9e47",
-   "sha256": "1dz8q9fjiip2xnw64cim0p5adbpc4lbljdiqjc5dq7bhwpff07jl"
+   "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0",
+   "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm"
   },
   "stable": {
    "version": [
     1,
-    1
+    3
    ],
    "deps": [
     "company",
     "slime"
    ],
-   "commit": "6c244690c80387a32b0cb984843e00c8b75ad6bb",
-   "sha256": "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"
+   "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0",
+   "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm"
   }
  },
  {
@@ -88280,6 +89224,24 @@
    "sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi"
   }
  },
+ {
+  "ename": "smart-input-source",
+  "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6",
+  "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd",
+  "fetcher": "github",
+  "repo": "laishulu/emacs-smart-input-source",
+  "unstable": {
+   "version": [
+    20200423,
+    1529
+   ],
+   "deps": [
+    "names"
+   ],
+   "commit": "048a6c729f5336fe800e97f995a387e11d386980",
+   "sha256": "19s8q8fb2kmmfllg50622hzp3jb19h9z9ik45k4v7aapdc7iw5yg"
+  }
+ },
  {
   "ename": "smart-jump",
   "commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f",
@@ -88467,17 +89429,17 @@
  },
  {
   "ename": "smart-tab",
-  "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a",
-  "sha256": "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5",
-  "fetcher": "github",
-  "repo": "genehack/smart-tab",
+  "commit": "ef37935f5f8ed12323374179a0673b5a4af57cdb",
+  "sha256": "1dm67sc1vylpf73m723hfjfqmm2yxrdckrgp6a3nq2586hkkid4l",
+  "fetcher": "git",
+  "url": "https://git.genehack.net/genehack/smart-tab.git",
   "unstable": {
    "version": [
-    20190916,
-    137
+    20200416,
+    2228
    ],
-   "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a",
-   "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa"
+   "commit": "67bf4f93f8afca61a3dc4f6c7a34b0b8ca9ede21",
+   "sha256": "1ws49lbafch1rb6g0j9k5h30c9shk3vvqhbjkf4qvhaqii94lgml"
   }
  },
  {
@@ -88647,11 +89609,11 @@
   "repo": "aaptel/smblog-mode",
   "unstable": {
    "version": [
-    20190920,
-    1823
+    20200424,
+    938
    ],
-   "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a",
-   "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz"
+   "commit": "fc949cff7051b31f0dbc7169774144533a27b92f",
+   "sha256": "07ks6d3gs264wv15lxa88pfi6i851h1wd9cacxs81wc7ijqc5sia"
   }
  },
  {
@@ -88872,15 +89834,15 @@
   "repo": "kyleam/snakemake-mode",
   "unstable": {
    "version": [
-    20200222,
-    1710
+    20200417,
+    2230
    ],
    "deps": [
     "cl-lib",
     "magit-popup"
    ],
-   "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76",
-   "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2"
+   "commit": "03562dcd82964d53eff7314b844c2897d1d9af55",
+   "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz"
   },
   "stable": {
    "version": [
@@ -89120,14 +90082,14 @@
   "repo": "hlissner/emacs-solaire-mode",
   "unstable": {
    "version": [
-    20200120,
-    455
+    20200423,
+    742
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4ac324ccb0b751be80ce64449553462eafab4f32",
-   "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps"
+   "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b",
+   "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67"
   },
   "stable": {
    "version": [
@@ -89150,14 +90112,14 @@
   "repo": "bbatsov/solarized-emacs",
   "unstable": {
    "version": [
-    20200329,
-    1048
+    20200411,
+    1026
    ],
    "deps": [
     "dash"
    ],
-   "commit": "8cd79c8afd7563a69764c4174098d2b8e7fd0c96",
-   "sha256": "1x1cbyd7kr1izcbbffq1amxgg1gqfwaa5y4m17ffmdrhal37mdzb"
+   "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e",
+   "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42"
   },
   "stable": {
    "version": [
@@ -89188,8 +90150,8 @@
     "flycheck",
     "solidity-mode"
    ],
-   "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341",
-   "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg"
+   "commit": "022b3159832384a7dcdc2168809e698600826047",
+   "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69"
   },
   "stable": {
    "version": [
@@ -89213,11 +90175,11 @@
   "repo": "ethereum/emacs-solidity",
   "unstable": {
    "version": [
-    20200124,
-    827
+    20200418,
+    921
    ],
-   "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341",
-   "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg"
+   "commit": "022b3159832384a7dcdc2168809e698600826047",
+   "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69"
   },
   "stable": {
    "version": [
@@ -89245,8 +90207,8 @@
     "dash",
     "request"
    ],
-   "commit": "b143b5c6161e3760f42a7a5405f5f7e97079e09a",
-   "sha256": "01ak3sr2hp2mmn81j1qdgyvrm9np979fpg2ngbnijnb8ai3gn30f"
+   "commit": "9fdb75e150e78170b3ca7863a8a0638c6ecc0fc0",
+   "sha256": "0qvr4cga8k4bn0jbfp626cjkxgvqkac902v7hxakj7l47arxcd5z"
   }
  },
  {
@@ -89285,6 +90247,48 @@
    "sha256": "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw"
   }
  },
+ {
+  "ename": "sorcery-theme",
+  "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f",
+  "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2",
+  "fetcher": "github",
+  "repo": "vxid/emacs-theme-sorcery",
+  "unstable": {
+   "version": [
+    20200413,
+    2242
+   ],
+   "deps": [
+    "autothemer"
+   ],
+   "commit": "fb041d0d8d4ae2840ddcfb1bd56fefe687da8c52",
+   "sha256": "1j54m18xsn44m5xshmk2pfxn795svjn0zv77qwfxn1d2p5j0r6ni"
+  }
+ },
+ {
+  "ename": "soria-theme",
+  "commit": "9196110908f0d2130f7963499a94853b5192ac8c",
+  "sha256": "1fmys72s4n334m60ywpmbxjbvjwp7qn14pasmnlkv3l1bw6jygsm",
+  "fetcher": "github",
+  "repo": "mssola/soria",
+  "unstable": {
+   "version": [
+    20200424,
+    1530
+   ],
+   "commit": "fcc14cc99f0d26abf91af682b5fdedf5a8a37003",
+   "sha256": "0mrh147q9zzs9nkc714iyly5aydx3svma0ix8sgrk7rqacfd56hv"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    2
+   ],
+   "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32",
+   "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7"
+  }
+ },
  {
   "ename": "sort-words",
   "commit": "0a4bd566392d7cebe8a891d787439512e8d34cf9",
@@ -89551,6 +90555,21 @@
    "sha256": "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8"
   }
  },
+ {
+  "ename": "space-theming",
+  "commit": "5529fcf16b877b01ee0aff710ebfb0ad5da8dba1",
+  "sha256": "0khjdmqv1q2pdas0xjfqs68xjg2nqms6g21bplg54ynsqcp7asv9",
+  "fetcher": "github",
+  "repo": "p3r7/space-theming",
+  "unstable": {
+   "version": [
+    20200415,
+    810
+   ],
+   "commit": "0a41a892180451d51095516e8ee2c9042be009c1",
+   "sha256": "02d07fs72fqg12lm7wxlmds1xyqf92ay0h9ghpkavwn6mphslpvc"
+  }
+ },
  {
   "ename": "spacebar",
   "commit": "e4d1808eabdb9081441e01526efe81782ae0122f",
@@ -89863,6 +90882,21 @@
    "sha256": "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w"
   }
  },
+ {
+  "ename": "spell-fu",
+  "commit": "abaa6522f18ca1f47788ebb3281fbfcdade2b7c7",
+  "sha256": "0c2yi5lz2ww7mm9ih3m374w65n73z4knhnbrvdyzd7ja3xb3l17n",
+  "fetcher": "gitlab",
+  "repo": "ideasman42/emacs-spell-fu",
+  "unstable": {
+   "version": [
+    20200426,
+    600
+   ],
+   "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70",
+   "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc"
+  }
+ },
  {
   "ename": "sphinx-doc",
   "commit": "a3b80d346ad4fb415970beddb5f02ae795fbf1b4",
@@ -90371,11 +91405,11 @@
   "repo": "srcery-colors/srcery-emacs",
   "unstable": {
    "version": [
-    20200313,
-    1310
+    20200422,
+    1941
    ],
-   "commit": "465a458e8c1629baa980988d43e441c4fdb92151",
-   "sha256": "04bncx9y1jqc6pzzl5c7dgdvzq012ymsp6ilkifg19xnz3bdmhm6"
+   "commit": "9630e465cc5166f723b7c5378e326561cf2a1738",
+   "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn"
   },
   "stable": {
    "version": [
@@ -90418,14 +91452,14 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20200326,
-    752
+    20200422,
+    1730
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fa0c9e1fae26780dcce266df8ad8bf5efc971c30",
-   "sha256": "1azdc14y2jsmqcphk16qbxaj2fc7ajddwjjhc73xbhbn67knk1af"
+   "commit": "d55b4047fcfd3528fa9487d206773f45c7c2d038",
+   "sha256": "0c83wachsrrz0mnsb2lci6mr62ma40w05lxz7y8vrfyqppkcfa6a"
   },
   "stable": {
    "version": [
@@ -90509,24 +91543,25 @@
   "unstable": {
    "version": [
     20200329,
-    1535
+    1558
    ],
    "deps": [
     "dash"
    ],
-   "commit": "67975f7773bfa0140d9dc09bd67df7f5489aa6ea",
-   "sha256": "0vwa1szfy45xpqqv44kyasjv2x0y2n3v680wlb1v3w2mxwwg8vda"
+   "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db",
+   "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d"
   },
   "stable": {
    "version": [
     0,
-    4
+    4,
+    1
    ],
    "deps": [
     "dash"
    ],
-   "commit": "d9dbedd773ad3a831e02e162c47936d6814a850a",
-   "sha256": "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz"
+   "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db",
+   "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d"
   }
  },
  {
@@ -90816,8 +91851,8 @@
     20171130,
     1559
    ],
-   "commit": "af37d392baa6f2e7445e9f714da743fd10153adf",
-   "sha256": "0bc34ri3d90fcjsin5nvli3ncqrh8x9iw8rhzdrwsbr9ildmr1ib"
+   "commit": "209d2233843778ebee12d103c41b226fa27ff266",
+   "sha256": "19rm3zznj0j8q5gsqpk6hy5l3gii4pmp5s2npl1zsiy6bb7p59c4"
   },
   "stable": {
    "version": [
@@ -91050,20 +92085,21 @@
   "repo": "stepnem/stripes-el",
   "unstable": {
    "version": [
-    20200322,
-    2350
+    20200330,
+    2022
    ],
-   "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5",
-   "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x"
+   "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d",
+   "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25"
   },
   "stable": {
    "version": [
     0,
     3,
+    1,
     1
    ],
-   "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5",
-   "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x"
+   "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d",
+   "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25"
   }
  },
  {
@@ -91543,8 +92579,8 @@
     20200327,
     406
    ],
-   "commit": "17a53e5f8dd45c6bca44659a80a79ca30d161635",
-   "sha256": "1hrrcg42b1fnf8y0mz3fli6mp7aha7w0rv7nhrsrvhrilnq97wzl"
+   "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313",
+   "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn"
   }
  },
  {
@@ -91733,26 +92769,26 @@
   "repo": "swift-emacs/swift-mode",
   "unstable": {
    "version": [
-    20191130,
-    544
+    20200418,
+    617
    ],
    "deps": [
     "seq"
    ],
-   "commit": "1268425311ab20f1618df4e52cb1b79e28b553df",
-   "sha256": "1ghm5spzxxdvwn1lk3xci62hiv12x4hzjk5xh9q522a833nl04i4"
+   "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff",
+   "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592"
   },
   "stable": {
    "version": [
     8,
     0,
-    1
+    2
    ],
    "deps": [
     "seq"
    ],
-   "commit": "86f8f62294aa5a6d44fa872278d75a4a41f403d4",
-   "sha256": "0sszk2nwp6h9qk7vgh5n05pzh264br3x3r1hyj97gwf8jdqzkr74"
+   "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff",
+   "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592"
   }
  },
  {
@@ -91823,8 +92859,8 @@
    "deps": [
     "ivy"
    ],
-   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
-   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
+   "commit": "47ec37b395cc1b304bbf91e804f138634544a9df",
+   "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74"
   },
   "stable": {
    "version": [
@@ -92081,7 +93117,7 @@
    "deps": [
     "f"
    ],
-   "commit": "9bd33e73ecb2a0e3e3757c55c05f46b6937227e0",
+   "commit": "cd344b6c2cb6a8fcf061af2c85441644a4e7a006",
    "sha256": "193lq58mhkq0rrinkaxiyhkk60qf7q0gx03na2968zcrahrd8w75"
   },
   "stable": {
@@ -92101,8 +93137,8 @@
   "repo": "countvajhula/symex.el",
   "unstable": {
    "version": [
-    20200225,
-    1928
+    20200425,
+    1911
    ],
    "deps": [
     "cider",
@@ -92119,13 +93155,13 @@
     "slime",
     "smartparens"
    ],
-   "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c",
-   "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd"
+   "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f",
+   "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
    "deps": [
@@ -92143,8 +93179,8 @@
     "slime",
     "smartparens"
    ],
-   "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c",
-   "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd"
+   "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc",
+   "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29"
   }
  },
  {
@@ -92203,35 +93239,6 @@
    "sha256": "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q"
   }
  },
- {
-  "ename": "syndicate",
-  "commit": "626bda1691d9c7a97fcf549f7a3f0d41d832cfde",
-  "sha256": "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95",
-  "fetcher": "github",
-  "repo": "KNX32542/syndicate",
-  "unstable": {
-   "version": [
-    20160603,
-    1523
-   ],
-   "deps": [
-    "evil"
-   ],
-   "commit": "90cee202a06f5bab48268ebf9f62c43334b69f50",
-   "sha256": "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75"
-  },
-  "stable": {
-   "version": [
-    1,
-    0
-   ],
-   "deps": [
-    "evil"
-   ],
-   "commit": "b839aaba0c8583a3254476b53976e3caac4f89a9",
-   "sha256": "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl"
-  }
- },
  {
   "ename": "synonymous",
   "commit": "ecf2c44c63e9f41f1733849bdef0d0c301485580",
@@ -92307,14 +93314,14 @@
   "repo": "emacs-berlin/syntactic-close",
   "unstable": {
    "version": [
-    20191119,
-    1007
+    20200408,
+    1148
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5760319d8fdb3672dd0e95880c30e9c4d92ab239",
-   "sha256": "0rkqflaz0npclnjsy2r6apkjrzlw5zrpa6j87sbjpnnh0jgcsmsq"
+   "commit": "c21ffdf6a2f8c2a83d3efc729852cd2b09fe03a6",
+   "sha256": "1m6y7njkn5vibgnr3pnh6nci75j2ksr93ajp01jwpxxxc0wmipa8"
   }
  },
  {
@@ -92343,9 +93350,9 @@
  },
  {
   "ename": "syntax-subword",
-  "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
-  "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm",
-  "fetcher": "bitbucket",
+  "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203",
+  "sha256": "1nfbpckxfy95m7bnj08bnpf8zyxc0dyap5hq1plxl3lxb3c4fvr4",
+  "fetcher": "github",
   "repo": "jpkotta/syntax-subword",
   "unstable": {
    "version": [
@@ -92354,6 +93361,14 @@
    ],
    "commit": "ad0db0fcb464652a1d3408f525dee9293ce2b70c",
    "sha256": "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "commit": "01b27feac37eb60cf73ff80374004d9e847e637d",
+   "sha256": "12jk28jbkq1pcpgsbknk8xzzghjh2dhwb54kag2hynldn4qgfkrz"
   }
  },
  {
@@ -92715,11 +93730,11 @@
   "repo": "tmalsburg/tango-plus-theme",
   "unstable": {
    "version": [
-    20170214,
-    1708
+    20200423,
+    804
    ],
-   "commit": "8ba8901397e3e9f1d53110487bfa0effc65015e7",
-   "sha256": "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq"
+   "commit": "1e9484bb392bb0aad2be159505c502320f8d0a5c",
+   "sha256": "1819s9c0nm4pkgcpxqnr20075krq30qn6hpg4zl54cnrxbfbiq9f"
   }
  },
  {
@@ -92769,11 +93784,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20200321,
-    2124
+    20200416,
+    2114
    ],
-   "commit": "9ca1afb561433ff6d2e8527e3d8d9152de5912f7",
-   "sha256": "0a3hlwzq9ckf7jcxq6drrgl1g8hi5ad0f6lgm3nawbsqmrb6r28y"
+   "commit": "eedf6a465b8ccc865c108a6f2715769300f5a499",
+   "sha256": "1p7wlv5i46f3d9kn3yiw6rga8mkln9m5xknzimzym2pyaclva41m"
   },
   "stable": {
    "version": [
@@ -92817,20 +93832,20 @@
    "deps": [
     "cider"
    ],
-   "commit": "6c2631e3fd68e70110aa0cc5b83b7511eab363e2",
-   "sha256": "1sgnzgy0b61hxkj2fzkgnlrrpgsc5v1prns9hv1za4mv60xs8f15"
+   "commit": "8dfb4f92db2d8598ba809636a82d210c378b4845",
+   "sha256": "1sdi1rr9xq7spps5hagzs8irfljxmbd5y3hh4jiyvn54cwicg3g8"
   },
   "stable": {
    "version": [
     2,
     0,
-    2
+    3
    ],
    "deps": [
     "cider"
    ],
-   "commit": "d4ce3b51e97fd7e9f5a650796dee9ba4079f9df0",
-   "sha256": "1vday9jnmzspnfy3ppladj0z5by4yysfwp1dnqv7n3ayyza5r8w0"
+   "commit": "ce85fd9bcd008031a605ea8913577f452b49e352",
+   "sha256": "06dm6gdh10jbmyjr0y96s06qi3k12phq522pviis68qm7v2ryr47"
   }
  },
  {
@@ -92969,14 +93984,14 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20200329,
-    1557
+    20200423,
+    1038
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "0da852c0b72ad3473432f9e846ce1371d7c8cd61",
-   "sha256": "0n4jvl6c68wkddvsjfyw82rxy5h7ikc6qrjd35h2v864080gmbjp"
+   "commit": "50ef9bf06cc162b39cf3553b89b02faf5bc87835",
+   "sha256": "1h5100vmgwy52zp7ryarj4xw3gb9paj1qpm39mc9h62s6n1zysw7"
   },
   "stable": {
    "version": [
@@ -93022,16 +94037,16 @@
   "repo": "dbordak/telephone-line",
   "unstable": {
    "version": [
-    20191120,
-    27
+    20200412,
+    1614
    ],
    "deps": [
     "cl-generic",
     "cl-lib",
     "seq"
    ],
-   "commit": "bfe7b189d708d9cbc69ef2eaf5542108edc4257d",
-   "sha256": "0dkscbjms2557fzd7gawgsic6gfzypyn973skiyhy0y8zimmr406"
+   "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9",
+   "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q"
   },
   "stable": {
    "version": [
@@ -93665,14 +94680,14 @@
   "repo": "TobiasZawada/texfrag",
   "unstable": {
    "version": [
-    20200104,
-    41
+    20200424,
+    205
    ],
    "deps": [
     "auctex"
    ],
-   "commit": "2a5561b4534a3b78718e2c5fe30550c89341874e",
-   "sha256": "1i583i2h9f5bsg663yl9xriv1lc5gb5w4ql6b5r9dwv33lg7l6mx"
+   "commit": "48118c4e38836117efb4eede927ab85d9a0d2013",
+   "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz"
   },
   "stable": {
    "version": [
@@ -93836,26 +94851,26 @@
   "repo": "myTerminal/theme-looper",
   "unstable": {
    "version": [
-    20200326,
-    1651
+    20200410,
+    1757
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7077ca11508c6a00d98d592dee967e92185480ff",
-   "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr"
+   "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b",
+   "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g"
   },
   "stable": {
    "version": [
     2,
-    5,
+    6,
     0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7077ca11508c6a00d98d592dee967e92185480ff",
-   "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr"
+   "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b",
+   "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g"
   }
  },
  {
@@ -93979,18 +94994,18 @@
     20200212,
     1903
    ],
-   "commit": "9889eb8b3a3a773e8f06df327a76e408f9214cd4",
-   "sha256": "1vhfkfsrnhdzsk1353xl383nsb7x6a01v7r79lxdcrkj5yxppz0d"
+   "commit": "598704d0259d992af190a4388140b8aec07f40ef",
+   "sha256": "168sl4jbcyqms1cvg8x91kclim27v9zbfrw3cn2fmwmd2g29c31j"
   },
   "stable": {
    "version": [
     2020,
-    3,
-    23,
+    4,
+    20,
     0
    ],
-   "commit": "186d782f02d80c7d8e93be352c2011ed4097c228",
-   "sha256": "1wj4ng9ymi0hszl3kmdg7rqrff4zk0zipbbn1jcxcii2swrkw12g"
+   "commit": "23496d2d53ecc70a2353c1a84699ac579e21e0a1",
+   "sha256": "0yvpnyzklsjppfhd9spgrf9gh3f36zvs3rz7fyc7bl3n68s3z7wq"
   }
  },
  {
@@ -94046,20 +95061,20 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "5d4bce7a9af5e39e6df0d2577962579e31964b65",
-   "sha256": "0hnqcfvc8gca98wyzcrjldn9kcxdc4m8aa9cdr1884kp4kf5dmvj"
+   "commit": "3735a13c9bbe4fbb788d9dbc363701081253bafa",
+   "sha256": "0nm02pzhvg6lb3j4m8g4jfgkirv8pb6881bk2r74hijxvjamma0b"
   },
   "stable": {
    "version": [
     1,
     4,
-    8
+    9
    ],
    "deps": [
     "haskell-mode"
    ],
-   "commit": "b28951be9abee7dc234c318849169bb578db3c49",
-   "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j"
+   "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e",
+   "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3"
   }
  },
  {
@@ -94376,14 +95391,14 @@
   "repo": "kuanyui/tldr.el",
   "unstable": {
    "version": [
-    20200302,
-    1744
+    20200330,
+    1025
    ],
    "deps": [
     "request"
    ],
-   "commit": "7203d1be3dcbf12131846ffe06601933fa874d74",
-   "sha256": "1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk"
+   "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb",
+   "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2"
   }
  },
  {
@@ -94409,15 +95424,15 @@
   "repo": "laishulu/emacs-tmux-pane",
   "unstable": {
    "version": [
-    20200330,
-    456
+    20200419,
+    1331
    ],
    "deps": [
     "names",
     "s"
    ],
-   "commit": "942270359587d54f4fd6e37e8d35da38373447c5",
-   "sha256": "1x5b0680vxvjqcj5r3674n7gnp4994js13707pikl362bhv398kw"
+   "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0",
+   "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6"
   }
  },
  {
@@ -94646,14 +95661,14 @@
   "repo": "xuchunyang/tongbu.el",
   "unstable": {
    "version": [
-    20200321,
-    1817
+    20200414,
+    507
    ],
    "deps": [
     "web-server"
    ],
-   "commit": "cf3b3ee1468c3dcd1721a5e6802821c8f52f34ce",
-   "sha256": "0s4h711rwkpf1dbqbak4akbm95y8crd0niisx19jmk9lms5kj5n5"
+   "commit": "6f6e5c5446f0c5735357ab520b249ab97295653e",
+   "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9"
   }
  },
  {
@@ -94963,8 +95978,8 @@
     20200226,
     1612
    ],
-   "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca",
-   "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr"
+   "commit": "afa0c2f98453b9ffd9d8160831debc7e36cdb87b",
+   "sha256": "0jkyrwxmfarbjqidvgxh0x4al9xh1wyd6r1rwvkbwxscz5111h3z"
   },
   "stable": {
    "version": [
@@ -94976,6 +95991,24 @@
    "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr"
   }
  },
+ {
+  "ename": "transient-dwim",
+  "commit": "0ad7091aa6129c09e457c71274a42344acd6b823",
+  "sha256": "1q32if4i913vjbcpcdrfznjiih4c30ipnadn84zkr72wn5ndzlpq",
+  "fetcher": "github",
+  "repo": "conao3/transient-dwim.el",
+  "unstable": {
+   "version": [
+    20200411,
+    2015
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "00d111e41e433736422e388e593b5c0df7d21bf9",
+   "sha256": "1gx3v5axvwah1yb0wba2l60dy72lcw7jw86cfjlg3m9a8xd090v7"
+  }
+ },
  {
   "ename": "transmission",
   "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f",
@@ -95164,8 +96197,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200328,
-    1143
+    20200426,
+    1031
    ],
    "deps": [
     "ace-window",
@@ -95177,13 +96210,13 @@
     "pfuture",
     "s"
    ],
-   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
-   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
+   "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48",
+   "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9"
   },
   "stable": {
    "version": [
     2,
-    6
+    8
    ],
    "deps": [
     "ace-window",
@@ -95195,8 +96228,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45",
-   "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1"
+   "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04",
+   "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
   }
  },
  {
@@ -95214,20 +96247,20 @@
     "evil",
     "treemacs"
    ],
-   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
-   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
+   "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48",
+   "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9"
   },
   "stable": {
    "version": [
     2,
-    6
+    8
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45",
-   "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1"
+   "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04",
+   "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
   }
  },
  {
@@ -95238,27 +96271,27 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200205,
-    548
+    20200421,
+    1426
    ],
    "deps": [
     "cl-lib",
     "treemacs"
    ],
-   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
-   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
+   "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48",
+   "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9"
   },
   "stable": {
    "version": [
     2,
-    6
+    8
    ],
    "deps": [
     "cl-lib",
     "treemacs"
    ],
-   "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45",
-   "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1"
+   "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04",
+   "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
   }
  },
  {
@@ -95269,29 +96302,29 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200302,
-    553
+    20200421,
+    1426
    ],
    "deps": [
     "magit",
     "pfuture",
     "treemacs"
    ],
-   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
-   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
+   "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48",
+   "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9"
   },
   "stable": {
    "version": [
     2,
-    6
+    8
    ],
    "deps": [
     "magit",
     "pfuture",
     "treemacs"
    ],
-   "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45",
-   "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1"
+   "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04",
+   "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
   }
  },
  {
@@ -95302,16 +96335,29 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200309,
-    2057
+    20200421,
+    1426
    ],
    "deps": [
     "dash",
     "persp-mode",
     "treemacs"
    ],
-   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
-   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
+   "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48",
+   "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9"
+  },
+  "stable": {
+   "version": [
+    2,
+    8
+   ],
+   "deps": [
+    "dash",
+    "persp-mode",
+    "treemacs"
+   ],
+   "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04",
+   "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
   }
  },
  {
@@ -95329,20 +96375,20 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
-   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
+   "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48",
+   "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9"
   },
   "stable": {
    "version": [
     2,
-    6
+    8
    ],
    "deps": [
     "projectile",
     "treemacs"
    ],
-   "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45",
-   "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1"
+   "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04",
+   "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2"
   }
  },
  {
@@ -96197,11 +97243,11 @@
   "repo": "ideasman42/emacs-undo-fu",
   "unstable": {
    "version": [
-    20200305,
-    28
+    20200413,
+    159
    ],
-   "commit": "aae7ec9784e8fab9b33adf25eac25e745653f19f",
-   "sha256": "02xlfjl9z822qixk9gxwv18n8ykdq793fd0qm9g0qsz0sn57mr8n"
+   "commit": "0ce9ac36144e80316fff50bfe1bc5dd7e5e7ded6",
+   "sha256": "1mqm2z8bp5dx9f9xq6bpgvk8xmzmh71bgxbff6kcliv0jy3jlakb"
   }
  },
  {
@@ -96212,11 +97258,11 @@
   "repo": "ideasman42/emacs-undo-fu-session",
   "unstable": {
    "version": [
-    20200221,
-    1152
+    20200408,
+    11
    ],
-   "commit": "35d4cf3771d905d647a35df050abfd9015833aad",
-   "sha256": "0846whh01bzxhl98wlywd11ki6wk2iyzzxvc5gnlj85cdasjrz10"
+   "commit": "b808ef0cdcdd2eef221c67eda567eed7fcb3d4af",
+   "sha256": "107dgdw1jh8mipgwal1g86nfckrpz2l53a1sqcg90nb0n8fkvy2q"
   }
  },
  {
@@ -96646,6 +97692,29 @@
    "sha256": "0fgipv93x47cvyww07cqx8xa95jz36y6fy5rmaq40jnnmdkgq862"
   }
  },
+ {
+  "ename": "unobtrusive-magit-theme",
+  "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035",
+  "sha256": "05djixlq49dn1m64xs8b6w4kg650wrr8rs2pb72p1kfvp2a53g7w",
+  "fetcher": "github",
+  "repo": "tee3/unobtrusive-magit-theme",
+  "unstable": {
+   "version": [
+    20200411,
+    1349
+   ],
+   "commit": "aede357009655d19d4468320b2b61b0f26a47593",
+   "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1"
+  },
+  "stable": {
+   "version": [
+    0,
+    4
+   ],
+   "commit": "aede357009655d19d4468320b2b61b0f26a47593",
+   "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1"
+  }
+ },
  {
   "ename": "untitled-new-buffer",
   "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b",
@@ -96963,30 +98032,6 @@
    "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q"
   }
  },
- {
-  "ename": "usql",
-  "commit": "c8f6b968312a09d062fcc8f942d29c93df2a5a3c",
-  "sha256": "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84",
-  "fetcher": "github",
-  "repo": "nickbarnwell/usql.el",
-  "unstable": {
-   "version": [
-    20180305,
-    2323
-   ],
-   "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d",
-   "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"
-  },
-  "stable": {
-   "version": [
-    0,
-    0,
-    3
-   ],
-   "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d",
-   "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks"
-  }
- },
  {
   "ename": "utop",
   "commit": "30489fe52b4031184e54f994770aa3291257bc9d",
@@ -96998,17 +98043,17 @@
     20190715,
     1836
    ],
-   "commit": "30c77ce4d7996822721e97ac8042d5bc0d415584",
-   "sha256": "03947csh8nzqqa58z2hq5i87kqf7z65f7b19nyvy0can2flznl7q"
+   "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9",
+   "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9"
   },
   "stable": {
    "version": [
     2,
-    4,
-    3
+    5,
+    0
    ],
-   "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a",
-   "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp"
+   "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9",
+   "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9"
   }
  },
  {
@@ -97619,11 +98664,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20200326,
-    2322
+    20200404,
+    951
    ],
-   "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c",
-   "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2"
+   "commit": "82cf1bde07b0c96b25d1dd16268663d8931fbb60",
+   "sha256": "18pjsjxrf844y3aw0fvj451cz08kw2j3idmhh3l15aj3jdwzjfbq"
   },
   "stable": {
    "version": [
@@ -97722,14 +98767,14 @@
   "repo": "baron42bba/vertica-snippets",
   "unstable": {
    "version": [
-    20191213,
-    1109
+    20200423,
+    1200
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "2d1c45c63392ed869625bd062c19422600c9f555",
-   "sha256": "1gn57jfmma5h90m3b7l698rncmbygd2dbp48vvx1d1z9ks2rm8gg"
+   "commit": "6ced718d9120878878700592fab430a8542b748f",
+   "sha256": "1x04wrf3h6f4wsh4n2cl3n4byj9pxni918ri49hqxzm8h8hivigc"
   }
  },
  {
@@ -97778,22 +98823,22 @@
  },
  {
   "ename": "vhdl-tools",
-  "commit": "69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf",
-  "sha256": "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw",
-  "fetcher": "github",
-  "repo": "csantosb/vhdl-tools",
+  "commit": "b1a3336bff4d677b3bc7fbb8ef230ffc7b78e268",
+  "sha256": "0xdq9sicwpv3qzy833fqhvi4yllqmqgd4p9lbgq7dn1g8qz2gakn",
+  "fetcher": "gitlab",
+  "repo": "emacs-elisp/vhdl-tools",
   "unstable": {
    "version": [
-    20200128,
-    957
+    20200330,
+    1819
    ],
    "deps": [
     "ggtags",
     "helm-rg",
     "outshine"
    ],
-   "commit": "3dbfe8160e22053f0a9bee70ba6f8e1e3967bc46",
-   "sha256": "1pr7skldslq35ry17yyslfrl2d84msxyh0q77a3djv7ssqlpd270"
+   "commit": "11645a398a11cdc4b84838294521ecfb229d7856",
+   "sha256": "00wqvszxsfyxx7pn9w5jn5brw2lx7d577zbc7sc4jz5nlk0csxd4"
   },
   "stable": {
    "version": [
@@ -97985,8 +99030,8 @@
     "adaptive-wrap",
     "visual-fill-column"
    ],
-   "commit": "91fb699ead3f86663e56b48a10adeb5723ca7b84",
-   "sha256": "0rfrgjflgn0c9xj7f4fwdzyclp2p9fbfir19iwy77z7jnkjk78dv"
+   "commit": "291f6178a5423f01f2f69d6bc48603d4f605b61a",
+   "sha256": "15kg23xkcc060y8a5f9657gk3bvkax23myhajaa0b2i1qcd6p43i"
   }
  },
  {
@@ -98360,11 +99405,11 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20200327,
-    1447
+    20200418,
+    1610
    ],
-   "commit": "996c535b9cc6aa70c3595413582d97abfab16edd",
-   "sha256": "0f84376rc9gm54llfln1528p82svczfrz9p48d1vh9pmf5ba09vw"
+   "commit": "0b04d31e2f0daf45452da2c5e214d2b42cd46a46",
+   "sha256": "1bdbr1hpzipxk41wx4qyvr2rkk4q4j8qnc09gd51wak7n4w3xz48"
   }
  },
  {
@@ -98375,14 +99420,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20200228,
-    628
+    20200402,
+    1516
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "24d68a0ab920875d0834598688128e692fe9a5b2",
-   "sha256": "0bzxd5xzpajvg7mv7ggplcba7plchhlrl1m14dnx3nrx6q0936cr"
+   "commit": "15901e1e1eebd957ef18d38c920f944558ebd4fb",
+   "sha256": "1dcr242i9r7r4mr43qfv5ij254dnhf04gfi71y507zfpdr17zdix"
   }
  },
  {
@@ -98451,8 +99496,8 @@
   "repo": "mihaiolteanu/vuiet",
   "unstable": {
    "version": [
-    20200326,
-    1738
+    20200424,
+    1400
    ],
    "deps": [
     "bind-key",
@@ -98461,8 +99506,23 @@
     "s",
     "versuri"
    ],
-   "commit": "c917155a0c72d9fceb9f7c39efcc97320f9e9028",
-   "sha256": "14djavnczks11lvmldwf0j8nnj4jd0jmz30l6r4hv12f3zjwyk7a"
+   "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b",
+   "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "deps": [
+    "bind-key",
+    "lastfm",
+    "mpv",
+    "s",
+    "versuri"
+   ],
+   "commit": "4e15dacd6445d490fefc47070f8e5b98db5e0dc6",
+   "sha256": "18qcw9mh57jrd6qrgcma82q28d1dab2dy6v8pi08kadcy4w95y10"
   }
  },
  {
@@ -98513,8 +99573,8 @@
     20200325,
     2226
    ],
-   "commit": "cbb15424431cd5f579b12307b8fa03122d525006",
-   "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h"
+   "commit": "e522a44b151d69d4a176e8809225598ab540fc4d",
+   "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz"
   }
  },
  {
@@ -98636,15 +99696,15 @@
   "repo": "abrochard/walkman",
   "unstable": {
    "version": [
-    20200319,
-    1739
+    20200418,
+    1554
    ],
    "deps": [
     "org",
     "transient"
    ],
-   "commit": "da90c9dcd501c1bb88c6bde055911c34bf4202a7",
-   "sha256": "04gzb1v6wva24xbl8r8rr1ys2zmz03ccl0517d3pkgbd9v1wha2f"
+   "commit": "07a7710084c328dc238626f8b6e7d019380502de",
+   "sha256": "13g8wgcv3qydx6vhznx1iypmlrzl3cm02prrkqp70gjvgblk06nm"
   }
  },
  {
@@ -98655,11 +99715,11 @@
   "repo": "farlado/emacs-wallpaper",
   "unstable": {
    "version": [
-    20200321,
-    1220
+    20200408,
+    1353
    ],
-   "commit": "762354e958dbe298de06d119493d1aee8ffd0112",
-   "sha256": "1vcpfamawaja9q2n5qqkfn1bn2psi3ymcniw9g66k3whkqsh0kji"
+   "commit": "9fb5be9c2f7279f7ef2860eefd416359b9026ba3",
+   "sha256": "18vm8g4iwf2a9l40bg7cvpdziv10mv24x61z86xwjmnqbr7sxd8q"
   }
  },
  {
@@ -98988,11 +100048,11 @@
   "repo": "fxbois/web-mode",
   "unstable": {
    "version": [
-    20200301,
-    1948
+    20200424,
+    1153
    ],
-   "commit": "b0bb4ab82ba64b6fa789212f03ad808bdaf77d68",
-   "sha256": "0v79xm0w8fr342jp27jlkph3av3kbzwdyip6djwykid4j6bcnv2i"
+   "commit": "6774c596a9b3988989d3bc96b6194e6f0df1d1b6",
+   "sha256": "1kv06qjcjxy5jw68za5bkmj4kwzc1snlxd7nahcy29rjkiczlh9c"
   },
   "stable": {
    "version": [
@@ -99081,11 +100141,11 @@
   "repo": "eschulte/emacs-web-server",
   "unstable": {
    "version": [
-    20200312,
-    1154
+    20200330,
+    1407
    ],
-   "commit": "b49ba259cc7e490e8acdecd28e66063f5ad1325e",
-   "sha256": "0b5mhgzbf1xy07g1yl0nb45hr0n18h6zxvw07zvahj2x1px9s6yc"
+   "commit": "9edf4b5e3c6cea1738acf08241919e00437ec530",
+   "sha256": "1cf2g67q064pnji0hbg0x5ziqmxwim127sd4q849cifxj7a4rqaw"
   }
  },
  {
@@ -99132,28 +100192,28 @@
   "repo": "etu/webpaste.el",
   "unstable": {
    "version": [
-    20200227,
-    912
+    20200416,
+    1007
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "ef33b0f298bf36cfb84b37af4870706fc376b0c3",
-   "sha256": "0v2yw3jbwlamkycgfmd5abxr764zyzcggyzn2ybzlkffxaxaz6dw"
+   "commit": "7a3060266459566e450c5cafc00bc90c6508eae5",
+   "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr"
   },
   "stable": {
    "version": [
     3,
-    0,
-    2
+    1,
+    0
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "1a6c0e967f0340d825df33f4fab339eb904f5f5f",
-   "sha256": "15b97rszszgcivrsdx7368nxdb8lsag6wvmcvvm977splh9yjpwi"
+   "commit": "7a3060266459566e450c5cafc00bc90c6508eae5",
+   "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr"
   }
  },
  {
@@ -99164,14 +100224,14 @@
   "repo": "ahyatt/emacs-websocket",
   "unstable": {
    "version": [
-    20200321,
-    102
+    20200419,
+    2124
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "31e122a9d7a1ae092e8f970df718fb8256e16574",
-   "sha256": "1yjdrpn2dwaarmcymf1i8lj72jyvrpp3jqwr3rv59bg8fldin0rs"
+   "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9",
+   "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg"
   },
   "stable": {
    "version": [
@@ -99609,11 +100669,11 @@
   "repo": "lassik/emacs-whois",
   "unstable": {
    "version": [
-    20200326,
-    1909
+    20200409,
+    1538
    ],
-   "commit": "2186a52db77badd809c99d5c21502878298d78f6",
-   "sha256": "1dnr7navhjzca2hapwx41xdx4i5fgjyjnw2ms5na6n572xp8kgnj"
+   "commit": "907abd9538c4a1e088853b816af883e5040fc430",
+   "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv"
   },
   "stable": {
    "version": [
@@ -99703,8 +100763,8 @@
     "makey",
     "s"
    ],
-   "commit": "0379c80a0c2df77cd18e95741caf6fc8acd90a41",
-   "sha256": "1lkmr9024x8nv9chl21qp9dnl64qlp0lrfy592pzidpr3997xkjf"
+   "commit": "79098cd4cdfa144807cb710af4589c13a7033842",
+   "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm"
   }
  },
  {
@@ -99944,6 +101004,21 @@
    "sha256": "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc"
   }
  },
+ {
+  "ename": "winds",
+  "commit": "43a07dc1e9af8f832330131764147907826e06e5",
+  "sha256": "1a5kw44pyilgaydyp87his41b2hw0xijp6sggl7bd60jwgspa0wy",
+  "fetcher": "github",
+  "repo": "Javyre/winds.el",
+  "unstable": {
+   "version": [
+    20200425,
+    1643
+   ],
+   "commit": "a998e9397836f441d51f3c8d001dd407258a0ff5",
+   "sha256": "1qgkm1fl21r56gbsvwmld8mdf970zwjsj68qdpsa9m0j4kbw9m9c"
+  }
+ },
  {
   "ename": "windsize",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -100203,14 +101278,26 @@
   "repo": "p3r7/with-shell-interpreter",
   "unstable": {
    "version": [
-    20200319,
-    1351
+    20200419,
+    850
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e806b1e5537ba2f23b507a3cc28aa7c3cacd2315",
-   "sha256": "1qklc135ydslcxjhlgbmagib3j184gm72paky6glzdjh2yf8mm50"
+   "commit": "ffd9c6a3a058fe072458f90e117590988042c662",
+   "sha256": "194k0j6mg8dh5z5ia204glicbmy2laxyny7snbvf7b6xd9ajmj3w"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "92549f9f80067ce32248ad2c05649673d2084fcf",
+   "sha256": "1dip0d5llr6sjisww283051s21ir8d5nzjdh22k3fjnz68mqq63s"
   }
  },
  {
@@ -100635,14 +101722,14 @@
   "repo": "joostkremers/writeroom-mode",
   "unstable": {
    "version": [
-    20200303,
-    2331
+    20200409,
+    1927
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "20c761b80031f2b44b9d9fb476e044e477359016",
-   "sha256": "1kx2xhvi579vhajvgl4spf9jd597fqa2bjh16yqfx2nikissvkhy"
+   "commit": "9b6e55fe49ab7760a826179df4f1c3b6c9a759df",
+   "sha256": "0kf88big78lnc2gxn00sykwi1ky4hacr7al2ihgwpznq9vbrj3p1"
   },
   "stable": {
    "version": [
@@ -100741,20 +101828,20 @@
   "repo": "redguardtoo/wucuo",
   "unstable": {
    "version": [
-    20200116,
-    1447
+    20200421,
+    441
    ],
-   "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f",
-   "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij"
+   "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc",
+   "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320"
   },
   "stable": {
    "version": [
     0,
-    0,
-    7
+    1,
+    0
    ],
-   "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f",
-   "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij"
+   "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc",
+   "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320"
   }
  },
  {
@@ -100910,11 +101997,11 @@
   "repo": "xahlee/xah-fly-keys",
   "unstable": {
    "version": [
-    20200330,
-    557
+    20200424,
+    2358
    ],
-   "commit": "d75567f7f6b85830b97b18ab1b5d8e70acaa05bf",
-   "sha256": "1lmca03y7h584agid7fr5g2w3s9psk55n0qlrcfgg10d67nq6l75"
+   "commit": "b0d87ab312a51ab8484deb8994e4effb3112d516",
+   "sha256": "1ivlcxm423syd35njrpnswdra3f30fqsfr6qdffiy6vajy0ykda7"
   }
  },
  {
@@ -100940,11 +102027,11 @@
   "repo": "xahlee/lookup-word-on-internet",
   "unstable": {
    "version": [
-    20200225,
-    31
+    20200420,
+    1528
    ],
-   "commit": "5ddd01520ca49d459f67567901fc08c84aa553bd",
-   "sha256": "07fx4vypgim39rw022v5m7gfp68095s393j8s28k2j038jqgzdp5"
+   "commit": "c97a43dc0cebbfc519d0cce5b547dcc5e22b2085",
+   "sha256": "1qkazkisgw5c9xzxqm6xzm124r1v4d4dcyazvw66nz5j2zl1i5qd"
   }
  },
  {
@@ -101393,14 +102480,11 @@
   "repo": "atomontage/xterm-color",
   "unstable": {
    "version": [
-    20200103,
-    1327
+    20200424,
+    2025
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "4b21b619841c93c4700039a93eb1881beee9248c",
-   "sha256": "1v4i74xdp26k9r1nvbdz625l62acvfb2kkp1nvld05p6xkh0q68z"
+   "commit": "c389016e029c279c81fe4c0e1d757949b5ef36c0",
+   "sha256": "16lpjbb49f465h36x22ch84133d0ihbqpfhjh46sncpj22ddj8pl"
   },
   "stable": {
    "version": [
@@ -101478,6 +102562,57 @@
    "sha256": "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i"
   }
  },
+ {
+  "ename": "xwwp",
+  "commit": "83c34ae5023410cc31f93255275d6465b6152a10",
+  "sha256": "07r62haa1ks2xvfh4zkqadpsjdhk6kbafk1fmvcim3m13ma6gch1",
+  "fetcher": "github",
+  "repo": "canatella/xwwp",
+  "unstable": {
+   "version": [
+    20200413,
+    757
+   ],
+   "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e",
+   "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6"
+  }
+ },
+ {
+  "ename": "xwwp-follow-link-helm",
+  "commit": "83c34ae5023410cc31f93255275d6465b6152a10",
+  "sha256": "0dcbhc4zy4n03fi6pz3k9hlnpk7ys6xx1v6c4rwcjzy5ly80alwq",
+  "fetcher": "github",
+  "repo": "canatella/xwwp",
+  "unstable": {
+   "version": [
+    20200331,
+    800
+   ],
+   "deps": [
+    "xwwp"
+   ],
+   "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e",
+   "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6"
+  }
+ },
+ {
+  "ename": "xwwp-follow-link-ivy",
+  "commit": "83c34ae5023410cc31f93255275d6465b6152a10",
+  "sha256": "0i5wqj4170iqznghy02dc2g5l5cs76hjhk88dcwwpbss1mabj8ig",
+  "fetcher": "github",
+  "repo": "canatella/xwwp",
+  "unstable": {
+   "version": [
+    20200331,
+    800
+   ],
+   "deps": [
+    "xwwp"
+   ],
+   "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e",
+   "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6"
+  }
+ },
  {
   "ename": "yabin",
   "commit": "cc44b28e32ff9b35f60744a175c2d1e3036db8bc",
@@ -101558,8 +102693,8 @@
     20171022,
     1412
    ],
-   "commit": "ecb66f0b77aac0123e5b3336ee1910fa07fa44f9",
-   "sha256": "1cvsp6x94b223g21avr2z255s5xwdwmdxnhwzq8qj2c3qrax6sx9"
+   "commit": "e844b662819344eb726f67e525f377b9ee808b24",
+   "sha256": "0d8c70bip8wxpnjqhqf33kq4q2lb2qdk9w2a4bp2v707fpr4pv73"
   }
  },
  {
@@ -101696,11 +102831,11 @@
   "repo": "Kungsgeten/yankpad",
   "unstable": {
    "version": [
-    20200108,
-    1811
+    20200409,
+    1747
    ],
-   "commit": "dd97994a8bff58e4d98aa6cb90aa08c5ddde5c82",
-   "sha256": "114qnr8s5v2dr3v3jvy4aagyi1wbn3fw27mrb6zdg6faxvfpd8sk"
+   "commit": "acfccf3633d7fd3b91d717fda4ae98e8e3345a06",
+   "sha256": "0xprfvgfcjdl20j1hxjk3f4gy7m3v0x9p0vyl2ygxmjj7ibgi7kw"
   },
   "stable": {
    "version": [
@@ -101719,11 +102854,11 @@
   "repo": "JorisE/yapfify",
   "unstable": {
    "version": [
-    20200326,
-    917
+    20200406,
+    830
    ],
-   "commit": "2e5d344b6d9cf1965a1153b160b3a52582d492ff",
-   "sha256": "1pi1dgcqz1xn5r4z5pjxbyx4kq75cxzl3711zzp0dyn48w0a7sj3"
+   "commit": "3df4e8ce65f55fd69479b3417525ce83a2b00b45",
+   "sha256": "13q84a4q5bv56r9dhi84jqbkx7dc1bvi42s01ahh8vmdvg4h39d3"
   },
   "stable": {
    "version": [
@@ -101849,14 +102984,14 @@
   "repo": "joaotavora/yasnippet",
   "unstable": {
    "version": [
-    20200329,
-    1434
+    20200413,
+    2221
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7c02bc142c3b157699ab8c4f24ff98da94401248",
-   "sha256": "1yjqlb9jdbsmmywgg49wd25psbf9637hzgnx5i1q3diaravlnji6"
+   "commit": "5b1217ab085fab4abeb1118dccb260691b446703",
+   "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx"
   },
   "stable": {
    "version": [
@@ -101897,25 +103032,25 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20200314,
-    1030
+    20200425,
+    1210
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "d9a9ec282c6eb1156b06dd1362e018404221087d",
-   "sha256": "0kvpp1w02mr713lz9jnq0xwbl14f879g7f1icns3n6ilf8kgb104"
+   "commit": "937cb7bb1921db38ab2c0c62062e8e32a29eabed",
+   "sha256": "03v855gbr6ii21qw4h8whbzj88xi28sqpnz1yqd1a7ngrc149fgz"
   },
   "stable": {
    "version": [
     0,
-    20
+    22
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5",
-   "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx"
+   "commit": "e51a259527d685fe767b6ec951ad1940b1131a69",
+   "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d"
   }
  },
  {
@@ -102169,11 +103304,11 @@
   "repo": "ryuslash/yoshi-theme",
   "unstable": {
    "version": [
-    20200307,
-    704
+    20200422,
+    208
    ],
-   "commit": "25bde9dc4ca380941b6539757371aef91ca35968",
-   "sha256": "0p3qrp0wrqissbvz8bnpbrj67c2697mq1pni9c247fiijbcnl48j"
+   "commit": "caa83e4475885a2c9a126630f0feec1ce2eb0c4e",
+   "sha256": "0sga52lz54c2v08j6m9v3ddv7rlpdcgi9lkxn1cvajm5h60b20r8"
   },
   "stable": {
    "version": [
@@ -102388,28 +103523,28 @@
   "repo": "zephir-lang/zephir-mode",
   "unstable": {
    "version": [
-    20200329,
-    1235
+    20200417,
+    830
    ],
    "deps": [
     "cl-lib",
     "pkg-info"
    ],
-   "commit": "3e112ba7c52b5caad0c230e014b6e842d6379ab1",
-   "sha256": "1h6lhz7fvx6c2zwgjwm5aiax5f22v65dmq3rj0s51vpasyj2k9ib"
+   "commit": "4e9618b77dff67c1c7b6fff78605a62311db88b8",
+   "sha256": "0chh35h479jm0zcjxqyd9v1gzs2adicvyihdls87g8minmwvl19r"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
    "deps": [
     "cl-lib",
     "pkg-info"
    ],
-   "commit": "76c310faf792db93bc6750305f5b54aa6a4963bd",
-   "sha256": "1najsypq8qix6jgxqqj5kkfdp7b10l3xz25qw0y5lzz4by4pzzpa"
+   "commit": "9adc5cf07a9117d25eaab41867ddde914c6d2f5a",
+   "sha256": "0g2vfscikz8qa0danvcickcjnz99yjm9jgk3sci094gmgwka3j2y"
   }
  },
  {
@@ -102420,26 +103555,26 @@
   "url": "https://gitlab.emacsos.com/sylecn/zero-el",
   "unstable": {
    "version": [
-    20200220,
-    1619
+    20200405,
+    1220
    ],
    "deps": [
     "s"
    ],
-   "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab",
-   "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl"
+   "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da",
+   "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04"
   },
   "stable": {
    "version": [
     2,
-    6,
+    8,
     0
    ],
    "deps": [
     "s"
    ],
-   "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab",
-   "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl"
+   "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da",
+   "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04"
   }
  },
  {
@@ -102479,14 +103614,25 @@
   "repo": "efls/zetteldeft",
   "unstable": {
    "version": [
-    20200329,
-    1506
+    20200415,
+    1614
    ],
    "deps": [
     "deft"
    ],
-   "commit": "1dd8b052bb4bc8fcd18740e798057ace97cb63ac",
-   "sha256": "16bkcp6mq98bn1qli2qi6wgf5zrkxfqs912fi9fg88bcixk50k9j"
+   "commit": "cba7554afe740f64adcdc615b5f4ab0e1e47c6a1",
+   "sha256": "1b1bqz02xh19syyv9w64q9msay84kpq3kkmpdqy8i7mvhsd4cdry"
+  },
+  "stable": {
+   "version": [
+    0,
+    3
+   ],
+   "deps": [
+    "deft"
+   ],
+   "commit": "271ea573b0a4f265d16108db2ec7c928f3e9aa31",
+   "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6"
   }
  },
  {
@@ -102907,22 +104053,22 @@
  },
  {
   "ename": "zpresent",
-  "commit": "3aae38ad54490fa650c832fb7d22e2c73b0fb060",
-  "sha256": "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j",
-  "fetcher": "bitbucket",
-  "repo": "zck/zpresent.el",
+  "commit": "d3828ad7599d13728b5571b882344c3ada434b85",
+  "sha256": "0i1qrb9qplmx9kx1286xypjyy48r9y3cvnlhi06r583adfr02wab",
+  "fetcher": "hg",
+  "url": "https://hg.sr.ht/~zck/zpresent",
   "unstable": {
    "version": [
-    20180605,
-    438
+    20200417,
+    309
    ],
    "deps": [
     "dash",
     "org-parser",
     "request"
    ],
-   "commit": "55fc14b66e2ea506247a4e7dd622a9dfe5545c4b",
-   "sha256": "17wkhl1a7jmg4ks011lf5h4f2vbhf8dl6vgzdzlmljk15f9hmw35"
+   "commit": "406967322b7692492a5942d901335d626cace4d0",
+   "sha256": "1nn6dvzcayh6nv6xn3siv09iixc5c3gy9c8y1fdwzq81yny9l2fr"
   }
  },
  {

From 35b81933528b627f4f7ee677ca535335f9714d2a Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <numkem@numkem.org>
Date: Sat, 4 Apr 2020 20:23:06 -0400
Subject: [PATCH 114/183] maintainers: add numkem

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b2187c8fb8f1..1bd0ebffdba0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5608,6 +5608,12 @@
     githubId = 369111;
     name = "Morgan Jones";
   };
+  numkem = {
+    name = "Sebastien Bariteau";
+    email = "numkem@numkem.org";
+    github = "numkem";
+    githubId = 332423;
+  };
   nyanloutre = {
     email = "paul@nyanlout.re";
     github = "nyanloutre";

From a7971df962fd026843f1707c237294341920757e Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 21 Apr 2020 06:01:08 +0200
Subject: [PATCH 115/183] perlPackages.GitAutofixup: init at 0.002007

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b3597404edd5..2f933eeff1f5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7878,6 +7878,20 @@ let
     };
   };
 
+  GitAutofixup = buildPerlPackage rec {
+    pname = "GitAutofixup";
+    version = "0.002007";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz";
+      sha256 = "1ydy15pibva0qr5vrv5mqyzw3zlc3wbszzv7932vh7m88vv6gfr6";
+    };
+    meta = {
+      maintainers = [ maintainers.DamienCassou ];
+      description = "Create fixup commits for topic branches";
+      license = stdenv.lib.licenses.artistic2;
+    };
+  };
+
   GitPurePerl = buildPerlPackage {
     pname = "Git-PurePerl";
     version = "0.53";

From 361684e97be1e7df659d67662f8cf044b7487a09 Mon Sep 17 00:00:00 2001
From: Kimat Boven <kimat@users.noreply.github.com>
Date: Sun, 26 Apr 2020 21:49:29 +0200
Subject: [PATCH 116/183] tmux: 3.0a -> 3.1

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 1aa221bd59e3..c8b7dadf44dc 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -21,7 +21,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "tmux";
-  version = "3.0a";
+  version = "3.1";
 
   outputs = [ "out" "man" ];
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     owner = "tmux";
     repo = "tmux";
     rev = version;
-    sha256 = "0y9lv1yr0x50v3k70vzkc8hfr7yijlsi30p7dr7i8akp3lwmmc7h";
+    sha256 = "1jgxal6jzzannh7hb3617r6g5p9yczl6a78m4kjnf3cxxm4jdaxz";
   };
 
   nativeBuildInputs = [

From b987b25c7cdb7c48c3a186cb46396b1d79f693e3 Mon Sep 17 00:00:00 2001
From: Sebastien Bariteau <numkem@numkem.org>
Date: Sun, 26 Apr 2020 16:00:05 -0400
Subject: [PATCH 117/183] hashi-ui: init at 1.3.8

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

diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix
new file mode 100644
index 000000000000..019a8dca3b65
--- /dev/null
+++ b/pkgs/servers/hashi-ui/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "hashi-ui";
+  version = "1.3.8";
+
+  src = fetchurl {
+    url = "https://github.com/jippi/hashi-ui/releases/download/v${version}/hashi-ui-linux-amd64";
+    sha256 = "999a34b6e99657ffc7e6c98a15b8ea744c28420e891a8802c7d99b737752dfb6";
+  };
+
+  dontUnpack = true;
+  sourceRoot = ".";
+
+  installPhase = ''
+    install -m755 -D $src $out/bin/hashi-ui
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jippi/hashi-ui";
+    description = "A modern user interface for hashicorp Consul & Nomad";
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ numkem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3316b446b9ad..775de256229b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15558,6 +15558,8 @@ in
 
   haka = callPackage ../tools/security/haka { };
 
+  hashi-ui = callPackage ../servers/hashi-ui {};
+
   heapster = callPackage ../servers/monitoring/heapster { };
 
   hbase = callPackage ../servers/hbase {};

From e726e341c607e4bd47b7c79303af43395d272ac1 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 22 Apr 2020 12:00:00 +0000
Subject: [PATCH 118/183] unison: fix unison-fsmonitor wrapper in an empty PATH

Fixes:
/nix/store/hyk3aky49zm2chq5cwclrsm56iqwfzwj-unison-2.51.2/bin/unison-fsmonitor: line 2: grep: command not found

Happens when running unison in a systemd service.
---
 pkgs/applications/networking/sync/unison/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 535757503ca6..7b7318544c56 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses
+{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep
 , enableX11 ? true}:
 
 let inherit (ocamlPackages) ocaml lablgtk; in
@@ -38,7 +38,7 @@ stdenv.mkDerivation (rec {
   postInstall = if enableX11 then ''
     for i in $(cd $out/bin && ls); do
       wrapProgram $out/bin/$i \
-        --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
+        --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
     done
   '' else "";
 

From e5e31593cebf0322fff2badcb8f85eb2cd40da74 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 26 Apr 2020 14:29:17 -0700
Subject: [PATCH 119/183] openexr,imlbase: 2.3.0 -> 2.4.1

---
 .../libraries/ilmbase/bootstrap.patch         | 15 ------------
 .../development/libraries/ilmbase/default.nix | 23 +++++++------------
 .../libraries/openexr/bootstrap.patch         | 15 ------------
 .../development/libraries/openexr/default.nix | 22 +++++++-----------
 4 files changed, 16 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/ilmbase/bootstrap.patch
 delete mode 100644 pkgs/development/libraries/openexr/bootstrap.patch

diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch
deleted file mode 100644
index db6af6daebd0..000000000000
--- a/pkgs/development/libraries/ilmbase/bootstrap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap
---- IlmBase/bootstrap	2015-03-31 01:02:41.000000000 -0400
-+++ IlmBase/bootstrap	2015-03-31 01:03:35.000000000 -0400
-@@ -47,11 +47,6 @@
-     fi
- }
- 
--# Check if /usr/local/share/aclocal exists
--if [ -d /usr/local/share/aclocal ]; then
--	ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"
--fi	
--
- run_cmd aclocal -I m4 $ACLOCAL_INCLUDE
- run_cmd $LIBTOOLIZE --automake --copy
- run_cmd automake --add-missing --copy
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 99e47b0b303f..4ea16a59e8b4 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which,
-  fetchpatch }:
+{ stdenv, lib, buildPackages, automake, autoconf, libtool, which,
+  fetchpatch, openexr }:
 
 stdenv.mkDerivation rec {
   pname = "ilmbase";
-  version = "2.3.0";
+  version = lib.getVersion openexr;
 
-  src = fetchurl {
-    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
-  };
+  # the project no longer provides separate tarballs. We may even want to merge
+  # the ilmbase package into openexr in the future.
+  src = openexr.src;
+
+  sourceRoot = "source/IlmBase";
 
   outputs = [ "out" "dev" ];
 
@@ -23,15 +24,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_LINK = "-pthread";
 
   patches = [
-    ./bootstrap.patch
     ./cross.patch
-    (fetchpatch {
-      name = "CVE-2018-18443.patch";
-      url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch";
-      sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s";
-      stripLen = 1;
-      excludes = [ "CHANGES.md" ];
-    })
   ];
 
   # fails 1 out of 1 tests with
diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch
deleted file mode 100644
index af6669c16a45..000000000000
--- a/pkgs/development/libraries/openexr/bootstrap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap
---- OpenEXR/bootstrap	2015-03-31 01:02:41.000000000 -0400
-+++ OpenEXR/bootstrap	2015-03-31 01:03:35.000000000 -0400
-@@ -47,11 +47,6 @@
-     fi
- }
- 
--# Check if /usr/local/share/aclocal exists
--if [ -d /usr/local/share/aclocal ]; then
--	ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"
--fi	
--
- run_cmd aclocal -I m4 $ACLOCAL_INCLUDE
- run_cmd $LIBTOOLIZE --automake --copy
- run_cmd automake --add-missing --copy
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 328bce35357f..da8fb4294650 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig,
+{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig,
   zlib, ilmbase, fetchpatch }:
 
 let
@@ -8,22 +8,16 @@ in
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = lib.getVersion ilmbase;
+  version = "2.4.1";
 
-  src = fetchurl {
-    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";
+  src = fetchFromGitHub {
+    owner = "AcademySoftwareFoundation";
+    repo = "openexr";
+    rev = "v${version}";
+    sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01";
   };
 
-  patches = [
-    ./bootstrap.patch
-    (fetchpatch {
-      name = "CVE-2018-18444.patch";
-      url = "https://github.com/openexr/openexr/commit/1b0f1e5d7dcf2e9d6cbb4e005e803808b010b1e0.patch";
-      sha256 = "0f5m4wdwqqg8wfg7azzsz5yfpdrvws314rd4sqfc74j1g6wrcnqj";
-      stripLen = 1;
-    })
-  ];
+  sourceRoot = "source/OpenEXR";
 
   outputs = [ "bin" "dev" "out" "doc" ];
 

From bba6c109fe963464c2260483ffdaea76f33fa414 Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@rebelliondefense.com>
Date: Sun, 26 Apr 2020 17:32:45 -0400
Subject: [PATCH 120/183] torque: substitute /bin/cp

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

diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 37c8d32ab6a1..0941ca969223 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
-, file, libtool, which, boost, autoreconfHook
+, coreutils, file, libtool, which, boost, autoreconfHook
 }:
 
 stdenv.mkDerivation rec {
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
       --replace "contrib/init.d contrib/systemd" ""
     substituteInPlace src/cmds/Makefile.am \
       --replace "/etc/" "$out/etc/"
+    substituteInPlace src/mom_rcp/pathnames.h \
+      --replace /bin/cp ${coreutils}/bin/cp
+    substituteInPlace src/resmom/requests.c \
+      --replace /bin/cp ${coreutils}/bin/cp
   '';
 
   preConfigure = ''

From ebdf027f101c6734625c434c0a948d633581ac87 Mon Sep 17 00:00:00 2001
From: Kimat Boven <kimat@users.noreply.github.com>
Date: Sun, 26 Apr 2020 23:36:23 +0200
Subject: [PATCH 121/183] helm: 3.1.3 -> 3.2.0

---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 0eac175a1707..deb6d75f12c5 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "helm";
-  version = "3.1.3";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "1j6pr1a9ff32bnjq9rncllmfpraip5r2fj3zsljw5jq68x5wamdc";
+    sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd";
   };
-  modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
+  modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd";
 
   subPackages = [ "cmd/helm" ];
   buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];

From 16df60734a76eedbe3f265ee492587f1f42c4796 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:52 +1000
Subject: [PATCH 122/183] kops: use installShellFiles

---
 .../applications/networking/cluster/kops/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index a5f1806e5779..4d2e406c0400 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }:
 
 let
   goPackagePath = "k8s.io/kops";
@@ -18,7 +18,7 @@ let
           inherit sha256;
         };
 
-        nativeBuildInputs = [ go-bindata ];
+        nativeBuildInputs = [ go-bindata installShellFiles ];
         subPackages = [ "cmd/kops" ];
 
         buildFlagsArray = ''
@@ -33,10 +33,10 @@ let
         '';
 
         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
+          for shell in bash zsh; do
+            $bin/bin/kops completion $shell > kops.$shell
+            installShellCompletion kops.$shell
+          done
         '';
 
         meta = with stdenv.lib; {

From 954eab8ea9e88680d86c9ca050e38dcec573fbc7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:52 +1000
Subject: [PATCH 123/183] stern: use installShellFiles

---
 .../networking/cluster/stern/default.nix             | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 144d46043ffe..95ad965c346f 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in
 
@@ -17,13 +17,15 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall =
     let stern = if isCrossBuild then buildPackages.stern else "$bin"; in
     ''
-      mkdir -p $bin/share/bash-completion/completions
-      ${stern}/bin/stern --completion bash > $bin/share/bash-completion/completions/stern
-      mkdir -p $bin/share/zsh/site-functions
-      ${stern}/bin/stern --completion zsh > $bin/share/zsh/site-functions/_stern
+      for shell in bash zsh; do
+        ${stern}/bin/stern --completion $shell > stern.$shell
+        installShellCompletion stern.$shell
+      done
     '';
 
   meta = with lib; {

From 0bead921ca637672c3dfc545e2c7d649370388b9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:53 +1000
Subject: [PATCH 124/183] rclone: use installShellFiles

---
 .../applications/networking/sync/rclone/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 2f484467450c..57925a3292d8 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }:
+{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }:
 
 buildGoPackage rec {
   pname = "rclone";
@@ -17,6 +17,8 @@ buildGoPackage rec {
 
   outputs = [ "bin" "out" "man" ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall =
     let
       rcloneBin =
@@ -25,10 +27,11 @@ buildGoPackage rec {
         else stdenv.lib.getBin buildPackages.rclone;
     in
       ''
-        install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
-        mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/
-        ${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone
-        ${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash
+        installManPage $src/rclone.1
+        for shell in bash zsh; do
+          ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell
+          installShellCompletion rclone.$shell
+        done
       '';
 
   meta = with stdenv.lib; {

From e75465256b44f6fcf38fa1a853a02f583e9710cf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:53 +1000
Subject: [PATCH 125/183] gitAndTools.hub: use installShellFiles

---
 .../version-management/git-and-tools/hub/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 8890cd5eb238..9dbb497c8c9e 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }:
+{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }:
 
 buildGoPackage rec {
   pname = "hub";
@@ -16,7 +16,7 @@ buildGoPackage rec {
     sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
   };
 
-  nativeBuildInputs = [ groff utillinux ];
+  nativeBuildInputs = [ groff installShellFiles utillinux ];
 
   postPatch = ''
     patchShebangs .
@@ -24,13 +24,13 @@ buildGoPackage rec {
 
   postInstall = ''
     cd go/src/${goPackagePath}
-    install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub"
-    install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub"
-    install -D etc/hub.fish_completion  "$bin/share/fish/vendor_completions.d/hub.fish"
+    installShellCompletion --zsh --name _hub etc/hub.zsh_completion
+    installShellCompletion --bash --name hub etc/hub.bash_completion.sh
+    installShellCompletion --fish --name hub.fish etc/hub.fish_completion
 
     LC_ALL=C.UTF8 \
     make man-pages
-    cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/
+    installManPage share/man/man[1-9]/*.[1-9]
   '';
 
   meta = with stdenv.lib; {

From 2dca3f2aa7bda81591a53dad1a800f4158065da5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:55 +1000
Subject: [PATCH 126/183] prometheus-mail-exporter: use installShellFiles

---
 pkgs/servers/monitoring/prometheus/mail-exporter.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
index 1e29eefba2b2..f845a6ef2567 100644
--- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage {
   pname = "mailexporter";
@@ -15,9 +15,11 @@ buildGoPackage {
 
   goDeps = ./mail-exporter_deps.nix;
 
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall = ''
-    install -D -m 0444 -t $bin/share/man/man1 $src/man/mailexporter.1
-    install -D -m 0444 -t $bin/share/man/man5 $src/man/mailexporter.conf.5
+    installManPage $src/man/mailexporter.1
+    installManPage $src/man/mailexporter.conf.5
   '';
 
   meta = with stdenv.lib; {

From 94e4ec143f8dbbc59c987c00e02803a3c78b3a52 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:55 +1000
Subject: [PATCH 127/183] cockroachdb: use installShellFiles

---
 pkgs/servers/sql/cockroachdb/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 8f3d2a7b2854..fb62ee584742 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -1,6 +1,7 @@
 { stdenv, buildGoPackage, fetchurl
 , cmake, xz, which, autoconf
 , ncurses6, libedit, libunwind
+, installShellFiles
 }:
 
 let
@@ -8,7 +9,7 @@ let
   linuxDeps  = [ ncurses6 ];
 
   buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps;
-  nativeBuildInputs = [ cmake xz which autoconf ];
+  nativeBuildInputs = [ installShellFiles cmake xz which autoconf ];
 
 in
 buildGoPackage rec {
@@ -42,7 +43,7 @@ buildGoPackage rec {
     runHook preInstall
 
     install -D cockroachoss $bin/bin/cockroach
-    install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash
+    installShellCompletion cockroach.bash
 
     mkdir -p $man/share/man
     cp -r man $man/share/man

From e7b44787b1c5afe0bbe8fa351ce8d77ffa2c5ceb Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:56 +1000
Subject: [PATCH 128/183] lxd: use installShellFiles

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

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 19fbff747fc9..6051c16e91e1 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -5,6 +5,7 @@
 , writeShellScriptBin, apparmor-profiles, apparmor-parser
 , criu
 , bash
+, installShellFiles
 }:
 
 buildGoPackage rec {
@@ -39,11 +40,10 @@ buildGoPackage rec {
       '')
     ]}
 
-    mkdir -p "$bin/share/bash-completion/completions/"
-    cp -av go/src/github.com/lxc/lxd/scripts/bash/lxd-client "$bin/share/bash-completion/completions/lxc"
+    installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client
   '';
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ];
   buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
                   raft-canonical.dev sqlite-replication udev.dev ];
 

From 148f8629cc00d5f71018e01abe301d0d052fbf4b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:57 +1000
Subject: [PATCH 129/183] gopass: use installShellFiles

---
 pkgs/tools/security/gopass/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 8af24bf7ab52..cb640fb16393 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }:
 
 buildGoPackage rec {
   pname = "gopass";
@@ -6,7 +6,7 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/gopasspw/gopass";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ installShellFiles makeWrapper ];
 
   src = fetchFromGitHub {
     owner = "gopasspw";
@@ -22,13 +22,10 @@ buildGoPackage rec {
   ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard);
 
   postInstall = ''
-    mkdir -p \
-      $bin/share/bash-completion/completions \
-      $bin/share/zsh/site-functions \
-      $bin/share/fish/vendor_completions.d
-    $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass
-    $bin/bin/gopass completion zsh  > $bin/share/zsh/site-functions/_gopass
-    $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish
+    for shell in bash fish zsh; do
+      $bin/bin/gopass completion $shell > gopass.$shell
+      installShellCompletion gopass.$shell
+    done
   '';
 
   postFixup = ''

From 8193ac091a54b55b3ada8f16085a67cf53e3c8e3 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:57 +1000
Subject: [PATCH 130/183] vault: use installShellFiles

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 54be477cfe2c..ae46bbae40ad 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }:
 
 buildGoPackage rec {
   pname = "vault";
@@ -15,14 +15,16 @@ buildGoPackage rec {
 
   subPackages = [ "." ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   buildFlagsArray = [
     "-tags='vault'"
     "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\""
   ];
 
   postInstall = ''
-    mkdir -p $bin/share/bash-completion/completions
-    echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault
+    echo "complete -C $bin/bin/vault vault" > vault.bash
+    installShellCompletion vault.bash
   '';
 
   meta = with stdenv.lib; {

From fb5cf24d7b2154b75911137d27d8715e2f93cd0b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:51 +1000
Subject: [PATCH 131/183] kompose: update completion

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

diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 09a69f4b80e2..2467ed93b32c 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -15,9 +15,10 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = ''
-    $bin/bin/kompose completion bash > kompose.bash
-    $bin/bin/kompose completion zsh > kompose.zsh
-    installShellCompletion kompose.{bash,zsh}
+    for shell in bash zsh; do
+      $bin/bin/kompose completion $shell > kompose.$shell
+      installShellCompletion kompose.$shell
+    done
   '';
 
   meta = with lib; {

From 454f8ef82aa776c8fd6a3da8bcf72211c3f6cfa9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 13:16:54 +1000
Subject: [PATCH 132/183] kind: update completion

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

diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index f86bc4898371..6436c83ee21a 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -19,9 +19,10 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = ''
-    $bin/bin/kind completion bash > kind.bash
-    $bin/bin/kind completion zsh > kind.zsh
-    installShellCompletion kind.{bash,zsh}
+    for shell in bash zsh; do
+      $bin/bin/kind completion $shell > kind.$shell
+      installShellCompletion kind.$shell
+    done
   '';
 
   meta = {

From b0698e430b4649663ad079daf793ec1c075660ce Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 26 Apr 2020 18:17:00 -0500
Subject: [PATCH 133/183] gitAndTools.delta: 0.0.18 -> 0.1.1

---
 .../git-and-tools/delta/default.nix                | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 7bdeae65899c..60950dc0465c 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -1,20 +1,26 @@
-{ lib, fetchFromGitHub, rustPlatform, llvmPackages }:
+{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "delta";
-  version = "0.0.18";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "dandavison";
     repo = pname;
     rev = version;
-    sha256 = "0cpd60861k9nd2gbzyb2hg5npnkgvsnyrvv7mlm30vb1833gz94z";
+    sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk";
   };
 
   LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config";
   LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
 
-  cargoSha256 = "12gl50q5hf6nq571fqxfv61z4mwfjyw4jb2yqyqbsinwj2frwaxn";
+  cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --bash --name delta.bash completion/bash/completion.sh
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/dandavison/delta";

From 467e6c2669e298f4919a5b4feebc1d8da5f5f3d8 Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Sun, 26 Apr 2020 22:35:25 -0400
Subject: [PATCH 134/183] pythonPackages.vdf: 3.2 -> 3.3

---
 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 73725c8e5e30..7d4e3e34b86d 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.2";
+  version = "3.3";
 
   src = fetchFromGitHub {
     owner = "ValvePython";
     repo = pname;
     rev = "v${version}";
-    sha256 = "08rb982hcwc9pr9gl0zfk9266h84fwbz097qjfkss3srwghr1247";
+    sha256 = "0d9bhxdznry7kzyma00cxwjn6rqnd6vw8v5ym68k6qswgfzb569i";
   };
 
   checkInputs = [ pytest pytestcov mock ];

From 0f4ffe94fbfd1982ba18065ea0d02e37f14e6252 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 15:42:50 +1000
Subject: [PATCH 135/183] etcd: 3.3.13 -> 3.3.20

---
 pkgs/servers/etcd/default.nix | 41 ++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index a5083a20cb77..9a2bf7ce5903 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,33 +1,40 @@
-{ lib, libpcap, buildGoPackage, fetchFromGitHub }:
-
-with lib;
+{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
 
 buildGoPackage rec {
   pname = "etcd";
-  version = "3.3.13"; # After updating check that nixos tests pass
-  rev = "v${version}";
+  version = "3.3.20";
 
+  # change to "go.etcd.io/etcd" for >= 3.4
   goPackagePath = "github.com/coreos/etcd";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "coreos";
+    owner = "etcd-io";
     repo = "etcd";
-    sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy";
+    rev = "v${version}";
+    sha256 = "1iqq12kkky3cl28k7fabqqyx1i0a2wmbkq0bs8yhiwywp076k08w";
   };
 
-  subPackages = [
-    "cmd/etcd"
-    "cmd/etcdctl"
-  ];
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    patchShebangs .
+    ./build
+    ./functional/build
+  '';
 
-  buildInputs = [ libpcap ];
+  installPhase = ''
+    install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin
+  '';
 
-  meta = {
+  passthru.tests = with nixosTests; {
+    etcd = etcd;
+    etcd-cluster = etcd-cluster;
+  };
+
+  meta = with lib; {
     description = "Distributed reliable key-value store for the most critical data of a distributed system";
     license = licenses.asl20;
-    homepage = "https://coreos.com/etcd/";
-    maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    homepage = "https://etcd.io/";
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.unix;
   };
 }

From e9c44e8956968685360fc5922f47a8b209220a72 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Mon, 27 Apr 2020 08:15:39 +0200
Subject: [PATCH 136/183] wireguard-compat: 1.0.20200413 -> 1.0.20200426

https://lists.zx2c4.com/pipermail/wireguard/2020-April/005237.html
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 6edbb1aa4d7b..8c3f489753df 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "1.0.20200413";
+  version = "1.0.20200426";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "11dpw1inszbc3qjcfnap74kgjxkyyrx90vxv6wmsgkbp8lsl4p66";
+    sha256 = "0j343xk9qgmzn0j6kgvydfqjqslf2rv6r4ikfc59982xxny6f6l5";
   };
 
   hardeningDisable = [ "pic" ];

From b2556b13f560a964837a7bafcdcb43e2420388e8 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 16:13:07 +1000
Subject: [PATCH 137/183] runc: remove hardeningDisable

---
 pkgs/applications/virtualization/runc/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 39a1f6faeacc..87385024967e 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -24,8 +24,6 @@ buildGoPackage rec {
   goPackagePath = "github.com/opencontainers/runc";
   outputs = [ "bin" "out" "man" ];
 
-  hardeningDisable = [ "fortify" ];
-
   nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
   buildInputs = [ libseccomp libapparmor apparmor-parser ];
 

From a900a0a246567186f8d4b149906b540a0a825572 Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Mon, 27 Apr 2020 12:16:15 +0530
Subject: [PATCH 138/183] rescuetime: 2.14.5.3 -> 2.15.0.1

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

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 7212563816b8..9784e24187bf 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,15 +5,15 @@ let
     if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "0rc744infrvs5l1c8qpsd1x2y40bpbxlwnmyj6nyli8fnqcnzh5l";
+      sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "1cjsgqcv76b798rpdn72fkbm79shlqnxyh1741isi8gcp1gnimji";
+      sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv";
     };
 in mkDerivation {
   # https://www.rescuetime.com/updates/linux_release_notes.html
-  name = "rescuetime-2.14.5.3";
+  name = "rescuetime-2.15.0.1";
   inherit src;
   nativeBuildInputs = [ dpkg ];
   # avoid https://github.com/NixOS/patchelf/issues/99

From 3e4f1e5b675a7be4be76196ba483a204cd926b9c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 26 Apr 2020 18:34:20 +1000
Subject: [PATCH 139/183] restic: use subPackages, installShellFiles

---
 pkgs/tools/backup/restic/default.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index f8dbeadff095..df9d613ee446 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, nixosTests}:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}:
 
 buildGoPackage rec {
   pname = "restic";
@@ -13,23 +13,19 @@ buildGoPackage rec {
     sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7";
   };
 
+  subPackages = [ "cmd/restic" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
   passthru.tests.restic = nixosTests.restic;
 
-  # Use a custom install phase here as by default the
-  # build-release-binaries and prepare-releases binaries are
-  # installed.
-  installPhase = ''
-    mkdir -p "$bin/bin"
-    cp go/bin/restic "$bin/bin"
-  '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
-    mkdir -p \
-      $bin/etc/bash_completion.d \
-      $bin/share/zsh/vendor-completions \
-      $bin/share/man/man1
+  postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     $bin/bin/restic generate \
-      --bash-completion $bin/etc/bash_completion.d/restic.sh \
-      --zsh-completion $bin/share/zsh/vendor-completions/_restic \
-      --man $bin/share/man/man1
+      --bash-completion restic.bash \
+      --zsh-completion restic.zsh \
+      --man .
+    installShellCompletion restic.{bash,zsh}
+    installManPage *.1
   '';
 
   meta = with lib; {

From cf536ed5a3c0e90e13cefb798774752d72100b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 08:06:25 +0100
Subject: [PATCH 140/183] raft-canonical: 0.9.17 -> 0.9.18

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

diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 201c332dfdd4..ed3d7ae9e701 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "raft-canonical";
-  version = "0.9.17";
+  version = "0.9.18";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "raft";
     rev = "v${version}";
-    sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09";
+    sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkgconfig ];

From 498e960f294093d969e8161727cedc2eda5758fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 08:14:48 +0100
Subject: [PATCH 141/183] dqlite: 1.4.0 -> 1.4.1

---
 pkgs/development/libraries/dqlite/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 131c22fccfb5..cbd59949b790 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -5,24 +5,25 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i";
+    sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkgconfig ];
-  buildInputs = [ libco-canonical.dev libuv raft-canonical.dev 
-                  sqlite-replication ];
+  buildInputs = [
+    libco-canonical.dev
+    libuv
+    raft-canonical.dev
+    sqlite-replication
+  ];
 
-  preConfigure= ''
-    substituteInPlace configure --replace /usr/bin/ " "
-  '';
-
-  doCheck = true;
+  # tests hang for ever on x86_64-linux
+  doCheck = false;
 
   outputs = [ "dev" "out" ];
 

From c10d82358f875bb3c2104b7958777eb0033e024f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Mon, 27 Apr 2020 09:04:07 +0200
Subject: [PATCH 142/183] treewide: add types to boolean / enable options or
 make use of mkEnableOption

---
 nixos/modules/config/fonts/fontdir.nix            |  1 +
 nixos/modules/config/fonts/ghostscript.nix        |  1 +
 nixos/modules/config/ldap.nix                     |  2 ++
 nixos/modules/security/apparmor-suid.nix          |  1 +
 nixos/modules/security/pam.nix                    | 15 +++------------
 nixos/modules/services/mail/postfix.nix           |  1 +
 nixos/modules/services/mail/spamassassin.nix      |  1 +
 nixos/modules/services/misc/autofs.nix            |  1 +
 nixos/modules/services/misc/disnix.nix            |  5 +----
 nixos/modules/services/networking/gogoclient.nix  |  1 +
 nixos/modules/services/networking/hostapd.nix     |  2 ++
 nixos/modules/services/networking/openfire.nix    |  1 +
 nixos/modules/services/networking/ssh/lshd.nix    |  6 ++++++
 nixos/modules/services/networking/tcpcrypt.nix    |  1 +
 nixos/modules/services/networking/wicd.nix        |  1 +
 .../services/web-servers/jboss/default.nix        |  1 +
 .../modules/services/x11/display-managers/gdm.nix |  3 ++-
 nixos/modules/services/x11/hardware/digimend.nix  |  7 +------
 nixos/modules/virtualisation/xen-dom0.nix         | 11 +++--------
 19 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index cc70fbf8744d..a6aa84ae8224 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -25,6 +25,7 @@ in
     fonts = {
 
       enableFontDir = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to create a directory with links to all fonts in
diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix
index 1c62a525de94..b1dd81bf2d2e 100644
--- a/nixos/modules/config/fonts/ghostscript.nix
+++ b/nixos/modules/config/fonts/ghostscript.nix
@@ -9,6 +9,7 @@ with lib;
     fonts = {
 
       enableGhostscriptFonts = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to add the fonts provided by Ghostscript (such as
diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index b554f197dc4b..4c8b527676b2 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -88,6 +88,7 @@ in
       };
 
       useTLS = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           If enabled, use TLS (encryption) over an LDAP (port 389)
@@ -109,6 +110,7 @@ in
 
       daemon = {
         enable = mkOption {
+          type = types.bool;
           default = false;
           description = ''
             Whether to let the nslcd daemon (nss-pam-ldapd) handle the
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index 3c93f5440ab5..6c479e070e2b 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -9,6 +9,7 @@ with lib;
   ];
 
   options.security.apparmor.confineSUIDApplications = mkOption {
+    type = types.bool;
     default = true;
     description = ''
       Install AppArmor profiles for commonly-used SUID application
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index bfc2a881387f..aeb8629767bc 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -545,6 +545,7 @@ in
     };
 
     security.pam.enableSSHAgentAuth = mkOption {
+      type = types.bool;
       default = false;
       description =
         ''
@@ -555,12 +556,7 @@ in
         '';
     };
 
-    security.pam.enableOTPW = mkOption {
-      default = false;
-      description = ''
-        Enable the OTPW (one-time password) PAM module.
-      '';
-    };
+    security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module";
 
     security.pam.u2f = {
       enable = mkOption {
@@ -719,12 +715,7 @@ in
       };
     };
 
-    security.pam.enableEcryptfs = mkOption {
-      default = false;
-      description = ''
-        Enable eCryptfs PAM module (mounting ecryptfs home directory on login).
-      '';
-    };
+    security.pam.enableEcryptfs = mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)";
 
     users.motd = mkOption {
       default = null;
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 19e11b31d9ca..608f64a68fb0 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -269,6 +269,7 @@ in
       };
 
       enableSmtp = mkOption {
+        type = types.bool;
         default = true;
         description = "Whether to enable smtp in master.cf.";
       };
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index f6c0b9c794c9..4e642542ec66 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -15,6 +15,7 @@ in
       enable = mkEnableOption "the SpamAssassin daemon";
 
       debug = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to run the SpamAssassin daemon in debug mode";
       };
diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index 84f49f964b12..5e7c1e668288 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -57,6 +57,7 @@ in
       };
 
       debug = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Pass -d and -7 to automount and write log to the system journal.
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 0776ac679088..69386cdbb381 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -25,10 +25,7 @@ in
         description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
       };
 
-      useWebServiceInterface = mkOption {
-        default = false;
-        description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
-      };
+      useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
 
       package = mkOption {
         type = types.path;
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index c9b03bca7112..99455b183144 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
@@ -19,6 +19,7 @@ in
         '';
       };
       autorun = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Whether to automatically start the tunnel.
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 12c0626a9414..6418ae699431 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -72,6 +72,7 @@ in
       };
 
       noScan = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Do not scan for overlapping BSSs in HT40+/- mode.
@@ -127,6 +128,7 @@ in
       };
 
       wpa = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point.
diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index c74f3611f79e..fe0499d52323 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@@ -12,6 +12,7 @@ with lib;
       enable = mkEnableOption "OpenFire XMPP server";
 
       usePostgreSQL = mkOption {
+        type = types.bool;
         default = true;
         description = "
           Whether you use PostgreSQL service for your storage back-end.
diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
index 892e59778c34..41d0584080e4 100644
--- a/nixos/modules/services/networking/ssh/lshd.nix
+++ b/nixos/modules/services/networking/ssh/lshd.nix
@@ -54,21 +54,25 @@ in
       };
 
       syslog = mkOption {
+        type = types.bool;
         default = true;
         description = ''Whether to enable syslog output.'';
       };
 
       passwordAuthentication = mkOption {
+        type = types.bool;
         default = true;
         description = ''Whether to enable password authentication.'';
       };
 
       publicKeyAuthentication = mkOption {
+        type = types.bool;
         default = true;
         description = ''Whether to enable public key authentication.'';
       };
 
       rootLogin = mkOption {
+        type = types.bool;
         default = false;
         description = ''Whether to enable remote root login.'';
       };
@@ -90,11 +94,13 @@ in
       };
 
       tcpForwarding = mkOption {
+        type = types.bool;
         default = true;
         description = ''Whether to enable TCP/IP forwarding.'';
       };
 
       x11Forwarding = mkOption {
+        type = types.bool;
         default = true;
         description = ''Whether to enable X11 forwarding.'';
       };
diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix
index 18f2e135124b..5a91054e1668 100644
--- a/nixos/modules/services/networking/tcpcrypt.nix
+++ b/nixos/modules/services/networking/tcpcrypt.nix
@@ -15,6 +15,7 @@ in
   options = {
 
     networking.tcpcrypt.enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Whether to enable opportunistic TCP encryption. If the other end
diff --git a/nixos/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix
index 03c6bd28aaba..aa10a50f876a 100644
--- a/nixos/modules/services/networking/wicd.nix
+++ b/nixos/modules/services/networking/wicd.nix
@@ -9,6 +9,7 @@ with lib;
   options = {
 
     networking.wicd.enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Whether to start <command>wicd</command>. Wired and
diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index 3a125982831b..ca5b8635fc00 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -60,6 +60,7 @@ in
       };
 
       useJK = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to use to connector to the Apache HTTP server";
       };
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index d7bef68e5bcb..622ea62f3a91 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -93,16 +93,17 @@ in
       };
 
       wayland = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Allow GDM to run on Wayland instead of Xserver.
           Note to enable Wayland with Nvidia you need to
           enable the <option>nvidiaWayland</option>.
         '';
-        type = types.bool;
       };
 
       nvidiaWayland = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to allow wayland to be used with the proprietary
diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixos/modules/services/x11/hardware/digimend.nix
index a9f5640905aa..b1b1682f00b2 100644
--- a/nixos/modules/services/x11/hardware/digimend.nix
+++ b/nixos/modules/services/x11/hardware/digimend.nix
@@ -16,12 +16,7 @@ in
 
     services.xserver.digimend = {
 
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the digimend drivers for Huion/XP-Pen/etc. tablets.
-        '';
-      };
+      enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets";
 
     };
 
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 7f0af9901b9b..7b2a66c43489 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -103,6 +103,7 @@ in
         };
 
         forwardDns = mkOption {
+          type = types.bool;
           default = false;
           description = ''
             If set to <literal>true</literal>, the DNS queries from the
@@ -135,14 +136,8 @@ in
           };
       };
 
-    virtualisation.xen.trace =
-      mkOption {
-        default = false;
-        description =
-          ''
-            Enable Xen tracing.
-          '';
-      };
+    virtualisation.xen.trace = mkEnableOption "Xen tracing";
+
   };
 
 

From 9c716aa71a694675686e560f047b35f3a51b8841 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Sun, 26 Apr 2020 16:52:21 +0100
Subject: [PATCH 143/183] pythonPackages.bluepy: init at 1.3.0

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

diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix
new file mode 100644
index 000000000000..8d247b41d277
--- /dev/null
+++ b/pkgs/development/python-modules/bluepy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkg-config
+, glib
+}:
+
+buildPythonPackage rec {
+  pname = "bluepy";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1v0wjy1rz0rbwghr1z3xhdm06lqn9iig6vr5j2wmymh3w6pysw9a";
+  };
+
+  buildInputs = [ glib ];
+  nativeBuildInputs = [ pkg-config ];
+
+  # tests try to access hardware
+  checkPhase = ''
+    $out/bin/blescan --help > /dev/null
+    $out/bin/sensortag --help > /dev/null
+    $out/bin/thingy52 --help > /dev/null
+  '';
+  pythonImportsCheck = [ "bluepy" ];
+
+  meta = with stdenv.lib; {
+    description = "Python interface to Bluetooth LE on Linux";
+    homepage = "https://github.com/IanHarvey/bluepy";
+    maintainers = with maintainers; [ georgewhewell ];
+    license = licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ddb4136f3672..45cf2f3c05b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -518,6 +518,8 @@ in {
 
   blivet = callPackage ../development/python-modules/blivet { };
 
+  bluepy = callPackage ../development/python-modules/bluepy { };
+
   boltons = callPackage ../development/python-modules/boltons { };
 
   bravia-tv = callPackage ../development/python-modules/bravia-tv { };

From 412bb5e04dd405c2d4822c0eadff269f573e33a0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Apr 2020 17:09:02 +0200
Subject: [PATCH 144/183] gitlab: support passing --rev to the `update-all`
 script

While it's already possible to invoke `update-data` with the `--rev`
argument, one still needs to run all later phases manually.

Fix this, by having `update-all` also accept a `--rev` argument, and
pass it down to `update-data`.

Also, make the help text a bit more usable, by suggesting the usual
versioning scheme used these times.
---
 pkgs/applications/version-management/gitlab/update.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index a2a3a6d05b7e..86ef1e9736cc 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -100,7 +100,7 @@ def cli():
 
 
 @cli.command('update-data')
-@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag')
+@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
 def update_data(rev: str):
     """Update data.nix"""
     repo = GitLabRepo()
@@ -227,10 +227,11 @@ def update_gitlab_workhorse():
         os.unlink(gitlab_workhorse_dir / fn)
 
 @cli.command('update-all')
+@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'')
 @click.pass_context
-def update_all(ctx):
+def update_all(ctx, rev: str):
     """Update all gitlab components to the latest stable release"""
-    ctx.invoke(update_data, rev='latest')
+    ctx.invoke(update_data, rev=rev)
     ctx.invoke(update_rubyenv)
     ctx.invoke(update_yarnpkgs)
     ctx.invoke(update_gitaly)

From 4c26ab4198b083f0647f1c0e64f985e211beff8f Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 21 Apr 2020 22:29:01 +0200
Subject: [PATCH 145/183] gitlab: update.py: invoke bundle lock manually

`bundix -l` doesn't work, as it treats bundler's warning about upgrading
the lockfile version as an error, so invoke `bundle lock` manually.
---
 pkgs/applications/version-management/gitlab/update.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 86ef1e9736cc..a128fd5bc409 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
+#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
 
 import click
 import click_log
@@ -135,6 +135,7 @@ def update_rubyenv():
         with open(rubyenv_dir / fn, 'w') as f:
             f.write(repo.get_file(fn, rev))
 
+    subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
     subprocess.check_output(['bundix'], cwd=rubyenv_dir)
 
 
@@ -174,6 +175,7 @@ def update_gitaly():
         with open(gitaly_dir / fn, 'w') as f:
             f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
 
+    subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir)
     subprocess.check_output(['bundix'], cwd=gitaly_dir)
 
     os.environ['GOROOT'] = ""

From d1902923fae5e0056ef69de5e6cf52b1573de225 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Apr 2020 17:19:11 +0200
Subject: [PATCH 146/183] gitlab: 12.8.8 -> 12.8.9

See
https://about.gitlab.com/releases/2020/04/14/critical-security-release-gitlab-12-dot-9-dot-3-released/
for details.
---
 .../version-management/gitlab/data.json          | 10 +++++-----
 .../version-management/gitlab/rubyEnv/Gemfile    |  2 +-
 .../gitlab/rubyEnv/Gemfile.lock                  | 16 ++++++++--------
 .../version-management/gitlab/rubyEnv/gemset.nix | 16 ++++++++--------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 8da56229a02c..c651e8bab92c 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "12.8.8",
-  "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb",
+  "version": "12.8.9",
+  "repo_hash": "07vayjy3020hapbdx2wiv91g9xrfmvngbyj05hs2p0p3gwj6g2a4",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.8-ee",
+  "rev": "v12.8.9-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.8",
+    "GITALY_SERVER_VERSION": "12.8.9",
     "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
-    "GITLAB_WORKHORSE_VERSION": "8.21.1"
+    "GITLAB_WORKHORSE_VERSION": "8.21.2"
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 20c713e8c39d..e8a58a6d59bb 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -163,7 +163,7 @@ gem 'diffy', '~> 3.1.0'
 gem 'diff_match_patch', '~> 0.1.0'
 
 # Application server
-gem 'rack', '~> 2.0.7'
+gem 'rack', '~> 2.0.9'
 
 group :unicorn do
   gem 'unicorn', '~> 5.4.1'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index a808e85e4337..4d7b3d32a6b8 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
     contracts (0.11.0)
     cork (0.3.0)
@@ -783,7 +783,7 @@ GEM
     public_suffix (4.0.3)
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.1.6)
-    rack (2.0.7)
+    rack (2.0.9)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.2.0)
@@ -854,17 +854,17 @@ GEM
       json
     recursive-open-struct (1.1.0)
     redis (4.1.3)
-    redis-actionpack (5.1.0)
-      actionpack (>= 4.0, < 7)
-      redis-rack (>= 1, < 3)
+    redis-actionpack (5.2.0)
+      actionpack (>= 5, < 7)
+      redis-rack (>= 2.1.0, < 3)
       redis-store (>= 1.1.0, < 2)
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
-    redis-rack (2.0.6)
-      rack (>= 1.5, < 3)
+    redis-rack (2.1.2)
+      rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
@@ -1325,7 +1325,7 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.10.0)
   pry-byebug (~> 3.5.1)
   pry-rails (~> 0.3.9)
-  rack (~> 2.0.7)
+  rack (~> 2.0.9)
   rack-attack (~> 6.2.0)
   rack-cors (~> 1.0.6)
   rack-oauth2 (~> 1.9.3)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index f92b72361df5..dec89c43a824 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -763,10 +763,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "1.1.6";
   };
   connection_pool = {
     groups = ["default"];
@@ -3501,10 +3501,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
+      sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk";
       type = "gem";
     };
-    version = "2.0.7";
+    version = "2.0.9";
   };
   rack-accept = {
     dependencies = ["rack"];
@@ -3803,10 +3803,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz";
+      sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3";
       type = "gem";
     };
-    version = "5.1.0";
+    version = "5.2.0";
   };
   redis-activesupport = {
     dependencies = ["activesupport" "redis-store"];
@@ -3836,10 +3836,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb";
+      sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413";
       type = "gem";
     };
-    version = "2.0.6";
+    version = "2.1.2";
   };
   redis-rails = {
     dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];

From b1f66bfcb2647f8269c74a4c91584f6baf0ac1d9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Apr 2020 17:19:36 +0200
Subject: [PATCH 147/183] gitlab-workhorse: 8.21.1 -> 8.21.2

---
 .../version-management/gitlab/gitlab-workhorse/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 491dd868dd93..dda678335675 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.21.1";
+  version = "8.21.2";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4";
+    sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";

From 81c34ec54fc55b86fca436e24b408a8487062442 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 20 Apr 2020 17:19:49 +0200
Subject: [PATCH 148/183] gitaly: 12.8.8 -> 12.8.9

---
 .../version-management/gitlab/gitaly/Gemfile.lock             | 2 +-
 .../applications/version-management/gitlab/gitaly/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index b41c78f3a3dc..e3f7865226a2 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -242,4 +242,4 @@ DEPENDENCIES
   webmock (~> 3.4.0)
 
 BUNDLED WITH
-   2.1.4
+   1.17.3
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 45e7db5be8e3..968b26632c72 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.8";
+  version = "12.8.9";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv";
+    sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh";
   };
 
   # Fix a check which assumes that hook files are writeable by their

From 3629975546bf7acd3d37ab30c6336de47fee5636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 09:30:45 +0100
Subject: [PATCH 149/183] dqlite: limit build to Linux

https://dqlite.io/docs/faq#are-windows-and-macos-supported
---
 pkgs/development/libraries/dqlite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index cbd59949b790..aed7dc59bcbc 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/CanonicalLtd/dqlite/";
     license = licenses.asl20;
     maintainers = with maintainers; [ joko wucke13 ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 7c7e76450b249ddab740746fc6e8ac81554b3a01 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 27 Apr 2020 02:11:10 -0700
Subject: [PATCH 150/183] nixos/azure-new: use local nixpkgs

---
 nixos/maintainers/scripts/azure-new/examples/basic/image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix
index 74b128151587..ad62dcd14a0b 100644
--- a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix
+++ b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix
@@ -1,5 +1,5 @@
 let
-  pkgs = (import <nixpkgs> {});
+  pkgs = (import ../../../../../../default.nix {});
   machine = import "${pkgs.path}/nixos/lib/eval-config.nix" {
     system = "x86_64-linux";
     modules = [

From 3b9b2f64ae75c552ff105c0c0fd9c56dc75c010b Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 21 Apr 2020 15:23:11 -0700
Subject: [PATCH 151/183] arc-theme: change fork, unmark as broken, v20190917
 -> v20200416

---
 pkgs/data/themes/arc/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
index 53e81b323dc1..14e1b248261a 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arc-theme";
-  version = "20190917";
+  version = "20200416";
 
   src = fetchFromGitHub {
-    owner  = "arc-design";
+    owner  = "jnsh";
     repo   = pname;
-    rev    = version;
-    sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa";
+    rev    = "0779e1ca84141d8b443cf3e60b85307a145169b6";
+    sha256 = "1ddyi8g4rkd4mxadjvl66wc0lxpa4qdr98nbbhm5abaqfs2yldd4";
   };
 
   nativeBuildInputs = [
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-gnome-shell" # 3.36 not supported
+    "--disable-cinnamon" # not equipped to test
     "--disable-unity"
   ];
 
@@ -44,10 +45,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell";
-    homepage    = "https://github.com/arc-design/arc-theme";
+    homepage    = "https://github.com/jnsh/arc-theme";
     license     = licenses.gpl3;
     maintainers = with maintainers; [ simonvandel romildo ];
     platforms   = platforms.linux;
-    broken = true; # since libsass 3.6.3
   };
 }

From 1d23950b5f019ed30f2ed4dfe8fb1f87c7ebc314 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Mon, 27 Apr 2020 12:01:29 +0200
Subject: [PATCH 152/183] puredata: 0.49-0 -> 0.50-2

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

diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 9880a65d0cac..4b221cd1a76b 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   pname = "puredata";
-  version = "0.49-0";
+  version = "0.50-2";
 
   src = fetchurl {
     url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
-    sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j";
+    sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5";
   };
 
   nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];

From eac6c63db1a1783ef8cfd4921229185e34f51032 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:37:45 +0200
Subject: [PATCH 153/183] hidapi: request libusb1 directly

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

diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 28e96244ba5c..11cdd0ab7e0c 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1
 , darwin }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3316b446b9ad..668ef2561df6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12141,9 +12141,7 @@ in
 
   heyefi = haskellPackages.heyefi;
 
-  hidapi = callPackage ../development/libraries/hidapi {
-    libusb = libusb1;
-  };
+  hidapi = callPackage ../development/libraries/hidapi { };
 
   highfive = callPackage ../development/libraries/highfive { };
 

From d0b9aa6fa28b55983e7cf2fa00f68b95d50f9ff8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:38:18 +0200
Subject: [PATCH 154/183] usbredir: request libusb1 directly

Also, fix the website there, and tidy up the spice-gtk derivation, which
makes use of libusb1 too.
---
 .../libraries/spice-gtk/default.nix           | 50 ++++++++++---------
 .../libraries/usbredir/default.nix            |  7 ++-
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f418ecda89e6..22370cee448e 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,35 +1,36 @@
 { stdenv
 , fetchurl
-, pkgconfig
+, acl
+, cyrus_sasl
+, docbook_xsl
+, epoxy
+, gettext
+, gobject-introspection
+, gst_all_1
+, gtk-doc
+, gtk3
+, json-glib
+, libcacard
+, libdrm
+, libjpeg_turbo
+, libopus
+, libsoup
+, libusb1
+, lz4
 , meson
 , ninja
+, openssl
+, perl
+, phodav
+, pixman
+, pkgconfig
+, polkit
 , python3
 , spice-protocol
-, gettext
-, openssl
-, pixman
-, gobject-introspection
-, libjpeg_turbo
-, zlib
-, cyrus_sasl
 , usbredir
-, libsoup
-, polkit
-, acl
 , usbutils
 , vala
-, gtk3
-, epoxy
-, libdrm
-, gst_all_1
-, phodav
-, libopus
-, gtk-doc
-, json-glib
-, lz4
-, libcacard
-, perl
-, docbook_xsl
+, zlib
 , withPolkit ? true
 }:
 
@@ -99,9 +100,10 @@ stdenv.mkDerivation rec {
     libcacard
     libdrm
     libjpeg_turbo
+    libopus
+    libusb1
     lz4
     openssl
-    libopus
     phodav
     pixman
     spice-protocol
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 79cac7384987..2ac7c823e22a 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb }:
+{ stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "usbredir";
@@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb ];
-  propagatedBuildInputs = [ libusb ];
+  propagatedBuildInputs = [ libusb1 ];
 
   outputs = [ "out" "dev" ];
 
   meta = with stdenv.lib; {
     description = "USB traffic redirection protocol";
-    homepage = "http://spice-space.org/page/UsbRedir";
+    homepage = "https://www.spice-space.org/usbredir.html";
     license = licenses.lgpl21;
 
     maintainers = [ maintainers.offline ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 668ef2561df6..1fe75fa63915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14793,9 +14793,7 @@ in
 
   ustr = callPackage ../development/libraries/ustr { };
 
-  usbredir = callPackage ../development/libraries/usbredir {
-    libusb = libusb1;
-  };
+  usbredir = callPackage ../development/libraries/usbredir { };
 
   uthash = callPackage ../development/libraries/uthash { };
 

From 88048e3213e45b586abb9deae4c696cf6b8f1d42 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:39:32 +0200
Subject: [PATCH 155/183] brickd: request libusb1 directly

---
 pkgs/servers/brickd/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index b6c5b2a60af3..4b18e73284f9 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} :
+{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} :
 
 let
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb pmutils udev ];
+  buildInputs = [ libusb1 pmutils udev ];
 
   # shell thing didn't work so i replaced it using nix
   prePatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fe75fa63915..0dc77f5165fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5874,9 +5874,7 @@ in
 
   briss = callPackage ../tools/graphics/briss { };
 
-  brickd = callPackage ../servers/brickd {
-    libusb = libusb1;
-  };
+  brickd = callPackage ../servers/brickd { };
 
   bully = callPackage ../tools/networking/bully {
     openssl = openssl_1_0_2;

From f3a5fd548a76282b0fd808e118b09baa680105e3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:42:01 +0200
Subject: [PATCH 156/183] yubikey-personalization: request libusb1 directly

---
 pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 41cb53d9d3ba..5ef828762f64 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }:
+{ stdenv, fetchurl, pkgconfig, libusb1, libyubikey, json_c }:
 
 stdenv.mkDerivation rec {
   pname = "yubikey-personalization";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb libyubikey json_c ];
+  buildInputs = [ libusb1 libyubikey json_c ];
 
   configureFlags = [
     "--with-backend=libusb-1.0"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0dc77f5165fd..c14ba92ce5ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15062,9 +15062,7 @@ in
 
   yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { };
 
-  yubikey-personalization = callPackage ../tools/misc/yubikey-personalization {
-    libusb = libusb1;
-  };
+  yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
 
   yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
 

From 2c621ff4f4ad4eb2467fc9f98bab327a25f2e3ac Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:43:07 +0200
Subject: [PATCH 157/183] cups: request libusb1 directly

---
 pkgs/misc/cups/default.nix      | 6 +++---
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index f229ced8936d..b16c0645cda8 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -13,7 +13,7 @@
 , acl
 , gmp
 , darwin
-, libusb ? null
+, libusb1 ? null
 , gnutls ? null
 , avahi ? null
 , libpaper ? null
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig removeReferencesTo ];
 
-  buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ]
+  buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ]
     ++ optionals stdenv.isLinux [ avahi pam dbus ]
     ++ optional enableSystemd systemd
     # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change.
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     "--enable-dbus"
     "--enable-pam"
     "--with-dbusdir=${placeholder "out"}/share/dbus-1"
-  ] ++ optional (libusb != null) "--enable-libusb"
+  ] ++ optional (libusb1 != null) "--enable-libusb"
     ++ optional (gnutls != null) "--enable-ssl"
     ++ optional (avahi != null) "--enable-avahi"
     ++ optional (libpaper != null) "--enable-libpaper"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c14ba92ce5ef..d2b58e1323d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25191,9 +25191,7 @@ in
 
   clinfo = callPackage ../tools/system/clinfo { };
 
-  cups = callPackage ../misc/cups {
-    libusb = libusb1;
-  };
+  cups = callPackage ../misc/cups { };
 
   cups-filters = callPackage ../misc/cups/filters.nix { };
 

From f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:50:38 +0200
Subject: [PATCH 158/183] cnijfilter_4_00: request libusb1 directly

---
 .../cups/drivers/cnijfilter_4_00/default.nix  | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index 679d89069948..9b328c20b713 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchzip,
   autoconf, automake, libtool,
   cups, popt, libtiff, libpng,
-  ghostscript, glib, libusb, libxml2 }:
+  ghostscript, glib, libusb1, libxml2 }:
 
 /* this derivation is basically just a transcription of the rpm .spec
    file included in the tarball */
 
-let arch = 
+let arch =
   if stdenv.hostPlatform.system == "x86_64-linux" then "64"
     else if stdenv.hostPlatform.system == "i686-linux" then "32"
     else throw "Unsupported system ${stdenv.hostPlatform.system}";
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ autoconf libtool automake
                   cups popt libtiff libpng
-                  ghostscript glib libusb libxml2 ];
+                  ghostscript glib libusb1 libxml2 ];
 
   # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter
   patches = [
@@ -53,10 +53,10 @@ in stdenv.mkDerivation {
 
   configurePhase = ''
     cd libs
-    ./autogen.sh --prefix=$out 
+    ./autogen.sh --prefix=$out
 
     cd ../bscc2sts
-    ./autogen.sh 
+    ./autogen.sh
 
     cd ../cnijnpr
     ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib
@@ -68,25 +68,25 @@ in stdenv.mkDerivation {
     ./autogen.sh --prefix=$out --enable-progpath=$out/bin
 
     cd ../pstocanonij
-    ./autogen.sh --prefix=$out --enable-progpath=$out/bin 
+    ./autogen.sh --prefix=$out --enable-progpath=$out/bin
 
     cd ../backend
     ./autogen.sh --prefix=$out
 
     cd ../backendnet
-    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin 
+    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin
 
     cd ../cmdtocanonij
     ./autogen.sh --prefix=$out --datadir=$out/share
 
     cd ../cnijbe
-    ./autogen.sh --prefix=$out --enable-progpath=$out/bin 
+    ./autogen.sh --prefix=$out --enable-progpath=$out/bin
 
     cd ../lgmon2
     substituteInPlace src/Makefile.am \
         --replace /usr/include/libusb-1.0 \
-                  ${libusb.dev}/include/libusb-1.0
-    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin 
+                  ${libusb1.dev}/include/libusb-1.0
+    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin
 
     cd ..;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b58e1323d6..6ead4f47408e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25239,9 +25239,7 @@ in
   # this driver ships with pre-compiled 32-bit binary libraries
   cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
 
-  cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 {
-    libusb = libusb1;
-  };
+  cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
 
   cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
     libusb = libusb1;

From d0e4ecb182bb2edc890c238abc6055701bcadddb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:53:01 +0200
Subject: [PATCH 159/183] cnijfilter2: request libusb1 directly

---
 pkgs/misc/cups/drivers/cnijfilter2/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 323163bed331..b04ef89d215c 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool
+{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool
 , withDebug ? false }:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    cups automake autoconf glib libxml2 libusb libtool
+    cups automake autoconf glib libxml2 libusb1 libtool
   ];
 
   # lgmon3's --enable-libdir flag is used soley for specifying in which
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       cd lgmon3
       substituteInPlace src/Makefile.am \
         --replace /usr/include/libusb-1.0 \
-                  ${libusb.dev}/include/libusb-1.0
+                  ${libusb1.dev}/include/libusb-1.0
       ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
                    --datadir=$out/share \
                    --enable-libdir=/var/cache/cups
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ead4f47408e..7050a0b9ba39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25241,9 +25241,7 @@ in
 
   cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
 
-  cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
-    libusb = libusb1;
-  };
+  cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { };
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 

From dd03e76f61889409273b1f5527c52092783f6bf4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:55:18 +0200
Subject: [PATCH 160/183] stlink: inline libusb-static

This is a stlink-specific detail, and doesn't need to be in
top-level.nix
---
 pkgs/development/tools/misc/stlink/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix                |  5 +----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index c59847b1e0f7..0aa8d07f765f 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,9 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, libusb1 }:
 
-# IMPORTANT: You need permissions to access the stlink usb devices. 
+let
+  # The Darwin build of stlink explicitly refers to static libusb.
+  libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1;
+
+# IMPORTANT: You need permissions to access the stlink usb devices.
 # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "stlink";
   version = "1.6.0";
 
@@ -14,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
   };
 
-  buildInputs = [ cmake libusb1 ];
+  buildInputs = [ cmake libusb1' ];
   patchPhase = ''
     sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
     sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7050a0b9ba39..d735aa94b7a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14614,10 +14614,7 @@ in
 
   stfl = callPackage ../development/libraries/stfl { };
 
-  stlink = callPackage ../development/tools/misc/stlink {
-    # The Darwin build of stlink explicitly refers to static libusb.
-    libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1;
-  };
+  stlink = callPackage ../development/tools/misc/stlink { };
 
   steghide = callPackage ../tools/security/steghide {};
 

From 4f27b45bb5884c4943ad1f9d9e62b2e64d2bb74d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:56:39 +0200
Subject: [PATCH 161/183] stlink: cmake is a nativeBuildInput

---
 pkgs/development/tools/misc/stlink/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 0aa8d07f765f..7793d9185e75 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -18,7 +18,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
   };
 
-  buildInputs = [ cmake libusb1' ];
+  buildInputs = [ libusb1' ];
+  nativeBuildInputs = [ cmake ];
   patchPhase = ''
     sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
     sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt

From ce6dbccdfb0f111097b6d986f1e38dc26f78f319 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Mon, 2 Dec 2019 05:07:43 +0000
Subject: [PATCH 162/183] ocamlPackages.bigstring: init at 0.2

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

diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix
new file mode 100644
index 000000000000..c74676e4a1eb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bigstring/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildDunePackage }:
+
+buildDunePackage rec {
+  pname = "bigstring";
+  version = "0.2";
+
+  minimumOCamlVersion = "4.03";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "ocaml-bigstring";
+    rev = version;
+    sha256 = "0ypdf29cmwmjm3djr5ygz8ls81dl41a4iz1xx5gbcdpbrdiapb77";
+  };
+
+  doCheck = true;
+
+  meta = with lib; {
+    homepage = https://github.com/c-cube/ocaml-bigstring;
+    description = "Bigstring built on top of bigarrays, and convenient functions";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.alexfmpe ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index cef4e9130260..14664fbedd7e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -75,6 +75,8 @@ let
 
     bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { };
 
+    bigstring = callPackage ../development/ocaml-modules/bigstring { };
+
     biocaml = callPackage ../development/ocaml-modules/biocaml { };
 
     bistro = callPackage ../development/ocaml-modules/bistro { };

From c17800c081b84b5e350a74b9f59b121ecee7863d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Apr 2020 12:29:05 +0200
Subject: [PATCH 163/183] =?UTF-8?q?zsh-powerlevel10k:=20v1.5.0=20=E2=86=92?=
 =?UTF-8?q?=20v1.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes since the last release

    Wizard
        Configuration wizard now reacts to terminal size changes in real time and can function at much smaller terminal dimensions.
        Configs with prompt_char now have vi_mode disabled by default.
        Generated configs now unset DEFAULT_USER.
        Classic and Rainbow configs now set POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND. This makes it easier to define 3-line prompt.

    New parameters
        If POWERLEVEL9K_CONFIG_FILE is set, configuration wizard will write configs to the specified location instead of the default ${ZDOTDIR:-~}/.p10k.zsh.

    gitstatus
        Support older macOS versions (at least El Capitan; even older versions might work).
        Support Linux on armv6, i386 and i686.
        Support cygwin and msys2 on i686.
        macOS builds now use iconv from Homebrew.
        gitstatusd binaries are now being built with https://github.com/romkatv/gitstatus/blob/release/mbuild.

    Misc
        The default icon for proxy segment is now ↔ instead of ⮂. The old icon is missing in many fonts.

    Bug fixes
        gitstatus once again works on 64-bit Linux without glibc.
        Instant prompt no longer gets gradually slower over time when XDG_HOME_CACHE is on a slow filesystem.
        Instant prompt no longer prints spurious erros when XDG_HOME_CACHE is on NTFS.
        The old-style (and discouraged) custom prompts now work on zsh 5.3.1.
        Configuration wizard once again presents "extra icons" and "fluent prompt" options when using 12-hour time format.
---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 7fac0fb8ab8a..3b117d4a1ab8 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj";
+    sha256 = "1v6lwjlc4qrxfv1yjy31xh59ayf7jprm3y87l75d08pzj1v4lsj5";
   };
 
   patches = [

From b53cabcfedc4077e9bdba6ebc7824ecd381c1994 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Apr 2020 12:33:52 +0200
Subject: [PATCH 164/183] =?UTF-8?q?gitstatus:=20unstable-2020-03-15=20?=
 =?UTF-8?q?=E2=86=92=20unstable-2020-04-21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../version-management/git-and-tools/gitstatus/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index 26b736b8b6fa..eab382386ef6 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "gitstatus";
-  version = "unstable-2020-03-15";
+  version = "unstable-2020-04-21";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "gitstatus";
-    rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c";
-    sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00";
+    rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3";
+    sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f";
   };
 
   buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];

From 8f5e4d1b63f476f5a596f00f3bf59d72ba54e654 Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Mon, 27 Apr 2020 12:57:17 +0200
Subject: [PATCH 165/183] gitlab-runner: 12.10.0 -> 12.10.1 (#86100)

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index b18bea0c907f..7c7862dbe3bb 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "12.10.0";
+  version = "12.10.1";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "1a2cfr72b15h3ymxf69a0inb4amfxivdhfaj711wgyvcf5ymnbsv";
+    sha256 = "0xs0cnkqzmkbj8488s9kyc0m00g3n8vq9wplb99wrax86zs8dyw9";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "18if2xbkldpn0bwfyk6bgbdl9rdg4rjxc0im6lclwcgpbmslwx5r";
+    sha256 = "1mcz9a44pa8wx8hk2x7rgp5brbw7a71dqilfrfchnjkg2c9q7x1q";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0bsd3dk2fi21klqwzw8c181gv61qxbd32lj6mhkj9liz4flarhmv";
+    sha256 = "1xvkr3zhn085mz7k3xbz7y5q9yjbmgp1h1sp3a2w27jmpmhl32zm";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 7516cc722614d24890bada6d3ada1a30c86ecfd4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 10:10:25 +1000
Subject: [PATCH 166/183] openshift: use installShellFiles

---
 .../applications/networking/cluster/openshift/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index a9b0ed3fcb59..bcd259b138f7 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux
-, coreutils, kerberos, clang
+, coreutils, kerberos, clang, installShellFiles
 , components ? [
   "cmd/oc"
   "cmd/openshift"
@@ -35,7 +35,7 @@ in buildGoPackage rec {
 
   buildInputs = [ kerberos ];
 
-  nativeBuildInputs = [ which rsync go-bindata clang ];
+  nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ];
 
   patchPhase = ''
     patchShebangs ./hack
@@ -74,8 +74,8 @@ in buildGoPackage rec {
   installPhase = ''
     mkdir -p $bin/bin
     cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
-    install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/*
-    install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/*
+    installShellCompletion --bash contrib/completions/bash/*
+    installShellCompletion --zsh contrib/completions/zsh/*
   '';
 
   meta = with stdenv.lib; {

From bd6b2318c3881647a3cc179fdff92302661c9f84 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 10:10:26 +1000
Subject: [PATCH 167/183] prometheus-alertmanager: use installShellFiles

---
 pkgs/servers/monitoring/prometheus/alertmanager.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index de6d834c4d66..9074c19e1091 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -1,4 +1,4 @@
-{ stdenv, go, buildGoPackage, fetchFromGitHub }:
+{ stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "alertmanager";
@@ -24,9 +24,11 @@ buildGoPackage rec {
        -X ${t}.GoVersion=${stdenv.lib.getVersion go}
   '';
 
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall = ''
-    mkdir -p $bin/etc/bash_completion.d
-    $NIX_BUILD_TOP/go/bin/amtool --completion-script-bash > $bin/etc/bash_completion.d/amtool_completion.sh
+    $bin/bin/amtool --completion-script-bash > amtool.bash
+    installShellCompletion amtool.bash
   '';
 
   meta = with stdenv.lib; {

From b83b2591dd7fa3358d58532defc37c08df016d2f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 10:10:26 +1000
Subject: [PATCH 168/183] aptly: use installShellFiles

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

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index c163fdad3a1e..792b12688aaf 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg, bzip2, xz, graphviz }:
+{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }:
 
 let
 
@@ -29,11 +29,10 @@ buildGoPackage {
 
   goPackagePath = "github.com/aptly-dev/aptly";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ installShellFiles makeWrapper ];
 
   postInstall = ''
-    mkdir -p $bin/share/bash-completion/completions
-    ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
+    installShellCompletion --bash ${aptlyCompletionSrc}/aptly
     wrapProgram "$bin/bin/aptly" \
       --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
   '';

From 481c7bbd718d0946870914a6f77be11f337c4fdb Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 19:30:47 +1000
Subject: [PATCH 169/183] cloudfoundry-cli: use installShellFiles

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

diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index ab746c9c530a..55d9854d7926 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "cloudfoundry-cli";
@@ -15,6 +15,8 @@ buildGoPackage rec {
     sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq";
   };
 
+  nativeBuildInputs = [ installShellFiles ];
+
   makeTarget = let hps = stdenv.hostPlatform.system; in
     if hps == "x86_64-darwin" then
       "out/cf-cli_osx"
@@ -33,7 +35,7 @@ buildGoPackage rec {
 
   installPhase = ''
     install -Dm555 out/cf "$bin/bin/cf"
-    install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
+    installShellCompletion --bash "$src/ci/installers/completion/cf"
   '';
 
   meta = with stdenv.lib; {

From cef17fb6eef2eec6636a786c575186586cb56cba Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:03:23 +1000
Subject: [PATCH 170/183] heptio-ark: use excludedPackages

---
 pkgs/applications/networking/cluster/heptio-ark/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index 21f4011f0706..aa86dcbeb241 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv";
   };
 
-  postInstall = "rm $bin/bin/issue-template-gen";
+  excludedPackages = [ "issue-template-gen" ];
 
   meta = with stdenv.lib; {
     description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes";

From 16b418177ced67fa7b9b50fa3fa76a7a77486246 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:06:45 +1000
Subject: [PATCH 171/183] git-lfs1: use subPackages

---
 pkgs/applications/version-management/git-lfs/1.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 0e0d75b0919c..5b2a9906a4f8 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   pname = "git-lfs";
   version = "1.5.6";
   rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0";
-  
+
   goPackagePath = "github.com/git-lfs/git-lfs";
 
   src = fetchFromGitHub {
@@ -14,8 +14,7 @@ buildGoPackage rec {
     sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d";
   };
 
-  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
-  excludedPackages = [ "test" ];
+  subPackages = [ "." ];
 
   preBuild = ''
     pushd go/src/github.com/git-lfs/git-lfs
@@ -23,9 +22,6 @@ buildGoPackage rec {
     popd
   '';
 
-  postInstall = ''
-    rm -v $bin/bin/{man,script}
-  '';
   meta = with stdenv.lib; {
     description = "Git extension for versioning large files";
     homepage    = "https://git-lfs.github.com/";

From 05683aceaef08906b8019c6714eb3843946c811a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:16:16 +1000
Subject: [PATCH 172/183] blockbook: use subPackages

---
 pkgs/servers/blockbook/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix
index b931e8cfcb20..b6a1887bf807 100644
--- a/pkgs/servers/blockbook/default.nix
+++ b/pkgs/servers/blockbook/default.nix
@@ -39,9 +39,7 @@ buildGoPackage rec {
     packr clean && packr
   '';
 
-  postInstall = ''
-    rm $bin/bin/{scripts,templates,trezor-common}
-  '';
+  subPackages = [ "." ];
 
   meta = with lib; {
     description = "Trezor address/account balance backend";
@@ -51,4 +49,3 @@ buildGoPackage rec {
     platforms = platforms.all;
   };
 }
-

From 09f4fec63c5da8eb06c46fd6cc4aabd0fb8694ac Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Apr 2020 12:01:10 +0100
Subject: [PATCH 173/183] emacs-packages: Expose manually packaged packages
 through emacsPackages.manualPackages

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 1853c7eb8ac1..d044ed800485 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -78,7 +78,7 @@ in lib.makeScope newScope (self: lib.makeOverridable ({
   // melpaStablePackages // { inherit melpaStablePackages; }
   // melpaPackages // { inherit melpaPackages; }
   // orgPackages // { inherit orgPackages; }
-  // manualPackages
+  // manualPackages // { inherit manualPackages; }
   // {
     inherit emacs melpaBuild trivialBuild;
     emacsWithPackages = emacsWithPackages self;

From 3e6aa7ba47d74d875967a632108bfa51510c6f49 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Apr 2020 12:18:13 +0100
Subject: [PATCH 174/183] emacsPackages.eopengrok: Fix build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 39148c8fc6e5..aee7e82cb240 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -105,6 +105,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        eopengrok = super.eopengrok.overrideAttrs (attrs: {
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         ess-R-data-view = super.ess-R-data-view.override {
           inherit (self.melpaPackages) ess ctable popup;
         };

From 716e320bcf0602d5a59d9188c7a8ea3f8bbe0105 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Apr 2020 12:18:30 +0100
Subject: [PATCH 175/183] emacsPackages.gerrit: Fix build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index aee7e82cb240..8307a2264af4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -441,6 +441,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        gerrit = super.gerrit.overrideAttrs (attrs: {
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         helm-rtags = fix-rtags super.helm-rtags;
 
         mandoku = super.mandoku.overrideAttrs (attrs: {

From 15abc045440d47e432147e7ece0e452ad6358133 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Apr 2020 12:18:37 +0100
Subject: [PATCH 176/183] emacsPackages.gerrit-download: Fix build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 8307a2264af4..6e0b4834b8a0 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -446,6 +446,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        gerrit-download = super.gerrit-download.overrideAttrs (attrs: {
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         helm-rtags = fix-rtags super.helm-rtags;
 
         mandoku = super.mandoku.overrideAttrs (attrs: {

From e1d4b8e867e503a444549592fce4565f852cf29f Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Apr 2020 12:18:46 +0100
Subject: [PATCH 177/183] emacsPackages.github-pullrequest: Fix build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 6e0b4834b8a0..3d16ef9baf8a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -451,6 +451,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+        github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: {
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         helm-rtags = fix-rtags super.helm-rtags;
 
         mandoku = super.mandoku.overrideAttrs (attrs: {

From bcbfef7592165b9926edd67fc08a4432ded611a9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 27 Apr 2020 12:18:57 +0100
Subject: [PATCH 178/183] emacsPackages.jist: Fix build

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 3d16ef9baf8a..fb6a42682998 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -458,6 +458,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
 
         helm-rtags = fix-rtags super.helm-rtags;
 
+        jist = super.jist.overrideAttrs (attrs: {
+          nativeBuildInputs =
+            (attrs.nativeBuildInputs or []) ++ [ external.git ];
+        });
+
         mandoku = super.mandoku.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =

From abe679b2ba76b9e9497d87f36920d6fff040b7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 10:18:13 +0100
Subject: [PATCH 179/183] kops: 1.16.0 -> 1.16.1

---
 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 4d2e406c0400..57e1fec2667b 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -72,7 +72,7 @@ in rec {
   };
 
   kops_1_16 = mkKops {
-    version = "1.16.0";
-    sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a";
+    version = "1.16.1";
+    sha256 = "08vy57ln0qar961sf9vbrh29f04qj5siqsfim1kqwvj5xrvwa39i";
   };
 }

From 4cc520ba0fcb460e42a04802982be1b8d3312773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Apr 2020 10:11:22 +0100
Subject: [PATCH 180/183] kops: remove old versions

---
 .../networking/cluster/kops/default.nix           | 15 ---------------
 pkgs/top-level/all-packages.nix                   |  7 ++++---
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 57e1fec2667b..3e1f63531bb1 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -51,21 +51,6 @@ in rec {
 
   mkKops = generic;
 
-  kops_1_12 = mkKops {
-    version = "1.12.3";
-    sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly";
-  };
-
-  kops_1_13 = mkKops {
-    version = "1.13.2";
-    sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
-  };
-
-  kops_1_14 = mkKops {
-    version = "1.14.1";
-    sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n";
-  };
-
   kops_1_15 = mkKops {
     version = "1.15.2";
     sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5de0e20fe135..97cb7e8f1e13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25438,11 +25438,12 @@ in
 
   kontemplate = callPackage ../applications/networking/cluster/kontemplate { };
 
+  # In general we only want keep the last three minor versions around that
+  # correspond to the last three supported kubernetes versions:
+  # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions
+  # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases
   inherit (callPackage ../applications/networking/cluster/kops {})
     mkKops
-    kops_1_12
-    kops_1_13
-    kops_1_14
     kops_1_15
     kops_1_16
     ;

From 45a09ec5bfade78db8b8f1cc21d2a9138e700b60 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 27 Apr 2020 08:10:35 -0400
Subject: [PATCH 181/183] slack: 4.4.{0,1} -> 4.4.2

---
 .../instant-messengers/slack/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index e9a795b59cdc..9cf436ff18f3 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -40,8 +40,13 @@ let
   throwSystem = throw "Unsupported system: ${system}";
 
   sha256 = {
-    x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd";
-    x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12";
+    x86_64-darwin = "0z731q00bwljlcmbjwqphyys7skqms1vg87pyi4nsvjmc7kjx7qg";
+    x86_64-linux = "0wrs0i2bqv21ivy8s88khbww28b3gsw4abbbbjc76mqma9b0bajs";
+  }.${system} or throwSystem;
+
+  version = {
+    x86_64-darwin = "4.4.2";
+    x86_64-linux = "4.4.2";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {
@@ -53,8 +58,7 @@ let
   };
 
   linux = stdenv.mkDerivation rec {
-    inherit pname meta;
-    version = "4.4.0";
+    inherit pname meta version;
     src = fetchurl {
       url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
       inherit sha256;
@@ -140,8 +144,7 @@ let
   };
 
   darwin = stdenv.mkDerivation rec {
-    inherit pname meta;
-    version = "4.4.1";
+    inherit pname meta version;
 
     phases = [ "installPhase" ];
 

From 31ead7d030b235fcbb7b6a6d92600f23702c7505 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 23 Apr 2020 11:44:55 +0200
Subject: [PATCH 182/183] srcOnly: rename buildInputs to nativeBuildInputs

The only reason to pass build inputs is to extend the unpackPhase with
custom unpack commands. Eg: add "unrar" to unpack rar sources. And those
should really be passed as native build inputs. Why? Because
nativeBuildInputs is for dependencies that are used at build time but
will not propagate as runtime dependencies. And also, cross-compilation.
---
 pkgs/build-support/src-only/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index 8ca262a998b2..c721fdf40c69 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -11,11 +11,21 @@
 , src
 , stdenv ? orig.stdenv
 , patches ? []
-, buildInputs ? []
-, ... # needed when passing an existing derivation
+, # deprecated, use the nativeBuildInputs
+  buildInputs ? []
+, # used to pass extra unpackers
+  nativeBuildInputs ? []
+, # needed when passing an existing derivation
+  ...
 }:
 stdenv.mkDerivation {
-  inherit src buildInputs patches name;
+  inherit
+    buildInputs
+    name
+    nativeBuildInputs
+    patches
+    src
+    ;
   installPhase = "cp -r . $out";
   phases = ["unpackPhase" "patchPhase" "installPhase"];
 }

From 73e46470852753b3f3e22bf79bd4230ff0e1cdc2 Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Fri, 17 Apr 2020 18:23:31 +0200
Subject: [PATCH 183/183] teams: fixing pulseaudio access

---
 .../instant-messengers/teams/default.nix      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index 63d922ab2994..6b5acd8344a8 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -52,6 +52,28 @@ stdenv.mkDerivation rec {
     ln -s $out/opt/teams/teams $out/bin/
   '';
 
+  dontAutoPatchelf = true;
+
+  # Includes runtimeDependencies in the RPATH of the included Node modules
+  # so that dynamic loading works. We cannot use directly runtimeDependencies
+  # here, since the libraries from runtimeDependencies are not propagated 
+  # to the dynamically loadable node modules because of a condition in
+  # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) 
+  # instead of EXEC or INTERP it expects.
+  # Fixes: https://github.com/NixOS/nixpkgs/issues/85449
+  postFixup = ''
+    autoPatchelf "$out"
+
+    runtime_rpath="${lib.makeLibraryPath runtimeDependencies}"
+
+    for mod in $(find "$out/opt/teams" -name '*.node'); do
+      mod_rpath="$(patchelf --print-rpath "$mod")"
+
+      echo "Adding runtime dependencies to RPATH of Node module $mod"
+      patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod"
+    done;
+  '';
+
   meta = with stdenv.lib; {
     description = "Microsoft Teams";
     homepage = "https://teams.microsoft.com";