From 0931014baf9a4db293f8aa13c86dc7f1c0aa9395 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Sat, 26 Mar 2022 14:45:12 -0500
Subject: [PATCH 01/53] iso-image: slim down UEFI El Torito image

UEFI firmware does not have to be able to read ISO9660 filesystems, so
the El Torito mechanism provides a way to specify an embedded FAT32
image which contains files the UEFI firmware itself must be able to
read, such as UEFI executables. Once GRUB starts and reads its
configuration, it can access the ISO9660 filesystem to load other files.

This change removes the unused kernel, initrd, and GRUB font files from
the El Torito image, but keeps the GRUB configuration and UEFI
executables. These files have been present since EFI support was
originally introduced in commit 097c656. Other distribution ISOs, such
as Ubuntu 20.04, Fedora 35, and Windows 10 work this way too. This saves
24MiB on x86_64 and 61MiB on aarch64 ISOs.
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 860e240b43d..1eaa940afb1 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -369,10 +369,10 @@ let
     ${lib.optionalString (refindBinary != null) ''
     # GRUB apparently cannot do "chainloader" operations on "CD".
     if [ "\$root" != "cd0" ]; then
-      # Force root to be the FAT partition
-      # Otherwise it breaks rEFInd's boot
-      search --set=root --no-floppy --fs-uuid 1234-5678
       menuentry 'rEFInd' --class refind {
+        # Force root to be the FAT partition
+        # Otherwise it breaks rEFInd's boot
+        search --set=root --no-floppy --fs-uuid 1234-5678
         chainloader (\$root)/EFI/boot/${refindBinary}
       }
     fi
@@ -400,10 +400,8 @@ let
     #   dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i)
     ''
       mkdir ./contents && cd ./contents
-      cp -rp "${efiDir}"/EFI .
-      mkdir ./boot
-      cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \
-        "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/
+      mkdir -p ./EFI/boot
+      cp -rp "${efiDir}"/EFI/boot/{grub.cfg,*.efi} ./EFI/boot
 
       # Rewrite dates for everything in the FS
       find . -exec touch --date=2000-01-01 {} +
@@ -421,11 +419,11 @@ let
       faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out"
 
       # Force a fixed order in mcopy for better determinism, and avoid file globbing
-      for d in $(find EFI boot -type d | sort); do
+      for d in $(find EFI -type d | sort); do
         faketime "2000-01-01 00:00:00" mmd -i "$out" "::/$d"
       done
 
-      for f in $(find EFI boot -type f | sort); do
+      for f in $(find EFI -type f | sort); do
         mcopy -pvm -i "$out" "$f" "::/$f"
       done
 

From 7387c69d8441606758febcbf18bbc7a066bd24ce Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Mon, 2 May 2022 02:47:38 +0000
Subject: [PATCH 02/53] goconst: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix
index 987a3285f8b..27e43fec999 100644
--- a/pkgs/development/tools/goconst/default.nix
+++ b/pkgs/development/tools/goconst/default.nix
@@ -1,23 +1,22 @@
-{ buildGoPackage
-, lib
-, fetchFromGitHub
-}:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "goconst";
-  version = "1.4.0";
-
-  goPackagePath = "github.com/jgautheron/goconst";
+  version = "1.5.1";
 
   excludedPackages = [ "tests" ];
 
   src = fetchFromGitHub {
     owner = "jgautheron";
     repo = "goconst";
-    rev = version;
-    sha256 = "0jp9vg5l4wcvnf653h3d8ay2n7y717l9z34rls1vrsaf0qdf1r6v";
+    rev = "v${version}";
+    sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE=";
   };
 
+  vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+
+  ldflags = [ "-s" "-w" ];
+
   meta = with lib; {
     description = "Find in Go repeated strings that could be replaced by a constant";
     homepage = "https://github.com/jgautheron/goconst";

From be5b57be1b3554ab554f9d9acd03169a81b14c59 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 10 May 2022 21:31:23 +0200
Subject: [PATCH 03/53] hydra-unstable: remove old assertion

I don't think nixpkgs will build with nix 1 anyway, so let's just remove this.
---
 pkgs/development/tools/misc/hydra/common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 2b0775afc37..5f99403218a 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -15,10 +15,6 @@
 
 with stdenv;
 
-if lib.versions.major nix.version == "1"
-  then throw "This Hydra version doesn't support Nix 1.x"
-else
-
 let
   perlDeps = buildEnv {
     name = "hydra-perl-deps";

From 33b01d51040d917513d81b42c3d4048a8b0cd9d1 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 10 May 2022 21:35:11 +0200
Subject: [PATCH 04/53] hydra-unstable: drop with stdenv from top

It doesn't appear to be needed and can make it harder to read the build description.
---
 pkgs/development/tools/misc/hydra/common.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 5f99403218a..2314f5f9f64 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -13,8 +13,6 @@
 , glibcLocales
 }:
 
-with stdenv;
-
 let
   perlDeps = buildEnv {
     name = "hydra-perl-deps";

From 292c63a5d6d107d15b09099a93af8b98c9f90243 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 10 May 2022 21:47:01 +0200
Subject: [PATCH 05/53]  hydra: remove multi-version support

This is a legacy of when a "stable" version of hydra existed, and this
probably won't be coming back.

This also removes some obsolete bits which have no effect on the
result of evaluation.

Unlike the original approach in #157072, we're moving the common
expression to "unstable.nix" instead. This allow putting everything in
one commit, satisfies git's rename detection, and remains bisectable.

Co-Authored-By: Bernardo Meurer <bernardo@meurer.org>
Co-Authored-By: Linus Heckemann <git@sphalerite.org>
---
 pkgs/development/tools/misc/hydra/default.nix | 26 --------------
 .../misc/hydra/{common.nix => unstable.nix}   | 34 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 29 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/hydra/default.nix
 rename pkgs/development/tools/misc/hydra/{common.nix => unstable.nix} (84%)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
deleted file mode 100644
index 5289015d43b..00000000000
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, fetchFromGitHub, callPackage, nixVersions, nixosTests, fetchpatch }:
-
-{
-  hydra-unstable = callPackage ./common.nix {
-    version = "2022-02-07";
-    src = fetchFromGitHub {
-      owner = "NixOS";
-      repo = "hydra";
-      rev = "517dce285a851efd732affc084c7083aed2e98cd";
-      sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
-    };
-    patches = [
-      ./eval.patch
-      ./missing-std-string.patch
-      (fetchpatch {
-        url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
-        sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
-      })
-    ];
-    nix = nixVersions.nix_2_6;
-
-    tests = {
-      basic = nixosTests.hydra.hydra-unstable;
-    };
-  };
-}
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/unstable.nix
similarity index 84%
rename from pkgs/development/tools/misc/hydra/common.nix
rename to pkgs/development/tools/misc/hydra/unstable.nix
index 2314f5f9f64..7d3521702a7 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/unstable.nix
@@ -1,16 +1,20 @@
-{ stdenv, nix, perlPackages, buildEnv
+{ stdenv
+, lib
+, nix, perlPackages, buildEnv
 , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx_6
 , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
 , perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar
-, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
-, migration ? false, patches ? []
-, tests ? {}, mdbook
+, rpm, dpkg, cdrkit, pixz, boost, autoreconfHook
+, mdbook
 , foreman
 , python3
 , libressl
 , cacert
 , glibcLocales
+, fetchFromGitHub
+, fetchpatch
+, nixosTests
 }:
 
 let
@@ -88,8 +92,14 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "hydra";
+  version = "2022-02-07";
 
-  inherit stdenv src version patches;
+  src = fetchFromGitHub {
+    owner = "NixOS";
+    repo = "hydra";
+    rev = "517dce285a851efd732affc084c7083aed2e98cd";
+    sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
+  };
 
   buildInputs =
     [ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6
@@ -116,6 +126,15 @@ in stdenv.mkDerivation rec {
     libressl.nc
   ];
 
+  patches = [
+    ./eval.patch
+    ./missing-std-string.patch
+    (fetchpatch {
+      url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
+      sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
+    })
+  ];
+
   configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
 
   NIX_CFLAGS_COMPILE = "-pthread";
@@ -152,7 +171,10 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  passthru = { inherit perlDeps migration tests; };
+  passthru = {
+    inherit perlDeps;
+    tests.basic = nixosTests.hydra.hydra-unstable;
+  };
 
   meta = with lib; {
     description = "Nix-based continuous build system";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f432f8e438..e98ae93e1fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17830,8 +17830,7 @@ with pkgs;
 
   hwloc = callPackage ../development/libraries/hwloc {};
 
-  inherit (callPackage ../development/tools/misc/hydra { })
-    hydra-unstable;
+  hydra-unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };
 
   hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
 

From 3a7f7c1153ba73f21abf761f054aecd8f093f517 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 10 May 2022 21:52:13 +0200
Subject: [PATCH 06/53] hydra-unstable -> hydra_unstable

---
 maintainers/scripts/haskell/hydra-report.hs                   | 2 +-
 .../modules/services/continuous-integration/hydra/default.nix | 4 ++--
 nixos/tests/hydra/default.nix                                 | 2 +-
 pkgs/development/tools/misc/hydra/unstable.nix                | 2 +-
 pkgs/top-level/aliases.nix                                    | 3 ++-
 pkgs/top-level/all-packages.nix                               | 2 +-
 pkgs/top-level/release-haskell.nix                            | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs
index 360b9f2058d..6f154d90f06 100755
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@@ -1,6 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
-#! nix-shell -p hydra-unstable
+#! nix-shell -p hydra_unstable
 #! nix-shell -i runhaskell
 
 {-
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 90adab7fbf2..9440382e66a 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -99,8 +99,8 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.hydra-unstable;
-        defaultText = literalExpression "pkgs.hydra-unstable";
+        default = pkgs.hydra_unstable;
+        defaultText = literalExpression "pkgs.hydra_unstable";
         description = "The Hydra package.";
       };
 
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index 9fc787842d8..baf18afbc56 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -11,7 +11,7 @@ let
   inherit (import ./common.nix { inherit system; }) baseConfig;
 
   hydraPkgs = {
-    inherit (pkgs) hydra-unstable;
+    inherit (pkgs) hydra_unstable;
   };
 
   makeHydraTest = with pkgs.lib; name: package: makeTest {
diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix
index 7d3521702a7..e375a26b737 100644
--- a/pkgs/development/tools/misc/hydra/unstable.nix
+++ b/pkgs/development/tools/misc/hydra/unstable.nix
@@ -173,7 +173,7 @@ in stdenv.mkDerivation rec {
 
   passthru = {
     inherit perlDeps;
-    tests.basic = nixosTests.hydra.hydra-unstable;
+    tests.basic = nixosTests.hydra.hydra_unstable;
   };
 
   meta = with lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 31e4fa42250..c59baccc502 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -549,7 +549,8 @@ mapAliases ({
   holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01
   htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
   ht-rust = xh; # Added 2021-02-13
-  hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now"; # Added 2020-04-06
+  hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06
+  hydra-unstable = hydra_unstable; # added 2022-05-10
 
   ### I ###
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e98ae93e1fc..8e5503a43bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17830,7 +17830,7 @@ with pkgs;
 
   hwloc = callPackage ../development/libraries/hwloc {};
 
-  hydra-unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };
+  hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };
 
   hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
 
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index a1e72c90bea..21c54975a28 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -4,7 +4,7 @@
   https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
 
   To debug this expression you can use `hydra-eval-jobs` from
-  `pkgs.hydra-unstable` which prints the jobset description
+  `pkgs.hydra_unstable` which prints the jobset description
   to `stdout`:
 
   $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix

From 189a38576e13b61589deb3ebb8f3dc6db2890ff1 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Tue, 10 May 2022 21:54:07 +0200
Subject: [PATCH 07/53] hydra_unstable: apply nixpkgs-fmt

---
 .../development/tools/misc/hydra/unstable.nix | 95 ++++++++++++++++---
 1 file changed, 81 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix
index e375a26b737..36de9f886c1 100644
--- a/pkgs/development/tools/misc/hydra/unstable.nix
+++ b/pkgs/development/tools/misc/hydra/unstable.nix
@@ -1,11 +1,44 @@
 { stdenv
 , lib
-, nix, perlPackages, buildEnv
-, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx_6
-, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
-, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
-, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar
-, rpm, dpkg, cdrkit, pixz, boost, autoreconfHook
+, nix
+, perlPackages
+, buildEnv
+, makeWrapper
+, autoconf
+, automake
+, libtool
+, unzip
+, pkg-config
+, sqlite
+, libpqxx_6
+, top-git
+, mercurial
+, darcs
+, subversion
+, breezy
+, openssl
+, bzip2
+, libxslt
+, perl
+, postgresql
+, nukeReferences
+, git
+, boehmgc
+, nlohmann_json
+, docbook_xsl
+, openssh
+, gnused
+, coreutils
+, findutils
+, gzip
+, xz
+, gnutar
+, rpm
+, dpkg
+, cdrkit
+, pixz
+, boost
+, autoreconfHook
 , mdbook
 , foreman
 , python3
@@ -21,7 +54,8 @@ let
   perlDeps = buildEnv {
     name = "hydra-perl-deps";
     paths = with perlPackages; lib.closePropagation
-      [ ModulePluggable
+      [
+        ModulePluggable
         AuthenSASL
         CatalystActionREST
         CatalystAuthenticationStoreDBIxClass
@@ -90,7 +124,8 @@ let
         git
       ];
   };
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "hydra";
   version = "2022-02-07";
 
@@ -102,9 +137,24 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6
-      top-git mercurial darcs subversion breezy openssl bzip2 libxslt
-      perlDeps perl nix
+    [
+      makeWrapper
+      libtool
+      unzip
+      nukeReferences
+      sqlite
+      libpqxx_6
+      top-git
+      mercurial
+      darcs
+      subversion
+      breezy
+      openssl
+      bzip2
+      libxslt
+      perlDeps
+      perl
+      nix
       postgresql # for running the tests
       nlohmann_json
       boost
@@ -112,9 +162,26 @@ in stdenv.mkDerivation rec {
     ];
 
   hydraPath = lib.makeBinPath (
-    [ sqlite subversion openssh nix coreutils findutils pixz
-      gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
-    ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
+    [
+      sqlite
+      subversion
+      openssh
+      nix
+      coreutils
+      findutils
+      pixz
+      gzip
+      bzip2
+      xz
+      gnutar
+      unzip
+      git
+      top-git
+      mercurial /*darcs*/
+      gnused
+      breezy
+    ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ]
+  );
 
   nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ];
 

From 683097028d530c784a7bffc883e682de1a7de3e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 May 2022 23:45:01 +0200
Subject: [PATCH 08/53] evtx: init at 0.7.2

---
 pkgs/tools/security/evtx/default.nix | 31 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/security/evtx/default.nix

diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix
new file mode 100644
index 00000000000..51f706598fa
--- /dev/null
+++ b/pkgs/tools/security/evtx/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "evtx";
+  version = "0.7.2";
+
+  src = fetchFromGitHub {
+    owner = "omerbenamram";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-T165PZhjuX5tUENZoO6x1u2MpMQTfv9dGRmxyNY2ACg=";
+  };
+
+  cargoSha256 = "sha256-qcjJoXB0DV1Z5bhGrtyJzfWqE+tVWBOYMJEd+MWFcD8=";
+
+  postPatch = ''
+    # CLI tests will fail in the sandbox
+    rm tests/test_cli_interactive.rs
+  '';
+
+  meta = with lib; {
+    description = "Parser for the Windows XML Event Log (EVTX) format";
+    homepage = "https://github.com/omerbenamram/evtx";
+    license = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f432f8e438..26343ec331b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5376,6 +5376,8 @@ with pkgs;
 
   evil-winrm = callPackage ../tools/security/evil-winrm { };
 
+  evtx = callPackage ../tools/security/evtx { };
+
   luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup {
     ssh = openssh;
   };

From cc5ce889fde52ffb9146e181d8c3a5bb5c94eac0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 May 2022 23:45:14 +0200
Subject: [PATCH 09/53] python310Packages.evtx: init at 0.7.3

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

diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix
new file mode 100644
index 00000000000..1348282f98d
--- /dev/null
+++ b/pkgs/development/python-modules/evtx/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, rustPlatform
+}:
+
+buildPythonPackage rec {
+  pname = "evtx";
+  version = "0.7.3";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "omerbenamram";
+    repo = "pyevtx-rs";
+    rev = version;
+    sha256 = "sha256-59iEmgF1m+Yr5k4oxZGqMs5oMZxToUFYuwQDeLEQ2jY=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    sha256 = "sha256-Q2SpJohLSQCMYmx1ZMWZ7a/NC0lPsHkwxom00qVooNM=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "evtx"
+  ];
+
+  meta = with lib; {
+    description = "Bindings for evtx";
+    homepage = "https://github.com/omerbenamram/pyevtx-rs";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3fd57e228de..b6589fa3877 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2763,6 +2763,8 @@ in {
 
   evohome-async = callPackage ../development/python-modules/evohome-async { };
 
+  evtx = callPackage ../development/python-modules/evtx { };
+
   ewmh = callPackage ../development/python-modules/ewmh { };
 
   exdown = callPackage ../development/python-modules/exdown { };

From 44c0f780919cccf1ae7d15dcf648d9ba783b743e Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 9 May 2022 15:56:57 +0300
Subject: [PATCH 10/53] libraries/wlroots: enable strictDeps

---
 pkgs/development/libraries/wlroots/0.14.nix      | 1 +
 pkgs/development/libraries/wlroots/0.15.nix      | 1 +
 pkgs/development/libraries/wlroots/protocols.nix | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix
index 398a09ff2aa..7fe678cb624 100644
--- a/pkgs/development/libraries/wlroots/0.14.nix
+++ b/pkgs/development/libraries/wlroots/0.14.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   # $out for the library and $examples for the example programs (in examples):
   outputs = [ "out" "examples" ];
 
+  strictDeps = true;
   depsBuildBuild = [ pkg-config ];
 
   nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix
index ed3effaa540..7648ebe5d25 100644
--- a/pkgs/development/libraries/wlroots/0.15.nix
+++ b/pkgs/development/libraries/wlroots/0.15.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   # $out for the library and $examples for the example programs (in examples):
   outputs = [ "out" "examples" ];
 
+  strictDeps = true;
   depsBuildBuild = [ pkg-config ];
 
   nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];
diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix
index 0ec15840558..7fd0e40d075 100644
--- a/pkgs/development/libraries/wlroots/protocols.nix
+++ b/pkgs/development/libraries/wlroots/protocols.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr";
   };
 
+  strictDeps = true;
   checkInputs = [ wayland-scanner ];
 
   patchPhase = ''

From fd0740f4748ec543733cd9899ddaa1c7b07fab2a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Wed, 11 May 2022 21:20:20 +0300
Subject: [PATCH 11/53]  wdomirror: strictDeps

---
 pkgs/tools/wayland/wdomirror/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix
index 5c3b7ddbb72..5d69ce66f6d 100644
--- a/pkgs/tools/wayland/wdomirror/default.nix
+++ b/pkgs/tools/wayland/wdomirror/default.nix
@@ -6,7 +6,8 @@
 , pkg-config
 , wayland
 , wayland-protocols
-, fetchurl
+, fetchpatch
+, wayland-scanner
 }:
 
 stdenv.mkDerivation {
@@ -20,18 +21,19 @@ stdenv.mkDerivation {
     sha256 = "1fz0sajhdjqas3l6mpik8w1k15wbv65hgh9r9vdgfqvw5l6cx7jv";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
-
-  buildInputs = [ wayland ];
-
   patches = [
     # https://github.com/progandy/wdomirror/pull/7
-    (fetchurl {
+    (fetchpatch {
       url = "https://github.com/progandy/wdomirror/commit/142632208e9ea2b4a4ebd784532efdb8cad7b87c.patch";
-      hash = "sha256-z6/8q2vOtmlGFbDVG5BVWWbLQT8kBvJXT9/oZkWS9gw=";
+      hash = "sha256-MG71IEwRAjjacAkRoB7Tn45+FbY7LAqTDkVJkoWuQUU=";
     })
   ];
 
+  strictDeps = true;
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
+
+  buildInputs = [ wayland wayland-protocols ];
+
   installPhase = ''
     runHook preInstall
     install -m755 -D wdomirror $out/bin/wdomirror

From 947bc96c2d427baf56a7697ef867dc245e76333a Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 9 May 2022 17:18:15 +0300
Subject: [PATCH 12/53] pkgs/tools/wayland: enable strictDeps

---
 pkgs/tools/wayland/kanshi/default.nix               | 7 ++++++-
 pkgs/tools/wayland/oguri/default.nix                | 4 +++-
 pkgs/tools/wayland/slurp/default.nix                | 3 +++
 pkgs/tools/wayland/swaykbdd/default.nix             | 1 +
 pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 5 +++--
 pkgs/tools/wayland/wayland-utils/default.nix        | 1 +
 pkgs/tools/wayland/wev/default.nix                  | 4 ++++
 pkgs/tools/wayland/wl-clipboard-x11/default.nix     | 4 +++-
 pkgs/tools/wayland/wl-clipboard/default.nix         | 7 ++++---
 pkgs/tools/wayland/wl-color-picker/default.nix      | 3 +++
 pkgs/tools/wayland/wl-gammactl/default.nix          | 5 +++--
 pkgs/tools/wayland/wl-mirror/default.nix            | 8 +++++---
 pkgs/tools/wayland/wlr-randr/default.nix            | 1 +
 pkgs/tools/wayland/wlrctl/default.nix               | 8 ++++++--
 pkgs/tools/wayland/wlsunset/default.nix             | 4 ++++
 pkgs/tools/wayland/wob/default.nix                  | 4 ++++
 pkgs/tools/wayland/wshowkeys/default.nix            | 1 +
 pkgs/tools/wayland/wtype/default.nix                | 1 +
 pkgs/tools/wayland/ydotool/default.nix              | 1 +
 19 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix
index 6373af70b2e..0b906f0aa98 100644
--- a/pkgs/tools/wayland/kanshi/default.nix
+++ b/pkgs/tools/wayland/kanshi/default.nix
@@ -6,6 +6,7 @@
 , pkg-config
 , scdoc
 , wayland
+, wayland-scanner
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-RVMeS2qEjTYK6r7IwMeFSqfRpKR8di2eQXhewfhTnYI=";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config scdoc ];
+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
+  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
   buildInputs = [ wayland ];
 
   meta = with lib; {
diff --git a/pkgs/tools/wayland/oguri/default.nix b/pkgs/tools/wayland/oguri/default.nix
index 458ea310a01..c9abe1d016c 100644
--- a/pkgs/tools/wayland/oguri/default.nix
+++ b/pkgs/tools/wayland/oguri/default.nix
@@ -8,6 +8,7 @@
 , gdk-pixbuf
 , wayland
 , wayland-protocols
+, wayland-scanner
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "sXNvpI/YPDPd2cXQAfRO4ut21gSCXxbo1DpaZmHJDYQ=";
   };
 
-  nativeBuildInputs = [ pkg-config meson ninja ];
+  strictDeps = true;
+  nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ];
   buildInputs = [
     cairo
     gdk-pixbuf
diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix
index 1105813550f..87238a50f56 100644
--- a/pkgs/tools/wayland/slurp/default.nix
+++ b/pkgs/tools/wayland/slurp/default.nix
@@ -8,6 +8,7 @@
 , libxkbcommon
 , wayland
 , wayland-protocols
+, wayland-scanner
 , buildDocs ? true, scdoc
 }:
 
@@ -22,10 +23,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
+    wayland-scanner
   ] ++ lib.optional buildDocs scdoc;
 
   buildInputs = [
diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/tools/wayland/swaykbdd/default.nix
index e4f480dba8e..cb46519ac34 100644
--- a/pkgs/tools/wayland/swaykbdd/default.nix
+++ b/pkgs/tools/wayland/swaykbdd/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-umYPVkkYeu6TyVkjDsVBsRZLYh8WyseCPdih85kTz6A=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ meson ninja pkg-config ];
   buildInputs = [ json_c ];
 
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
index 4008461cc15..8c7708c3e3d 100644
--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchFromGitHub
 , ocamlPackages
-, buildPackages
 }:
 
 ocamlPackages.buildDunePackage rec {
@@ -23,8 +22,9 @@ ocamlPackages.buildDunePackage rec {
   useDune2 = true;
   minimumOCamlVersion = "4.08";
 
+  strictDeps = true;
   nativeBuildInputs = [
-    buildPackages.ocamlPackages.ppx_cstruct
+    ocamlPackages.ppx_cstruct
   ];
 
   buildInputs = with ocamlPackages; [
@@ -32,6 +32,7 @@ ocamlPackages.buildDunePackage rec {
     cmdliner
     logs
     cstruct-lwt
+    ppx_cstruct
   ];
 
   doCheck = true;
diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix
index d685bde83f9..ff3eb8a676c 100644
--- a/pkgs/tools/wayland/wayland-utils/default.nix
+++ b/pkgs/tools/wayland/wayland-utils/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4";
   };
 
+  strictDeps = true;
   depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
   buildInputs = [ wayland wayland-protocols ];
diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix
index d04cee342b7..293a440fcc0 100644
--- a/pkgs/tools/wayland/wev/default.nix
+++ b/pkgs/tools/wayland/wev/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
     sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";
   };
 
+  # for scdoc
+  depsBuildBuild = [
+    pkg-config
+  ];
   nativeBuildInputs = [ pkg-config scdoc wayland-scanner ];
   buildInputs = [ wayland wayland-protocols libxkbcommon ];
 
diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/tools/wayland/wl-clipboard-x11/default.nix
index b5d15b4a978..daa040c5cb5 100644
--- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, wl-clipboard }:
+{ lib, stdenv, fetchFromGitHub, wl-clipboard, bash }:
 
 stdenv.mkDerivation rec {
   pname = "wl-clipboard-x11";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-i+oF1Mu72O5WPTWzqsvo4l2CERWWp4Jq/U0DffPZ8vg=";
   };
 
+  strictDeps = true;
+  buildInputs = [ bash ];
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   postPatch = ''
diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/tools/wayland/wl-clipboard/default.nix
index 0bc195e9626..40857a47203 100644
--- a/pkgs/tools/wayland/wl-clipboard/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard/default.nix
@@ -6,6 +6,7 @@
 , pkg-config
 , wayland
 , wayland-protocols
+, wayland-scanner
 }:
 
 stdenv.mkDerivation rec {
@@ -19,8 +20,9 @@ stdenv.mkDerivation rec {
     sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
-  buildInputs = [ wayland ];
+  strictDeps = true;
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
+  buildInputs = [ wayland wayland-protocols ];
 
   meta = with lib; {
     homepage = "https://github.com/bugaevc/wl-clipboard";
@@ -30,4 +32,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-# TODO: is wayland-protocols a nativeBuildInput or a buildInput?
diff --git a/pkgs/tools/wayland/wl-color-picker/default.nix b/pkgs/tools/wayland/wl-color-picker/default.nix
index 784920712c9..9fcbc76bff2 100644
--- a/pkgs/tools/wayland/wl-color-picker/default.nix
+++ b/pkgs/tools/wayland/wl-color-picker/default.nix
@@ -7,6 +7,7 @@
 , wl-clipboard
 , imagemagick
 , makeWrapper
+, bash
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +21,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-lvhpXy4Sd1boYNGhbPoZTJlBhlW5obltDOrEzB1Gq0A=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ bash ];
 
   patchPhase = ''
     substituteInPlace Makefile \
diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/tools/wayland/wl-gammactl/default.nix
index 98bfc40169a..3aae67b4735 100644
--- a/pkgs/tools/wayland/wl-gammactl/default.nix
+++ b/pkgs/tools/wayland/wl-gammactl/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , meson, pkg-config, ninja
-, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3
+, wayland, wayland-scanner, wlroots, wlr-protocols, gtk3, glib
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "8iMJK4O/sNIGPOBZQEfK47K6OjT6sxYFe19O2r/VSr8=";
   };
 
-  nativeBuildInputs = [ meson pkg-config ninja ];
+  strictDeps = true;
+  nativeBuildInputs = [ meson pkg-config ninja glib wayland-scanner ];
   buildInputs = [ wayland wlroots gtk3 ];
 
   postUnpack = ''
diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix
index 02907ba8d23..3b876c53060 100644
--- a/pkgs/tools/wayland/wl-mirror/default.nix
+++ b/pkgs/tools/wayland/wl-mirror/default.nix
@@ -8,6 +8,7 @@
 , wayland-scanner
 , wlr-protocols
 , libGL
+, bash
 , installExampleScripts ? true
 , makeWrapper
 , pipectl
@@ -35,6 +36,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8=";
   };
 
+  strictDeps = true;
+  nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ];
+  buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ];
+
   postPatch = ''
     echo 'v${version}' > version.txt
     substituteInPlace CMakeLists.txt \
@@ -50,9 +55,6 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
   '';
 
-  nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ];
-  buildInputs = [ libGL wayland wayland-protocols wlr-protocols ];
-
   meta = with lib; {
     homepage = "https://github.com/Ferdi265/wl-mirror";
     description = "Mirrors an output onto a Wayland surface.";
diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix
index fe140720973..b6e29152e19 100644
--- a/pkgs/tools/wayland/wlr-randr/default.nix
+++ b/pkgs/tools/wayland/wlr-randr/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
   buildInputs = [ wayland ];
 
diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/tools/wayland/wlrctl/default.nix
index 7cb54d381b0..4de7699b35f 100644
--- a/pkgs/tools/wayland/wlrctl/default.nix
+++ b/pkgs/tools/wayland/wlrctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, scdoc, ninja, libxkbcommon, wayland }:
+{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, scdoc, ninja, libxkbcommon, wayland, wayland-scanner }:
 
 stdenv.mkDerivation rec {
   pname = "wlrctl";
@@ -11,7 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "039cxc82k7x473n6d65jray90rj35qmfdmr390zy0c7ic7vn4b78";
   };
 
-  nativeBuildInputs = [ meson pkg-config scdoc ninja ];
+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
+  nativeBuildInputs = [ meson pkg-config scdoc ninja wayland-scanner ];
   buildInputs = [ libxkbcommon wayland ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=type-limits";
diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix
index 7ced81616f6..dcff3dff9cb 100644
--- a/pkgs/tools/wayland/wlsunset/default.nix
+++ b/pkgs/tools/wayland/wlsunset/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w";
   };
 
+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
   nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ];
   buildInputs = [ wayland wayland-protocols ];
 
diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix
index 5434132cd3d..75f23051c6e 100644
--- a/pkgs/tools/wayland/wob/default.nix
+++ b/pkgs/tools/wayland/wob/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs=";
   };
 
+  strictDeps = true;
+  depsBuildBuild = [
+    pkg-config
+  ];
   nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
   buildInputs = [ wayland wayland-protocols ]
     ++ lib.optional stdenv.isLinux libseccomp;
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix
index 32fb81fe188..3ce14b54387 100644
--- a/pkgs/tools/wayland/wshowkeys/default.nix
+++ b/pkgs/tools/wayland/wshowkeys/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/HvNCQWsXOJZeCxHWmsLlbBDhBzF7XP/SPLdDiWMDC4=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ];
   buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ];
 
diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/tools/wayland/wtype/default.nix
index 452f51a04de..5928b9dd489 100644
--- a/pkgs/tools/wayland/wtype/default.nix
+++ b/pkgs/tools/wayland/wtype/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-TfpzAi0mkXugQn70MISyNFOXIJpDwvgh3enGv0Xq8S4=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ meson ninja pkg-config wayland ];
   buildInputs = [ libxkbcommon wayland ];
 
diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix
index 15bc4998733..8f142ef6488 100644
--- a/pkgs/tools/wayland/ydotool/default.nix
+++ b/pkgs/tools/wayland/ydotool/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ cmake scdoc ];
 
   postInstall = ''

From 64c207a58289058ab9a43ea5b0b1e687da62ffe9 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 11 May 2022 20:05:57 -0400
Subject: [PATCH 13/53] dprint: 0.27.0 -> 0.28.0

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

diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix
index 22102b9a3bb..a111cbb8744 100644
--- a/pkgs/development/tools/dprint/default.nix
+++ b/pkgs/development/tools/dprint/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dprint";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-F/uO4hkVL0PczR59TxCTSOOKnQQQoxvAD8b1p1YdcjY=";
+    sha256 = "sha256-MGAkjjP6efdME4SncV18aLOOC4XxWutaYTINSIRCSp0=";
   };
 
-  cargoSha256 = "sha256-B9nVsm/ml2hm+Yr6io4tf4JQsPRCtG7dBJQvF2WwWm0=";
+  cargoSha256 = "sha256-k2BrkdLRFmppQcPm2dkbQIOlmIv/jsfwD8S/rsLxm+0=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 

From 31d4b2b9a8cff24aa486d0f51c97b049716df572 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 May 2022 14:25:18 +0200
Subject: [PATCH 14/53] python310Packages.pontos: 22.5.0 -> 22.5.0

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

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 0ea1be9c21f..19f2a352d1e 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "22.4.0";
+  version = "22.5.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-W+l5QIpum1uTsx/mxZGkRoJAZaC1viURVYg4Kvjv32Y=";
+    hash = "sha256-WTIuK5kPPqft4u44dN5NDJJKxIPrZGCJjZ5pR6HgOxw=";
   };
 
   nativeBuildInputs = [
@@ -53,6 +53,7 @@ buildPythonPackage rec {
     "test_find_unreleased_information"
     # CLI test fails
     "test_missing_cmd"
+    "test_update_file_changed"
   ];
 
   pythonImportsCheck = [

From afd5edfa387368e4bf0671dc94981850784f09f5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Thu, 12 May 2022 15:21:51 +0200
Subject: [PATCH 15/53] {adl,opn}plug: 1.0.2 -> unstable-2021-12-17, fix
 Darwin, fix Linux dependencies

---
 pkgs/applications/audio/adlplug/default.nix | 56 +++++++++++++++------
 pkgs/top-level/all-packages.nix             |  3 +-
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix
index a501cd0a1d8..fe57e29a107 100644
--- a/pkgs/applications/audio/adlplug/default.nix
+++ b/pkgs/applications/audio/adlplug/default.nix
@@ -13,11 +13,22 @@
 , libXinerama
 , libXext
 , libXcursor
-, libobjc
+, Foundation
 , Cocoa
+, Carbon
 , CoreServices
+, ApplicationServices
+, CoreAudio
+, CoreMIDI
+, AudioToolbox
+, Accelerate
+, CoreImage
+, IOKit
+, AudioUnit
+, QuartzCore
 , WebKit
 , DiscRecording
+, CoreAudioKit
 
   # Enabling JACK requires a JACK server at runtime, no fallback mechanism
 , withJack ? false, jack
@@ -35,25 +46,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${lib.strings.toLower type}plug";
-  version = "1.0.2";
+  version = "unstable-2021-12-17";
 
   src = fetchFromGitHub {
     owner = "jpcima";
     repo = "ADLplug";
-    rev = "v${version}";
+    rev = "a488abedf1783c61cb4f0caa689f1b01bf9aa17d";
     fetchSubmodules = true;
-    sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f";
+    sha256 = "1a5zw0rglqgc5wq1n0s5bxx7y59dsg6qy02236fakl34bvbk60yz";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch";
-      sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy";
-      extraPrefix = "thirdparty/JUCE/";
-      stripLen = 1;
-    })
-  ];
-
   cmakeFlags = [
     "-DADLplug_CHIP=${chip}"
     "-DADLplug_USE_SYSTEM_FMT=ON"
@@ -61,9 +63,24 @@ stdenv.mkDerivation rec {
   ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
+    # "fp.h" file not found
     "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers"
   ]);
 
+  NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [
+    # Framework that JUCE needs which don't get linked properly
+    "-framework CoreAudioKit"
+    "-framework QuartzCore"
+    "-framework AudioToolbox"
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    # JUCE dlopen's these at runtime
+    "-lX11"
+    "-lXext"
+    "-lXcursor"
+    "-lXinerama"
+    "-lXrandr"
+  ]);
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -81,11 +98,22 @@ stdenv.mkDerivation rec {
     libXext
     libXcursor
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    libobjc
+    Foundation
     Cocoa
+    Carbon
     CoreServices
+    ApplicationServices
+    CoreAudio
+    CoreMIDI
+    AudioToolbox
+    Accelerate
+    CoreImage
+    IOKit
+    AudioUnit
+    QuartzCore
     WebKit
     DiscRecording
+    CoreAudioKit
   ] ++ lib.optional withJack jack;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd5aa67f51e..f6de01a660a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -986,8 +986,7 @@ with pkgs;
   addlicense = callPackage ../tools/misc/addlicense { };
 
   adlplug = callPackage ../applications/audio/adlplug {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices WebKit DiscRecording;
+    inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit;
     jack = libjack2;
   };
   opnplug = adlplug.override {

From 8fcd5ca1ed06acba3d59783617d8afdb6d855d95 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 10:52:19 +0200
Subject: [PATCH 16/53] python310Packages.pyahocorasick: 1.4.4 -> 2.0.0b1

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

diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix
index 336e637edef..fd2c6de2c25 100644
--- a/pkgs/development/python-modules/pyahocorasick/default.nix
+++ b/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyahocorasick";
-  version = "1.4.4";
+  version = "2.0.0b1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,17 +17,13 @@ buildPythonPackage rec {
     owner = "WojciechMula";
     repo = pname;
     rev = version;
-    hash = "sha256-X6ifwOwf7GAaNUxInKhR3NX6hKhvFMkvfbK6XpH8CBo=";
+    hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk=";
   };
 
   checkInputs = [
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
-    "unittests.py"
-  ];
-
   pythonImportsCheck = [
     "ahocorasick"
   ];

From d96494b8dbe758406a1b8500f7246876886ba222 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 11:14:11 +0200
Subject: [PATCH 17/53] python310Packages.parameter-expansion-patched: 0.2.1b4
 -> 0.3.1

---
 .../parameter-expansion-patched/default.nix      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/parameter-expansion-patched/default.nix b/pkgs/development/python-modules/parameter-expansion-patched/default.nix
index 18511e1c70f..4f2c5eaf609 100644
--- a/pkgs/development/python-modules/parameter-expansion-patched/default.nix
+++ b/pkgs/development/python-modules/parameter-expansion-patched/default.nix
@@ -3,19 +3,27 @@
 , fetchPypi
 , pytestCheckHook
 , pythonOlder
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "parameter-expansion-patched";
-  version = "0.2.1b4";
+  version = "0.3.1";
+  format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs";
+    hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
   checkInputs = [
     pytestCheckHook
   ];
@@ -26,7 +34,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "POSIX parameter expansion in Python";
-    homepage = "https://github.com/nexB/commoncode";
+    homepage = "https://github.com/nexB/parameter_expansion_patched";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

From de0b4f45dd11862f12843646b06f19bcbc7c149b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 11:22:17 +0200
Subject: [PATCH 18/53] python310Packages.plugincode: 21.1.21 -> 30.0.0

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

diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix
index 7270685f41b..2e54d5604e1 100644
--- a/pkgs/development/python-modules/plugincode/default.nix
+++ b/pkgs/development/python-modules/plugincode/default.nix
@@ -7,14 +7,19 @@
 , pluggy
 , pytestCheckHook
 , pytest-xdist
+, pythonOlder
 }:
+
 buildPythonPackage rec {
   pname = "plugincode";
-  version = "21.1.21";
+  version = "30.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97b5a2c96f0365c80240be103ecd86411c68b11a16f137913cbea9129c54907a";
+    hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos=";
   };
 
   dontConfigure = true;
@@ -38,8 +43,13 @@ buildPythonPackage rec {
     "plugincode"
   ];
 
+  disabledTests = [
+    # We don't want black as an input
+    "test_skeleton_codestyle"
+  ];
+
   meta = with lib; {
-    description = "A library that provides plugin functionality for ScanCode toolkit";
+    description = "Library that provides plugin functionality for ScanCode toolkit";
     homepage = "https://github.com/nexB/plugincode";
     license = licenses.asl20;
     maintainers = teams.determinatesystems.members;

From 2ee2a8049099779d4e7004bae4a4fd501965d8cc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 11 May 2022 11:24:34 +0200
Subject: [PATCH 19/53] python310Packages.typecode: 21.6.1 -> 30.0.0

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

diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index 16ee927e849..7b3a01a53a8 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -10,16 +10,19 @@
 , typecode-libmagic
 , pytestCheckHook
 , pytest-xdist
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "typecode";
-  version = "21.6.1";
+  version = "30.0.0";
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3a82859df5607c900972e08e1bca31e3fe2daed37afd1b8231cad2ef613d8d6";
+    hash = "sha256-pRGLU/xzQQqDZMIsrq1Fy7VgGIpFjnHtpmO+yL7t4g8=";
   };
 
   dontConfigure = true;

From bb4226fd75041aa113b6ae0d47b11c1be161586c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 May 2022 15:11:05 +0200
Subject: [PATCH 20/53] python310Packages.scancode-toolkit: 30.1.0 -> 31.0.0b4

---
 .../scancode-toolkit/default.nix              | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix
index 2c12019e9ac..40c52962e51 100644
--- a/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -8,8 +8,9 @@
 , click
 , colorama
 , commoncode
+, container-inspector
 , debian-inspector
-, dparse
+, dparse2
 , extractcode
 , extractcode-7z
 , extractcode-libarchive
@@ -32,7 +33,8 @@
 , packaging
 , parameter-expansion-patched
 , pefile
-, pkginfo
+, pip-requirements-parser
+, pkginfo2
 , pluggy
 , plugincode
 , publicsuffix2
@@ -58,13 +60,13 @@
 
 buildPythonPackage rec {
   pname = "scancode-toolkit";
-  version = "30.1.0";
+  version = "31.0.0b4";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UYQf+cBi2FmyZxIbQJo7vLjPuoePIMC8FugvoG1Ebj0=";
+    hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A=";
   };
 
   dontConfigure = true;
@@ -78,8 +80,9 @@ buildPythonPackage rec {
     click
     colorama
     commoncode
+    container-inspector
     debian-inspector
-    dparse
+    dparse2
     extractcode
     extractcode-7z
     extractcode-libarchive
@@ -88,6 +91,7 @@ buildPythonPackage rec {
     ftfy
     gemfileparser
     html5lib
+    importlib-metadata
     intbitset
     jaraco_functools
     javaproperties
@@ -100,7 +104,8 @@ buildPythonPackage rec {
     packaging
     parameter-expansion-patched
     pefile
-    pkginfo
+    pip-requirements-parser
+    pkginfo2
     pluggy
     plugincode
     publicsuffix2
@@ -118,9 +123,8 @@ buildPythonPackage rec {
     typecode-libmagic
     urlpy
     xmltodict
-    zipp
   ] ++ lib.optionals (pythonOlder "3.9") [
-    importlib-metadata
+    zipp
   ] ++ lib.optionals (pythonOlder "3.7") [
     typing
   ];

From f04ff41118d305d0b62121a3ed1378da0955a9a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 May 2022 15:12:06 +0200
Subject: [PATCH 21/53] python310Packages.container-inspector: pretend version

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

diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix
index d8acd1160a8..9d4f67ca830 100644
--- a/pkgs/development/python-modules/container-inspector/default.nix
+++ b/pkgs/development/python-modules/container-inspector/default.nix
@@ -24,6 +24,8 @@ buildPythonPackage rec {
     hash = "sha256-YwtyNZsTMb8iFXo/rojvjkKUbMNRCXVamzFykpwYCOk=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   dontConfigure = true;
 
   nativeBuildInputs = [

From 1c7c689c0fb4ecb6695909fbf065d93e0bf53034 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 May 2022 15:13:13 +0200
Subject: [PATCH 22/53] python310Packages.debian-inspector: pretend version

---
 .../python-modules/debian-inspector/default.nix      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix
index 0da7f634d84..1c8cee1d718 100644
--- a/pkgs/development/python-modules/debian-inspector/default.nix
+++ b/pkgs/development/python-modules/debian-inspector/default.nix
@@ -6,24 +6,30 @@
 , commoncode
 , pytestCheckHook
 , setuptools-scm
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "debian-inspector";
   version = "30.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     pname = "debian_inspector";
     inherit version;
-    sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
+    hash = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  dontConfigure = true;
+
   nativeBuildInputs = [
     setuptools-scm
   ];
 
-  dontConfigure = true;
-
   propagatedBuildInputs = [
     chardet
     attrs

From 28d7018af96e87ef2d27ae47e7fe0a5a8d2f27ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 May 2022 15:13:42 +0200
Subject: [PATCH 23/53] python310Packages.license-expression: pretend version

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

diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index c6f2c678ba9..e1f77e45dcc 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -20,6 +20,8 @@ buildPythonPackage rec {
     hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   dontConfigure = true;
 
   nativeBuildInputs = [

From 24df3cd4b61e492ac96f8456902616770764eced Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 May 2022 15:14:42 +0200
Subject: [PATCH 24/53] python310Packages.pip-requirements-parser: pretend
 version

---
 .../python-modules/pip-requirements-parser/default.nix          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix
index d4246d302a2..0693fbf4fde 100644
--- a/pkgs/development/python-modules/pip-requirements-parser/default.nix
+++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix
@@ -21,6 +21,8 @@ buildPythonPackage rec {
     hash = "sha256-i4hw3tS4i2ek2JzcDiGo5aFFJ9J2JJ9MB5vxDhOilb0=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   dontConfigure = true;
 
   nativeBuildInputs = [

From 30060a2268745ee3b3ca8119c29581e9be69467f Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Thu, 12 May 2022 23:12:46 +0200
Subject: [PATCH 25/53] {adl,opn}plug: Install plugins on Darwin

---
 pkgs/applications/audio/adlplug/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix
index fe57e29a107..a0f5b48a632 100644
--- a/pkgs/applications/audio/adlplug/default.nix
+++ b/pkgs/applications/audio/adlplug/default.nix
@@ -117,9 +117,13 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional withJack jack;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir $out/Applications
+    mkdir -p $out/{Applications,Library/Audio/Plug-Ins/{VST,Components}}
+
     mv $out/bin/${mainProgram}.app $out/Applications/
     ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram}
+
+    mv vst2/${mainProgram}.vst $out/Library/Audio/Plug-Ins/VST/
+    mv au/${mainProgram}.component $out/Library/Audio/Plug-Ins/Components/
   '';
 
   meta = with lib; {

From f7958990af2413d5478d44ea75b7b875190764e4 Mon Sep 17 00:00:00 2001
From: William Kral <william.kral@gmail.com>
Date: Thu, 12 May 2022 14:54:38 -0700
Subject: [PATCH 26/53] ogmtools: fix build

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

diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix
index 9f7e08a9ddf..48f1b98f6e5 100644
--- a/pkgs/applications/video/ogmtools/default.nix
+++ b/pkgs/applications/video/ogmtools/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libogg libvorbis libdvdread ];
 
+  NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
+
   meta = {
     description = "Tools for modifying and inspecting OGG media streams";
     longDescription = ''

From 916b057e88f355e95df988bd218a6ece711df182 Mon Sep 17 00:00:00 2001
From: William Kral <william.kral@gmail.com>
Date: Thu, 12 May 2022 15:54:54 -0700
Subject: [PATCH 27/53] opengrm-ngram: 1.3.13 -> 1.3.14

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

diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix
index 06f2e3542bb..b84e4159f3e 100644
--- a/pkgs/development/libraries/opengrm-ngram/default.nix
+++ b/pkgs/development/libraries/opengrm-ngram/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrm-ngram";
-  version = "1.3.13";
+  version = "1.3.14";
 
   src = fetchurl {
     url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz";
-    sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q=";
+    sha256 = "sha256-ivMPDy6CPM17hWCToLOVzUgcWZiEt2pjYeizeBLYnYc=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 89fd58ac1761a997112c6d5d9fcab6030f65cbd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 May 2022 01:45:01 +0000
Subject: [PATCH 28/53] python310Packages.pytest-cases: 3.6.11 -> 3.6.12

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

diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix
index 80e31e8effa..96a434ecc5c 100644
--- a/pkgs/development/python-modules/pytest-cases/default.nix
+++ b/pkgs/development/python-modules/pytest-cases/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-cases";
-  version = "3.6.11";
+  version = "3.6.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-9rcXPoGxR3sxX3tFbv1O/T7kfrKnIB2XV1mJvSH5WQ4=";
+    sha256 = "sha256-pZ7GGqc+Nd71V+3I2LYVMYbaLBPG5+Ze+d7Mb5CONCI=";
   };
 
   nativeBuildInputs = [

From 12feb979234f3cbd7f7058d630a3b5d9b67d46f6 Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Fri, 13 May 2022 13:36:36 +0900
Subject: [PATCH 29/53] nvfetcher: add missing dependency

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 4116cf51ebe..9ed09e6f81d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -866,7 +866,7 @@ self: super: builtins.intersectAttrs super {
       buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
       postInstall = drv.postInstall or "" + ''
         wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
-          pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ]
+          pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch ]
         }"
       '';
     }) super.nvfetcher);

From e3d3af7eac0c3fce19896db60021ed21c2cdc3fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 May 2022 04:37:57 +0000
Subject: [PATCH 30/53] python310Packages.jwcrypto: 1.2 -> 1.3

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

diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix
index 4a6bd63c765..174ebc3908a 100644
--- a/pkgs/development/python-modules/jwcrypto/default.nix
+++ b/pkgs/development/python-modules/jwcrypto/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jwcrypto";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7fQwkyFyHlFhzvzN1ksEUJ4Dkk/q894IW0d4B2WYmuM=";
+    sha256 = "sha256-DWRhuhP3wnHYusUBjuYN28rl/zlAP6+kI3X1fQjjmLs=";
   };
 
   propagatedBuildInputs = [

From 215235cce56b0a7322d52e6a94e65ec59dc83b7d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 13 May 2022 06:47:14 +0200
Subject: [PATCH 31/53] Revert "moving findlib to propagedNativeBuildInputs"

This reverts commit 82440c9374f4de934e287476e2b3a4bbf837d98a.
---
 pkgs/applications/science/logic/coq/default.nix    | 9 +++------
 pkgs/development/coq-modules/simple-io/default.nix | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 49b3130a4d9..58edf0a0039 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -72,8 +72,7 @@ let
     ] ocamlPackages_4_12;
   ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
     ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
-  ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ];
-  ocamlPropagatedBuildInputs = [ ]
+  ocamlBuildInputs = [ ocamlPackages.findlib ]
     ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
     ++ optional (!coqAtLeast "8.13") ocamlPackages.num
     ++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@@ -83,8 +82,7 @@ self = stdenv.mkDerivation {
 
   passthru = {
     inherit coq-version;
-    inherit ocamlPackages ocamlNativeNuildInputs;
-    inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
+    inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs;
     # For compatibility
     inherit (ocamlPackages) ocaml camlp5 findlib num ;
     emacsBufferSetup = pkgs: ''
@@ -145,8 +143,7 @@ self = stdenv.mkDerivation {
        else [ ocamlPackages.lablgtk ])
   ;
 
-  propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs;
-  propagatedBuildInputs = ocamlPropagatedBuildInputs;
+  propagatedBuildInputs = ocamlBuildInputs;
 
   postPatch = ''
     UNAME=$(type -tp uname)
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index ca7325711e2..a0417ca978d 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -12,7 +12,7 @@ with lib; mkCoqDerivation {
   release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
   release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
   mlPlugin = true;
-  nativeBuildInputs = [ coq.ocamlPackages.cppo ];
+  nativeBuildInputs = coq.ocamlPackages.cppo;
   propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ];
 
   doCheck = true;

From 1f11888116d74b814acd1071a2f49523bf2a4aa7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 13 May 2022 06:47:14 +0200
Subject: [PATCH 32/53] Revert "coqPackages: etc"

This reverts commit 7e589a45ef86abf9a6a737d9730925b81ee663b4.
---
 doc/languages-frameworks/coq.section.md       | 15 +++----
 .../science/logic/coq/default.nix             |  8 ++--
 pkgs/build-support/coq/default.nix            | 39 +++++++------------
 .../development/coq-modules/CoLoR/default.nix |  2 +-
 pkgs/development/coq-modules/HoTT/default.nix |  2 +-
 .../coq-modules/QuickChick/default.nix        |  3 +-
 pkgs/development/coq-modules/VST/default.nix  |  2 +-
 .../coq-modules/bignums/default.nix           |  2 +-
 .../coq-modules/compcert/default.nix          | 15 +++----
 .../coq-modules/coq-bits/default.nix          | 32 +++++++++++----
 .../coq-modules/coq-elpi/default.nix          |  4 +-
 .../coq-modules/coqeal/default.nix            |  3 +-
 .../coq-modules/coqhammer/default.nix         |  6 +--
 .../coq-modules/coqprime/default.nix          |  1 +
 .../coq-modules/coqtail-math/default.nix      |  4 +-
 .../coq-modules/coquelicot/default.nix        |  4 +-
 .../coq-modules/dpdgraph/default.nix          |  4 +-
 pkgs/development/coq-modules/fiat/HEAD.nix    |  4 +-
 .../development/coq-modules/flocq/default.nix |  4 +-
 .../coq-modules/gappalib/default.nix          |  2 +-
 pkgs/development/coq-modules/heq/default.nix  | 16 +++-----
 .../coq-modules/hierarchy-builder/default.nix |  5 ++-
 .../coq-modules/interval/default.nix          |  8 ++--
 .../coq-modules/itauto/default.nix            |  2 +-
 .../development/coq-modules/ltac2/default.nix |  1 +
 .../coq-modules/math-classes/default.nix      |  2 +-
 .../coq-modules/mathcomp/default.nix          |  9 ++---
 .../coq-modules/metacoq/default.nix           |  6 ++-
 .../coq-modules/metalib/default.nix           |  1 +
 .../coq-modules/semantics/default.nix         |  4 +-
 .../coq-modules/simple-io/default.nix         |  6 ++-
 .../coq-modules/smtcoq/default.nix            |  8 ++--
 .../ocaml-modules/elpi/default.nix            | 12 ++----
 pkgs/top-level/coq-packages.nix               |  5 +--
 34 files changed, 113 insertions(+), 128 deletions(-)

diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md
index 11777b5eef4..9a692104a04 100644
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@@ -29,19 +29,14 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
 * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags,
 * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers,
 * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
-* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune2`, `useDune2ifVersion` and `mlPlugin` are set).
-* `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`,
-* `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements,
-* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,
-* `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`,
-* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
-* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,
-* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.
-* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2ifVersion = versions.isGe "1.1"`  will use dune if the version of the package is greater or equal to `"1.1"`,
+* `extraNativeBuildInputs` (optional), by default `nativeBuildInputs` just contains `coq`, this allows to add more native build inputs, `nativeBuildInputs` are executables and `buildInputs` are libraries and dependencies,
+* `extraBuildInputs` (optional), this allows to add more build inputs,
+* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against.
+* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"`  will use dune if the version of the package is greater or equal to `"1.1"`,
 * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
 * `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
 * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
-* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `DESTDIR` and `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
+* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
 * `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`,
 * `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility).
 * `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`.
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 58edf0a0039..c078287b85e 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -70,9 +70,9 @@ let
       { case = range "8.7" "8.10";  out = ocamlPackages_4_09; }
       { case = range "8.5" "8.6";   out = ocamlPackages_4_05; }
     ] ocamlPackages_4_12;
-  ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
+  ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
     ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
-  ocamlBuildInputs = [ ocamlPackages.findlib ]
+  ocamlBuildInputs = []
     ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
     ++ optional (!coqAtLeast "8.13") ocamlPackages.num
     ++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@@ -136,15 +136,13 @@ self = stdenv.mkDerivation {
     ++ optional buildIde copyDesktopItems
     ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook
     ++ optional (!coqAtLeast "8.6") gnumake42;
-  buildInputs = [ ncurses ]
+  buildInputs = [ ncurses ] ++ ocamlBuildInputs
     ++ optionals buildIde
       (if coqAtLeast "8.10"
        then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ]
        else [ ocamlPackages.lablgtk ])
   ;
 
-  propagatedBuildInputs = ocamlBuildInputs;
-
   postPatch = ''
     UNAME=$(type -tp uname)
     RM=$(type -tp rm)
diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix
index 70c62c659a2..a681bbda557 100644
--- a/pkgs/build-support/coq/default.nix
+++ b/pkgs/build-support/coq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, coqPackages, coq, which, fetchzip }@args:
+{ lib, stdenv, coqPackages, coq, fetchzip }@args:
 let lib = import ./extra-lib.nix {inherit (args) lib;}; in
 with builtins; with lib;
 let
@@ -15,12 +15,8 @@ in
   releaseRev ? (v: v),
   displayVersion ? {},
   release ? {},
-  buildInputs ? [],
-  nativeBuildInputs ? [],
   extraBuildInputs ? [],
   extraNativeBuildInputs ? [],
-  overrideBuildInputs ? [],
-  overrideNativeBuildInputs ? [],
   namePrefix ? [ "coq" ],
   enableParallelBuilding ? true,
   extraInstallFlags ? [],
@@ -39,11 +35,7 @@ let
   args-to-remove = foldl (flip remove) ([
     "version" "fetcher" "repo" "owner" "domain" "releaseRev"
     "displayVersion" "defaultVersion" "useMelquiondRemake"
-    "release"
-    "buildInputs" "nativeBuildInputs"
-    "extraBuildInputs" "extraNativeBuildInputs"
-    "overrideBuildInputs" "overrideNativeBuildInputs"
-    "namePrefix"
+    "release" "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" "namePrefix"
     "meta" "useDune2ifVersion" "useDune2" "opam-name"
     "extraInstallFlags" "setCOQBIN" "mlPlugin"
     "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs;
@@ -65,16 +57,9 @@ let
     ] "") + optionalString (v == null) "-broken";
   append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-";
   prefix-name = foldl append-version "" namePrefix;
+  var-coqlib-install =
+    (optionalString (versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev") "COQMF_") + "COQLIB";
   useDune2 = args.useDune2 or (useDune2ifVersion fetched.version);
-  coqlib-flags = switch coq.coq-version [
-    { case = v: versions.isLe "8.6" v && v != "dev" ;
-      out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; }
-  ] [ "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib"
-      "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" ];
-  docdir-flags = switch coq.coq-version [
-    { case = v: versions.isLe "8.6" v && v != "dev";
-      out = [ "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ]; }
-  ] [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ];
 in
 
 stdenv.mkDerivation (removeAttrs ({
@@ -83,12 +68,12 @@ stdenv.mkDerivation (removeAttrs ({
 
   inherit (fetched) version src;
 
-  nativeBuildInputs = args.overrideNativeBuildInputs
-    or ([ which ] ++ optional useDune2 coq.ocamlPackages.dune_2
-        ++ optional (useDune2 || mlPlugin) coq.ocaml
-        ++ (args.nativeBuildInputs or []) ++ extraNativeBuildInputs);
-  buildInputs = args.overrideBuildInputs
-    or ([ coq ] ++ (args.buildInputs or []) ++ extraBuildInputs);
+  nativeBuildInputs = [ coq ]
+    ++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2]
+    ++ optionals mlPlugin coq.ocamlNativeBuildInputs
+    ++ extraNativeBuildInputs;
+  buildInputs = optionals mlPlugin coq.ocamlBuildInputs
+    ++ extraBuildInputs;
   inherit enableParallelBuilding;
 
   meta = ({ platforms = coq.meta.platforms; } //
@@ -103,7 +88,9 @@ stdenv.mkDerivation (removeAttrs ({
 // (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; })
 // (optionalAttrs (!args?installPhase && !args?useMelquiondRemake) {
   installFlags =
-    [ "DESTDIR=$(out)" ] ++ coqlib-flags ++ docdir-flags ++
+    [ "${var-coqlib-install}=$(out)/lib/coq/${coq.coq-version}/" ] ++
+    optional (match ".*doc$" (args.installTargets or "") != null)
+      "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ++
     extraInstallFlags;
 })
 // (optionalAttrs useDune2 {
diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index 0fdcb49d730..9270609c6b2 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -20,7 +20,7 @@ with lib; mkCoqDerivation {
   release."1.4.0".rev    = "168c6b86c7d3f87ee51791f795a8828b1521589a";
   release."1.4.0".sha256 = "1d2whsgs3kcg5wgampd6yaqagcpmzhgb6a0hp6qn4lbimck5dfmm";
 
-  propagatedBuildInputs = [ bignums ];
+  extraBuildInputs = [ bignums ];
   enableParallelBuilding = false;
 
   meta = {
diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix
index f6e9b3daca2..706943cf8d0 100644
--- a/pkgs/development/coq-modules/HoTT/default.nix
+++ b/pkgs/development/coq-modules/HoTT/default.nix
@@ -8,7 +8,7 @@ with lib; mkCoqDerivation {
   release."20170921".rev    = "e3557740a699167e6adb1a65855509d55a392fa1";
   release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v";
 
-  nativeBuildInputs = [ autoconf automake ];
+  extraBuildInputs = [ autoconf automake ];
 
   preConfigure = ''
     patchShebangs ./autogen.sh
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index c2e6a5431c9..db3227c1770 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -36,7 +36,8 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
     "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
 
   mlPlugin = true;
-  nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
+  extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild;
+  extraBuildInputs = lib.optional recent coq.ocamlPackages.num;
   propagatedBuildInputs = [ ssreflect ]
     ++ lib.optionals recent [ coq-ext-lib simple-io ];
   extraInstallFlags = [ "-f Makefile.coq" ];
diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix
index 8bf8a868023..a5dee94d045 100644
--- a/pkgs/development/coq-modules/VST/default.nix
+++ b/pkgs/development/coq-modules/VST/default.nix
@@ -31,7 +31,7 @@ mkCoqDerivation {
   release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
   release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0=";
   releaseRev = v: "v${v}";
-  buildInputs = [ ITree ];
+  extraBuildInputs = [ ITree ];
   propagatedBuildInputs = [ compcert ];
 
   preConfigure = ''
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index a53b8199fe9..0001ae1ded4 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
   owner = "coq";
   displayVersion = { bignums = ""; };
   inherit version;
-  defaultVersion = if versions.isGe "8.6" coq.coq-version
+  defaultVersion = if versions.isGe "8.5" coq.coq-version
     then "${coq.coq-version}.0" else null;
 
   release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index 5d2eb4433e6..092bb58d174 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchzip, mkCoqDerivation, coq, flocq, compcert
-, fetchpatch, makeWrapper, coq2html
+, ocamlPackages, fetchpatch, makeWrapper, coq2html
 , stdenv, tools ? stdenv.cc
 , version ? null
 }:
@@ -15,9 +15,9 @@ let compcert = mkCoqDerivation rec {
   releaseRev = v: "v${v}";
 
   defaultVersion =  with versions; switch coq.version [
-      { case = range "8.13" "8.15"; out = "3.10"; }
-      { case = isEq "8.12"       ; out = "3.9"; }
       { case = range "8.8" "8.11"; out = "3.8"; }
+      { case = isEq "8.12"       ; out = "3.9"; }
+      { case = range "8.12" "8.15"; out = "3.10"; }
     ] null;
 
   release = {
@@ -26,9 +26,8 @@ let compcert = mkCoqDerivation rec {
     "3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6";
   };
 
-  mlPlugin = true;
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = with coq.ocamlPackages; [ menhir menhirLib ] ++ [ coq2html ];
+  buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ];
   propagatedBuildInputs = [ flocq ];
 
   enableParallelBuilding = true;
@@ -49,13 +48,9 @@ let compcert = mkCoqDerivation rec {
   '';
 
   installTargets = "documentation install";
-  installFlags = []; # trust ./configure
-  preInstall = ''
-    mkdir -p $out/share/man
-    mkdir -p $man/share
-  '';
   postInstall = ''
     # move man into place
+    mkdir -p $man/share
     mv $out/share/man/ $man/share/
 
     # move docs into place
diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix
index f604db4ecdf..6cb6bb3c813 100644
--- a/pkgs/development/coq-modules/coq-bits/default.nix
+++ b/pkgs/development/coq-modules/coq-bits/default.nix
@@ -1,18 +1,34 @@
-{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }:
+{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
 
 with lib; mkCoqDerivation {
   pname = "coq-bits";
   repo = "bits";
   inherit version;
-  defaultVersion = with versions; switch coq.coq-version [
-    { case = isGe "8.10"; out = "1.1.0"; }
-    { case = isGe "8.7";  out = "1.0.0"; }
-  ] null;
+  defaultVersion =
+    if versions.isGe "8.10" coq.version
+    then "1.1.0"
+    else if versions.isGe "8.7" coq.version
+    then "1.0.0"
+    else null;
 
-  release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";
-  release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
+  release = {
+    "1.0.0" = {
+      rev = "1.0.0";
+      sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl";
+    };
+    "1.1.0" = {
+      rev = "1.1.0";
+      sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE=";
+    };
+  };
+
+  extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ];
+  propagatedBuildInputs = [ mathcomp.algebra ];
 
-  propagatedBuildInputs = [ mathcomp-algebra ];
+  installPhase = ''
+    make -f Makefile CoqMakefile
+    make -f CoqMakefile COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
 
   meta = {
     description = "A formalization of bitset operations in Coq";
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 03fe8c32d5c..55423047caa 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -7,7 +7,7 @@ with builtins; with lib; let
     { case = "8.13"; out = { version = "1.13.7"; };}
     { case = "8.14"; out = { version = "1.13.7"; };}
     { case = "8.15"; out = { version = "1.14.1"; };}
-  ] { version = "1.14.1"; } );
+  ] {});
 in mkCoqDerivation {
   pname = "elpi";
   repo  = "coq-elpi";
@@ -48,8 +48,8 @@ in mkCoqDerivation {
   release."1.6.0".sha256      = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
   releaseRev = v: "v${v}";
 
+  extraNativeBuildInputs = [ which elpi ];
   mlPlugin = true;
-  propagatedBuildInputs = [ elpi ];
 
   meta = {
     description = "Coq plugin embedding ELPI.";
diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix
index 563e2dc22d6..3b8b23618d2 100644
--- a/pkgs/development/coq-modules/coqeal/default.nix
+++ b/pkgs/development/coq-modules/coqeal/default.nix
@@ -1,6 +1,6 @@
 { coq, mkCoqDerivation, mathcomp, bignums, paramcoq, multinomials,
   mathcomp-real-closed,
-  lib, version ? null }:
+  lib, which, version ? null }:
 
 with lib;
 
@@ -22,6 +22,7 @@ with lib;
   release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk";
   release."1.0.3".sha256 = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
 
+  extraBuildInputs = [ which ];
   propagatedBuildInputs = [ mathcomp.algebra bignums paramcoq multinomials ];
 
   meta = {
diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 853e77990b6..66a3dd222dd 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -28,10 +28,8 @@ with lib; mkCoqDerivation {
   release."1.3-coq8.12".sha256   = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8";
   release."1.3-coq8.11".sha256   = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b";
   release."1.3-coq8.10".sha256   = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd";
-  release."1.1.1-coq8.9" = { sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
-                             rev    = "f8b4d81a213aa1f25afbe53c7c9ca1b15e3d42bc"; };
-  release."1.1-coq8.8" =   { sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
-                             rev    = "c3cb54b4d5f33fab372d33c7189861368a08fa22"; };
+  release."1.1.1-coq8.9".sha256  = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
+  release."1.1-coq8.8".sha256    = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
 
   release."1.3.1-coq8.13".version  = "1.3.1";
   release."1.3.1-coq8.12".version  = "1.3.1";
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index 26988b81e1a..46ede02a57e 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -20,6 +20,7 @@ with lib; mkCoqDerivation {
   release."8.7.2".sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
   releaseRev = v: "v${v}";
 
+  extraBuildInputs = [ which ];
   propagatedBuildInputs = [ bignums ];
 
   meta = with lib; {
diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix
index a4f7ca405f7..3491e6b21f2 100644
--- a/pkgs/development/coq-modules/coqtail-math/default.nix
+++ b/pkgs/development/coq-modules/coqtail-math/default.nix
@@ -14,7 +14,9 @@ mkCoqDerivation {
   release."8.14".sha256 = "sha256:1k8f8idjnx0mf4z479vcx55iz42rjxrbplbznv80m2famxakq03c";
   release."20201124".rev    = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e";
   release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ=";
-  mlPlugin = true;
+
+  extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ];
+
   meta = {
     license = licenses.lgpl3Only;
     maintainers = [ maintainers.siraben ];
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index 09dd65df41d..1a6dba9b0c0 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, autoconf,
+{ lib, mkCoqDerivation, which, autoconf,
   coq, ssreflect, version ? null }:
 
 with lib; mkCoqDerivation {
@@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
   release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl";
   releaseRev = v: "coquelicot-${v}";
 
-  nativeBuildInputs = [ autoconf ];
+  extraNativeBuildInputs = [ which autoconf ];
   propagatedBuildInputs = [ ssreflect ];
   useMelquiondRemake.logpath = "Coquelicot";
 
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index fcc1303e827..7cf6132bf6a 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -39,9 +39,9 @@ mkCoqDerivation {
   release."0.6".sha256   = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
   releaseRev = v: "v${v}";
 
-  nativeBuildInputs = [ autoreconfHook ];
+  extraNativeBuildInputs = [ autoreconfHook ];
   mlPlugin = true;
-  buildInputs = [ coq.ocamlPackages.ocamlgraph ];
+  extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ];
 
   # dpd_compute.ml uses deprecated Pervasives.compare
   # Versions prior to 0.6.5 do not have the WARN_ERR build flag
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index d94dc03b637..47f097a34b2 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -8,10 +8,10 @@ with lib; mkCoqDerivation rec {
   inherit version;
   defaultVersion = if coq.coq-version == "8.5" then "2016-10-24" else null;
   release."2016-10-24".rev    = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
-  release."2016-10-24".sha256 = "16y57vibq3f5i5avgj80f4i3aw46wdwzx36k5d3pf3qk17qrlrdi";
+  release."2016-10-24".sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
 
   mlPlugin = true;
-  buildInputs = [ python27 ];
+  extraBuildInputs = [ python27 ];
 
   prePatch = "patchShebangs etc/coq-scripts";
 
diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index a0f4a3ecae8..f13aec883e7 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -1,4 +1,4 @@
-{ lib, bash, autoconf, automake,
+{ lib, which, autoconf, automake,
   mkCoqDerivation, coq, version ? null }:
 
 with lib; mkCoqDerivation {
@@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
   release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
   releaseRev = v: "flocq-${v}";
 
-  nativeBuildInputs = [ bash autoconf ];
+  nativeBuildInputs = [ which autoconf ];
   mlPlugin = true;
   useMelquiondRemake.logpath = "Flocq";
 
diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix
index 903b3518e5d..23cbd46743b 100644
--- a/pkgs/development/coq-modules/gappalib/default.nix
+++ b/pkgs/development/coq-modules/gappalib/default.nix
@@ -13,7 +13,7 @@ with lib; mkCoqDerivation {
   release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l";
   releaseRev = v: "gappalib-coq-${v}";
 
-  nativeBuildInputs = [ autoconf ];
+  extraNativeBuildInputs = [ which autoconf ];
   mlPlugin = true;
   propagatedBuildInputs = [ flocq ];
   useMelquiondRemake.logpath = "Gappa";
diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix
index c3a815eb5c8..4bf9139b494 100644
--- a/pkgs/development/coq-modules/heq/default.nix
+++ b/pkgs/development/coq-modules/heq/default.nix
@@ -1,26 +1,22 @@
 {lib, fetchzip, mkCoqDerivation, coq, version ? null }:
 
-let fetcher = {rev, repo, owner, sha256, domain, ...}:
-  fetchzip {
-    url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip";
-    inherit sha256;
-   }; in
 with lib; mkCoqDerivation {
   pname = "heq";
   repo = "Heq";
-  owner = "gil.hur";
-  domain = "sf.snu.ac.kr";
+  owner = "gil";
+  domain = "mpi-sws.org";
   inherit version fetcher;
   defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null;
   release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74";
 
   mlPlugin = true;
-  preBuild = "cd src";
+  propagatedBuildInputs = [ coq ];
 
-  extraInstallFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+  extraInstallFlags = [ "COQLIB=$out/lib/coq/${coq.coq-version}" ];
+  preBuild = "cd src";
 
   meta = {
-    homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/";
+    homepage = "https://www.mpi-sws.org/~gil/Heq/";
     description = "Heq : a Coq library for Heterogeneous Equality";
     maintainers = with maintainers; [ jwiegley ];
   };
diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
index 6f15fc80388..c0fa2d7c8e0 100644
--- a/pkgs/development/coq-modules/hierarchy-builder/default.nix
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkCoqDerivation, coq, coq-elpi, version ? null }:
+{ lib, mkCoqDerivation, which, coq, coq-elpi, version ? null }:
 
 with lib; let hb = mkCoqDerivation {
   pname = "hierarchy-builder";
@@ -17,10 +17,13 @@ with lib; let hb = mkCoqDerivation {
   release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
   releaseRev = v: "v${v}";
 
+  extraNativeBuildInputs = [ which ];
+
   propagatedBuildInputs = [ coq-elpi ];
 
   mlPlugin = true;
 
+  installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
   extraInstallFlags = [ "VFILES=structures.v" ];
 
   meta = {
diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index 4134a8fd573..b9257d415e5 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -1,5 +1,4 @@
-{ lib, mkCoqDerivation, autoconf, coq, coquelicot, flocq,
-  mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }:
+{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }:
 
 mkCoqDerivation rec {
   pname = "interval";
@@ -21,9 +20,8 @@ mkCoqDerivation rec {
   release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz";
   releaseRev = v: "interval-${v}";
 
-  nativeBuildInputs = [ autoconf ];
-  propagatedBuildInputs = lib.optional (lib.versions.isGe "8.6" coq.coq-version) bignums
-    ++ [ coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ]
+  extraNativeBuildInputs = [ which autoconf ];
+  propagatedBuildInputs = [ bignums coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ]
     ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];
   useMelquiondRemake.logpath = "Interval";
   mlPlugin = true;
diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix
index 151a0511c80..4993a76b4f0 100644
--- a/pkgs/development/coq-modules/itauto/default.nix
+++ b/pkgs/development/coq-modules/itauto/default.nix
@@ -17,7 +17,7 @@ mkCoqDerivation rec {
   ] null;
 
   mlPlugin = true;
-  nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
+  extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
   enableParallelBuilding = false;
 
   meta = {
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix
index c938a7ad027..1d0d03fb7f7 100644
--- a/pkgs/development/coq-modules/ltac2/default.nix
+++ b/pkgs/development/coq-modules/ltac2/default.nix
@@ -17,6 +17,7 @@ with lib; mkCoqDerivation {
   release."0.1-8.7".rev     = "v0.1-8.7";
   release."0.1-8.7".sha256  = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0";
 
+  nativeBuildInputs = [ which ];
   mlPlugin = true;
 
   meta = {
diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index 2504e852baf..0a78191d8b7 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
   release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
   release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw";
 
-  propagatedBuildInputs = [ bignums ];
+  extraBuildInputs = [ bignums ];
 
   meta = {
     homepage = "https://math-classes.github.io";
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index a19d8b8dcc7..0f562fec287 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -10,9 +10,9 @@
 # See the documentation at doc/languages-frameworks/coq.section.md.        #
 ############################################################################
 
-{ lib, ncurses, graphviz, lua, fetchzip,
+{ lib, ncurses, which, graphviz, lua, fetchzip,
   mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false,
-  coqPackages, coq, version ? null }@args:
+  coqPackages, coq, ocamlPackages, version ? null }@args:
 with builtins // lib;
 let
   repo  = "math-comp";
@@ -60,9 +60,8 @@ let
         inherit version pname defaultVersion release releaseRev repo owner;
 
         mlPlugin = versions.isLe "8.6" coq.coq-version;
-        nativeBuildInputs = optionals withDoc [ graphviz lua ];
-        buildInputs = [ ncurses ];
-        propagatedBuildInputs = mathcomp-deps;
+        extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ];
+        extraBuildInputs = [ ncurses ] ++ mathcomp-deps;
 
         buildFlags = optional withDoc "doc";
 
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index 09327f46b86..583d8b7adb9 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchzip,
+{ lib, which, fetchzip,
   mkCoqDerivation, recurseIntoAttrs,  single ? false,
   coqPackages, coq, equations, version ? null }@args:
 with builtins // lib;
@@ -36,8 +36,10 @@ let
       derivation = mkCoqDerivation ({
         inherit version pname defaultVersion release releaseRev repo owner;
 
+        extraNativeBuildInputs = [ which ];
         mlPlugin = true;
-        propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps;
+        extraBuildInputs = [ coq.ocamlPackages.zarith ];
+        propagatedBuildInputs = [ equations ] ++ metacoq-deps;
 
         patchPhase =  ''
           patchShebangs ./configure.sh
diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix
index 83333b3e1bf..26bd38f72df 100644
--- a/pkgs/development/coq-modules/metalib/default.nix
+++ b/pkgs/development/coq-modules/metalib/default.nix
@@ -13,6 +13,7 @@ with lib; mkCoqDerivation {
   release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs";
 
   sourceRoot = "source/Metalib";
+  installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}";
 
   meta = {
     license = licenses.mit;
diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix
index cbf1469e1f0..e112512ec5c 100644
--- a/pkgs/development/coq-modules/semantics/default.nix
+++ b/pkgs/development/coq-modules/semantics/default.nix
@@ -24,8 +24,8 @@ mkCoqDerivation rec {
   ] null;
 
   mlPlugin = true;
-  nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
-  propagatedBuildInputs = (with coq.ocamlPackages; [ num ]);
+  extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]);
+  extraBuildInputs = (with coq.ocamlPackages; [ num ]);
 
   postPatch = ''
     for p in Make Makefile.coq.local
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index a0417ca978d..bcc391c4f72 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -11,9 +11,11 @@ with lib; mkCoqDerivation {
   ] null;
   release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
   release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
+  extraNativeBuildInputs = (with coq.ocamlPackages; [ cppo zarith ]);
+  propagatedBuildInputs = [ coq-ext-lib ]
+  ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
+
   mlPlugin = true;
-  nativeBuildInputs = coq.ocamlPackages.cppo;
-  propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ];
 
   doCheck = true;
   checkTarget = "test";
diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
index ebaebe6974e..0389b45fb5c 100644
--- a/pkgs/development/coq-modules/smtcoq/default.nix
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -13,11 +13,9 @@ mkCoqDerivation {
     { case = isEq "8.13"; out = "itp22"; }
   ] null;
 
-  propagatedBuildInputs = [ trakt cvc4 ]
-    ++ lib.optionals (!stdenv.isDarwin) [ veriT ]
-    ++ (with coq.ocamlPackages; [ num zarith ]);
-  mlPlugin = true;
-  nativeBuildInputs = with coq.ocamlPackages; [ ocamlbuild ];
+  propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ];
+  extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml ocamlbuild ];
+  extraBuildInputs = with coq.ocamlPackages; [ findlib num zarith ];
 
   meta = {
     description = "Communication between Coq and SAT/SMT solvers ";
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index cc842842517..0770f3a48d4 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, lib, fetchzip, bash
-, buildDunePackage, camlp5
+{ stdenv, lib, fetchzip, buildDunePackage, camlp5
 , re, perl, ncurses
 , ppxlib, ppx_deriving
 , ppxlib_0_15, ppx_deriving_0_15
-, coqPackages
 , version ? "1.14.1"
 }:
 with lib;
-let fetched = coqPackages.metaFetch ({
+let fetched = import ../../../build-support/coq/meta-fetch/default.nix
+  {inherit lib stdenv fetchzip; } ({
     release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
     release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r";
     release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka";
@@ -33,11 +32,6 @@ buildDunePackage rec {
      else [ ppxlib_0_15 ppx_deriving_0_15 ]
   );
 
-  patchPhase = ''
-    sed -e "s/SHELL:=/SHELL?=/" -i Makefile || true
-  '';
-  buildPhase = "SHELL=${bash} make build";
-
   meta = {
     description = "Embeddable λProlog Interpreter";
     license = licenses.lgpl21Plus;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 6cfd34aa279..9c3e666c5b3 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchzip
-, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09
+{ lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09
 , ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html
 }@args:
 let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in
@@ -9,8 +8,6 @@ let
       inherit coq lib;
       coqPackages = self;
 
-      metaFetch = import ../build-support/coq/meta-fetch/default.nix
-        {inherit lib stdenv fetchzip; };
       mkCoqDerivation = callPackage ../build-support/coq {};
 
       contribs = recurseIntoAttrs

From 4b005b493a5913a4152a6451ef6157970e57f883 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 May 2022 04:51:50 +0000
Subject: [PATCH 33/53] python310Packages.tubeup: 0.0.28 -> 0.0.30

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

diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index e11aaa7d555..46a8df82dff 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "tubeup";
-  version = "0.0.28";
+  version = "0.0.30";
 
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+RvDwOHL+zwpM/nOWWS7pZIFEOx+jMrgt3FLYSshANo=";
+    sha256 = "sha256-xN3H3l4ANT7/tXg+oGScvE0Atf6h9CVbODaWybe8a9o=";
   };
 
   postPatch = ''

From 5f1dd0d00918121546afb33e9c82dd39eb5e1cd8 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 13 May 2022 01:08:03 -0400
Subject: [PATCH 34/53] bao: init at 0.12.0

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

diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/tools/security/bao/default.nix
new file mode 100644
index 00000000000..cf6014c84fe
--- /dev/null
+++ b/pkgs/tools/security/bao/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, fetchCrate
+, fetchpatch
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "bao";
+  version = "0.12.0";
+
+  src = fetchCrate {
+    inherit version;
+    pname = "${pname}_bin";
+    sha256 = "SkplBzor7Fv2+6K8wcTtZwjR66RfLPA/YNNUUHniWpM=";
+  };
+
+  cargoSha256 = "yr4HvtOWnU2dFTBgSsbVcuDELe1o1SEtZ7rN/ctKAdI=";
+
+  meta = {
+    description = "An implementation of BLAKE3 verified streaming";
+    homepage = "https://github.com/oconnor663/bao";
+    maintainers = with lib.maintainers; [ amarshall ];
+    license = with lib.licenses; [ cc0 asl20 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eedb84359b..58b3cc28656 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2576,6 +2576,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  bao = callPackage ../tools/security/bao {};
+
   bar = callPackage ../tools/system/bar {};
 
   base16-shell-preview = callPackage ../misc/base16-shell-preview { };

From d03354ab859fe190bd1916553cf5af69d7619bb6 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Fri, 13 May 2022 07:19:28 +0200
Subject: [PATCH 35/53] UUID4-Tiny: add potential patch for aarch64

Hopefully ofborg can confirm or deny this works...
---
 pkgs/top-level/perl-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3c1557f52ca..44b3e189611 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -24497,6 +24497,12 @@ let
       url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.002.tar.gz";
       sha256 = "e7535b31e386d432dec7adde214348389e1d5cf753e7ed07f1ae04c4360840cf";
     };
+    postPatch = lib.optionalString (stdenv.isAarch64) ''
+      # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h
+      # printf SYS_getrandom | gcc -include sys/syscall.h -E -
+      substituteInPlace lib/UUID4/Tiny.pm \
+        --replace "syscall( 318" "syscall( 278"
+    '';
     meta = {
       description = "Cryptographically secure v4 UUIDs for Linux x64";
       license = with lib.licenses; [ artistic1 gpl1Plus ];

From ec486b0a2e98105d4ae26a85bc775de60921ab62 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 13 May 2022 16:34:31 +1200
Subject: [PATCH 36/53] emacs.pkgs.elpa-packages: 2022-05-13

---
 .../emacs/elisp-packages/elpa-generated.nix   | 63 ++++++++++++-------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 9103af47119..0cee33fc81e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -384,10 +384,10 @@
       elpaBuild {
         pname = "boxy";
         ename = "boxy";
-        version = "1.0.5";
+        version = "1.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/boxy-1.0.5.tar";
-          sha256 = "0g608nhg160p9gflw52h3247x35r0g6bl89yq35jbsc7fnw6m5ry";
+          url = "https://elpa.gnu.org/packages/boxy-1.1.0.tar";
+          sha256 = "17z0amn1klbzvq0z5g20a5gjq5agrrhnkp8amqlqzj7p0p31nbns";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -399,10 +399,10 @@
       elpaBuild {
         pname = "boxy-headings";
         ename = "boxy-headings";
-        version = "2.1.2";
+        version = "2.1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/boxy-headings-2.1.2.tar";
-          sha256 = "0jyfp41jw33kmi7832x5x0mgh5niqvb7dfc7q00kay5q9ixg83dq";
+          url = "https://elpa.gnu.org/packages/boxy-headings-2.1.3.tar";
+          sha256 = "09k5x123db19v2k49y8acyk5y3r0fxw0xz61qqqidrgrx8fs3mg9";
         };
         packageRequires = [ boxy emacs org ];
         meta = {
@@ -1384,10 +1384,10 @@
       elpaBuild {
         pname = "eldoc";
         ename = "eldoc";
-        version = "1.11.1";
+        version = "1.12.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eldoc-1.11.1.tar";
-          sha256 = "065clc07nrgp56cgynqhq3fmnwd64ccg2jxzikzb0f2zkn10vc90";
+          url = "https://elpa.gnu.org/packages/eldoc-1.12.0.tar";
+          sha256 = "1npggpisqnfkc3gx7dr3pjnif7gf571z7s9g7n6vnb213353qskk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1499,10 +1499,10 @@
       elpaBuild {
         pname = "engrave-faces";
         ename = "engrave-faces";
-        version = "0.3.0";
+        version = "0.3.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/engrave-faces-0.3.0.tar";
-          sha256 = "0l59fci16m6li52bqwbqglsi9gavgsfkxlxm9y1ny3ma0w1rnp9d";
+          url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar";
+          sha256 = "1q4sjl2rvcfwcirm32nmi53258ln71yhh1dgszlxwknm38a14v3i";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1714,10 +1714,10 @@
       elpaBuild {
         pname = "fontaine";
         ename = "fontaine";
-        version = "0.1.1";
+        version = "0.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/fontaine-0.1.1.tar";
-          sha256 = "1jyb6s2sqr9fmy6f4i9vijaswb8f9vn2br98d4w2afzhmf4d0bdc";
+          url = "https://elpa.gnu.org/packages/fontaine-0.2.1.tar";
+          sha256 = "11g03gaiypqf0xi7s3xyjnbi2w154lkd7j0ybmn8scs6pbzdyl95";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2931,10 +2931,10 @@
       elpaBuild {
         pname = "nano-modeline";
         ename = "nano-modeline";
-        version = "0.6";
+        version = "0.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nano-modeline-0.6.tar";
-          sha256 = "1cxycfx4ic2hzfvp3d2z0a5xjg97p49yla3a1qxw1dldcjg9lfg0";
+          url = "https://elpa.gnu.org/packages/nano-modeline-0.7.tar";
+          sha256 = "1fsjzbdawkn4vmk6zs6az1b42mx5ka7a618fgx5zdncr79wl0vjw";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3175,10 +3175,10 @@
       elpaBuild {
         pname = "org-real";
         ename = "org-real";
-        version = "1.0.4";
+        version = "1.0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar";
-          sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705";
+          url = "https://elpa.gnu.org/packages/org-real-1.0.5.tar";
+          sha256 = "0g70bzhr094fah86cyvd9ci8q28qi9c44g33i4lw7clklgdx7mxl";
         };
         packageRequires = [ boxy emacs org ];
         meta = {
@@ -3426,6 +3426,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "plz";
+        ename = "plz";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/plz-0.1.tar";
+          sha256 = "083qz6kfg4q8xy3vsfwlk2g9vbg8iym2axmyhh54naivrc096ghc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/plz.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     poker = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "poker";
@@ -4553,10 +4568,10 @@
       elpaBuild {
         pname = "tomelr";
         ename = "tomelr";
-        version = "0.3.0";
+        version = "0.4.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tomelr-0.3.0.tar";
-          sha256 = "0jnnyvbmhqn8wkg3y13iy19nck6dphay8jdy2nimp28a1jvs7z6g";
+          url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar";
+          sha256 = "03dj7mhqyfdpxr32nyvfgkqr6wr55cd7yk9a0izjs4468zx8vl0d";
         };
         packageRequires = [ emacs map seq ];
         meta = {

From 188354162035379a38d1be9b19cfad7a87fef0fb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 13 May 2022 16:36:13 +1200
Subject: [PATCH 37/53] emacs.pkgs.melpa-packages: 2022-05-13

---
 .../elisp-packages/recipes-archive-melpa.json | 1576 +++++++++--------
 1 file changed, 796 insertions(+), 780 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 800a01667f1..bc3466f4890 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -2641,15 +2641,15 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20220505,
-    834
+    20220510,
+    752
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "7c9db258ba7dd0a8c90eb7cebd335961cc45e031",
-   "sha256": "0jh46x04n13a2bcfz5vkpwknhc6d6ppfpf39w5v980my2jghs5n7"
+   "commit": "7c382ccbc8b1b2d0e18d280b24ee2029dca070d8",
+   "sha256": "0145agd3kg1m7ylishf4ypg6bc01jrps17rwxw0kdqrh3gp7xvg3"
   },
   "stable": {
    "version": [
@@ -3271,8 +3271,8 @@
     20200914,
     644
    ],
-   "commit": "7615aa55068754d36711e19bfc926b87d5b8f33c",
-   "sha256": "1ix15ff08adkvlpvh6v5cpx6an0y965rm9d06zallsg1wrzr2rcl"
+   "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8",
+   "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00"
   },
   "stable": {
    "version": [
@@ -3618,17 +3618,17 @@
  },
  {
   "ename": "apheleia",
-  "commit": "74ef92045e0f64b34cdb1ca686c9159b0623e61f",
-  "sha256": "0dmjvj7gw8qd8vh9m8ibs5pqgs63f5pv02686k97sawbkav7mg1r",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "17aknfx1ii97lsqm4228rxawa6klnxpi948pl5bzwls9fx91g31v",
   "fetcher": "github",
-  "repo": "raxod502/apheleia",
+  "repo": "radian-software/apheleia",
   "unstable": {
    "version": [
-    20220501,
-    2151
+    20220512,
+    1952
    ],
-   "commit": "50da8cd1a94fbcd6456b2528a9db20a5cfc8ff5f",
-   "sha256": "12z8vsnxq8bsfbds3d1wbnrkv8i4kcm6l75hr0pnh4jr6yrmc419"
+   "commit": "b5dbab53eadf64529a0bfe217c7750f1d7d85fce",
+   "sha256": "1w7x7k5mrvp5yq5ppq9zps5z2c7h67yjxyaxcvbkjibvswb0c616"
   },
   "stable": {
    "version": [
@@ -4661,8 +4661,8 @@
     "keytar",
     "s"
    ],
-   "commit": "09dd28d875dfe9d1ca9bb8ab3ee2f6102a00832b",
-   "sha256": "13pqis46qxk242yim8l08kzkj0v36jam37rvj2v7z1lallvrk664"
+   "commit": "5c6f0952f28ce722f4a75139f3dc1afc99e12396",
+   "sha256": "0v83s1gfyh1zbaaqgj2q9vg193k705kr18mszp6p8rdyffdw5fqi"
   },
   "stable": {
    "version": [
@@ -4774,8 +4774,8 @@
     "compat",
     "packed"
    ],
-   "commit": "f19e9fbb8d72a47f0cef049b784e1a492bef9287",
-   "sha256": "0bjq0x7hv1fg4db3wria5lnlliln7598qsc0l42pic34w1qq3h6l"
+   "commit": "16de66c381dab3c1fb7bc248e0f81ef68966bd7d",
+   "sha256": "0ls5n124rl8s3dyj0kr7n1sv3dkn9bw7k61s2f2ads43gp3744qp"
   },
   "stable": {
    "version": [
@@ -5148,8 +5148,8 @@
    "deps": [
     "ht"
    ],
-   "commit": "3d60d2c64278f9f933ee78299f6decde2254af7e",
-   "sha256": "1r5a9a1s0gb1f7dr36bjkf8zch0q7krk0mjikhs4kd2rfga3ba4a"
+   "commit": "e31a2d2bb97ffcbeb493f3501311b30c3f10952f",
+   "sha256": "0md8dlx1g5lxb4f5yxhm617kj49zysya9y6awjrvpj30crp78g5z"
   },
   "stable": {
    "version": [
@@ -5466,15 +5466,15 @@
   "repo": "Fuco1/autobookmarks",
   "unstable": {
    "version": [
-    20190919,
-    841
+    20220509,
+    1712
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "224b24950d3ae57cd16d7417c07fda337fe0ea09",
-   "sha256": "0cfx447185shbiadhbar72bgqwzmbia82f8a2py215hgw9wrgqr9"
+   "commit": "8acd6f182181e23257e01c1b5cf90b872507a74d",
+   "sha256": "1q4r3l40lqdykhv4w675g6dz3mpp36abiilslhkyx2i7rxpa88z8"
   }
  },
  {
@@ -5711,8 +5711,8 @@
     "avy",
     "embark"
    ],
-   "commit": "857c8403529f54bfeecf460fe98b1a0b8e206802",
-   "sha256": "09rpnr8lxk5gpjx4vbsi59027yggwh68909vqyxhbqqs2d7f9n26"
+   "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1",
+   "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc"
   },
   "stable": {
    "version": [
@@ -5922,11 +5922,11 @@
   "url": "https://bitbucket.org/pdo/axiom-environment",
   "unstable": {
    "version": [
-    20211120,
-    1646
+    20220512,
+    1931
    ],
-   "commit": "e60de5ed107ffeb530a56d24d04f38988124d12b",
-   "sha256": "0p8kbxfcrx1ib8g17g6h2i2ygy35qq992n3s2xa6ysij7wrfn4hd"
+   "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2",
+   "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6"
   }
  },
  {
@@ -6051,8 +6051,8 @@
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "0d44408262080cdf998de5a52516f220e7e7c99a",
-   "sha256": "1l818vv2wh07jxc7wxmnidr8rcbj8526245fsflxp051hpilvan8"
+   "commit": "edc5f1e8ca049c06d18d703479c4737f3530602e",
+   "sha256": "19fzjqb1a5g504qwb01j447rf5q6sa0farf9acq3slwv03bbwva6"
   },
   "stable": {
    "version": [
@@ -6277,19 +6277,19 @@
   "repo": "belak/base16-emacs",
   "unstable": {
    "version": [
-    20211225,
-    2032
+    20220510,
+    423
    ],
-   "commit": "ad2fd1137d6ec144f87b26dce15ce5c5d42bde39",
-   "sha256": "009k9j7bi7x8pmp5d12bdzng3ampqwy8l1jf1dxxf9989wv27hrc"
+   "commit": "43f3257aaf53e9c50f5db11b81fd66ec41ab2883",
+   "sha256": "07k73bgjb6ixfgbiwf8zswf6n0kb3bf1ka1pcv88h3a9hhndvgv5"
   },
   "stable": {
    "version": [
     2,
-    2
+    4
    ],
-   "commit": "10180e88d6d9434cec367b6c91222dd2fc3bd8ae",
-   "sha256": "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6"
+   "commit": "7b2bb8d05562fa8d75366e82eef895c03ab7b31c",
+   "sha256": "1jgqq52q2q7sgf46xip0sfpwyi8k43v2l688hx7p0whncjhd7cmr"
   }
  },
  {
@@ -7133,8 +7133,8 @@
     "a",
     "pdf-tools"
    ],
-   "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2",
-   "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj"
+   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
+   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
   }
  },
  {
@@ -7242,8 +7242,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "aad77ba6ce64245570b4baa83b62008522c3ce3a",
-   "sha256": "1n4cshnq9nfqa4yr126g144725ivc492xw1pw37fhvjcjpmg7g2p"
+   "commit": "e6d8ca47f77e0579fcb5a1dcb88218087102c355",
+   "sha256": "0hqrq3gcmsy20vsld6qkd8wsyqzy1kxmxl9hn0nxmc6cixz55qgj"
   },
   "stable": {
    "version": [
@@ -7497,16 +7497,16 @@
   "repo": "canatella/bitbake-el",
   "unstable": {
    "version": [
-    20190107,
-    1155
+    20220509,
+    1236
    ],
    "deps": [
     "dash",
     "mmm-mode",
     "s"
    ],
-   "commit": "ba58bd051457ba0abd2fbc955ea0e75e78ff2c64",
-   "sha256": "09ncblz9x2qz6lqfywvj3b7qagrq34qb0wg17y03p1r3416g1zwr"
+   "commit": "434b088ab8715731d62978264cb934e34c75c4b3",
+   "sha256": "15p265zigxki80h3gfq61cmssqqwcnp0990zl8xmj8p377523l6m"
   }
  },
  {
@@ -7610,17 +7610,17 @@
  },
  {
   "ename": "blackout",
-  "commit": "9128d87569dc74b90f57dd65edead7199f5c7911",
-  "sha256": "06gxgald2vchfwhbiaap7rfjk7kirfv4yjc4r98g998v96bilw64",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "064k2xwk45sl0dfa2ck39lwlibh71yd4v03ba2zkbk9bva90arqs",
   "fetcher": "github",
-  "repo": "raxod502/blackout",
+  "repo": "radian-software/blackout",
   "unstable": {
    "version": [
-    20200404,
-    1550
+    20220509,
+    2350
    ],
-   "commit": "c221fa2c8a204b4aff2e09c606f59be58b960b97",
-   "sha256": "1zzrmlxifplpskm3a7hbm4x6mpikr1nhgds10qaxqv0gfq312p1c"
+   "commit": "7707211370f03f03a2f74df15f42ac24a1e99300",
+   "sha256": "1lk7zvndd41aq67f9agjkzyp4xp1q9m9srjd30nfgsgi2qmbj45r"
   },
   "stable": {
    "version": [
@@ -8153,15 +8153,15 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20220503,
-    1114
+    20220511,
+    1643
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "cd1fbd60a2ff62bbfca124ea1e602b14c4aa58e9",
-   "sha256": "0gk53s4r97qf1mps561x1pjcfzc2nkvd6m559kaf03xsbb6w8mdf"
+   "commit": "55271c12e05c14e30102bd64bd609af29d58846e",
+   "sha256": "104kf3km7450jj7brgjhmw5idrvk3s1qjxclzpv7xypyvi53ab8l"
   },
   "stable": {
    "version": [
@@ -8721,11 +8721,11 @@
   "repo": "lukhas/buffer-move",
   "unstable": {
    "version": [
-    20160615,
-    1803
+    20220512,
+    755
    ],
-   "commit": "cb517ecf8409b5fdcda472d7190c6021f0c49751",
-   "sha256": "0gxy58v8nyv6pmzfn8552m8a14f5lzcbkndp5xpzq4g9qvmifmj6"
+   "commit": "e7800b3ab1bd76ee475ef35507ec51ecd5a3f065",
+   "sha256": "1g7g71fzxrak9qkps6f7j52y83dic9ccq9ykc8babla2y79jr7x1"
   },
   "stable": {
    "version": [
@@ -9756,8 +9756,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20220504,
-    516
+    20220511,
+    1104
    ],
    "deps": [
     "dash",
@@ -9767,22 +9767,25 @@
     "s",
     "transient"
    ],
-   "commit": "a59e8ab65601e30073fa55bef76e95c964c678d8",
-   "sha256": "15dx3ppqrv1chkjpj0dn463bmhncvl5vy0lg74g6bdbw5z0vhbzc"
+   "commit": "232fa1cf3af08200af439d1cbb5a131f38286183",
+   "sha256": "1ncyrrzk0a1wfyr3khvznda7l59g4vg9h3nglzbihnbvfkxqh6cn"
   },
   "stable": {
    "version": [
     2,
-    10,
+    12,
     0
    ],
    "deps": [
     "dash",
+    "esxml",
+    "org",
+    "request",
     "s",
     "transient"
    ],
-   "commit": "933140a3227ee61cfccf3cf0c567b5c9e64f1ded",
-   "sha256": "0s26a2fy1xldd0q57avds7zn0h7lkis2hjh9zmm1qhwn8409hys9"
+   "commit": "1e09bd7cdf7e3274a0f43a66bba3121ea6b42f4a",
+   "sha256": "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0"
   }
  },
  {
@@ -10361,8 +10364,8 @@
     "dash",
     "lsp-mode"
    ],
-   "commit": "675a5704c14a27931e835a431beea3631d92e8e6",
-   "sha256": "0l4bhyr9d8ljz1f0cfg1s2cjcmh6fiwbk5mdlvc7rrwz5hxc21is"
+   "commit": "ae74a39303457a5e6976dd1c6816cde97d357a0d",
+   "sha256": "0y1fyiq3m3xsbc82cq3wdmsi549risvpm5xc2bsid6vmmfnafl1y"
   }
  },
  {
@@ -10661,8 +10664,8 @@
     20171115,
     2108
    ],
-   "commit": "9b4331ab42d3e84dea9293ef989ff1b29e97b2b1",
-   "sha256": "0rmla0fdskaw1lqi73fiicyi7py3bn1xhn4jh46w7dnwmhm3x9zz"
+   "commit": "0d98e5a6f0c08e2b1d2c8e96c3dfc7e619210f72",
+   "sha256": "1i5icnrvfi83kxf4n6a83aksllnaddb653kcjnmg3n70q5mffavf"
   },
   "stable": {
    "version": [
@@ -10817,8 +10820,8 @@
     20220318,
     1007
    ],
-   "commit": "06011b53bf64d671c74a79757332b9ef13f47f2b",
-   "sha256": "00znwpkdvs7igi8c7gns7viikal4029prpf1q3c805l2m9m0424g"
+   "commit": "0a526709f55f8074f8846f8e7b9090431f1d6a47",
+   "sha256": "118pc03zpv9c7haxvmf4xkd6lby7xrxsal6pwq5lw5sw840g1nhr"
   },
   "stable": {
    "version": [
@@ -11805,16 +11808,16 @@
   "repo": "bdarcus/citar",
   "unstable": {
    "version": [
-    20220508,
-    1220
+    20220509,
+    2336
    ],
    "deps": [
     "citeproc",
     "org",
     "parsebib"
    ],
-   "commit": "9c732e91a4d198d0dc79df7f36524324d383c211",
-   "sha256": "0xhgp70sphzzskhxznzd2lf38wsdayac82wi8cyfhp0159z5zh0n"
+   "commit": "9a6fc6da11ad2b475244cc4cbd51c77615e9aad3",
+   "sha256": "0q1hl8xsqb64lx10kcc4az3azaa8j3zly3pkf3lixh0qrc74bil2"
   },
   "stable": {
    "version": [
@@ -12732,8 +12735,8 @@
     "compat",
     "emacsql-sqlite"
    ],
-   "commit": "6f4af0fc87fa0a1734480d6a4b72797c0916bc12",
-   "sha256": "1azp6gpswqzhvqamh4h1wi8xkby98irj6w3f3ky943a1zlkibq4a"
+   "commit": "87d2edae8bc3d390bcfc5e909e9c13ff9fce994a",
+   "sha256": "1grxpxrjzziqad840cw5ivp4xym0p3y0p3jwrf1j4dkbp670c75d"
   },
   "stable": {
    "version": [
@@ -12909,8 +12912,8 @@
     20220322,
     1258
    ],
-   "commit": "b541073a447a21c9117375e24d2db6af37dd6cfc",
-   "sha256": "00phxl6z8vpph6ypbmcckb131ls6g91lq9cjxbgc7878sxcilf6f"
+   "commit": "a1c61a7e1a9f7a019809010e097f1e4c42c50022",
+   "sha256": "1qabbyqn450lhb5f1kaxqwv37fc9ahj89rka5c374kgzscjgjdna"
   },
   "stable": {
    "version": [
@@ -14048,8 +14051,8 @@
     "axiom-environment",
     "company"
    ],
-   "commit": "e60de5ed107ffeb530a56d24d04f38988124d12b",
-   "sha256": "0p8kbxfcrx1ib8g17g6h2i2ygy35qq992n3s2xa6ysij7wrfn4hd"
+   "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2",
+   "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6"
   }
  },
  {
@@ -15158,21 +15161,21 @@
  },
  {
   "ename": "company-prescient",
-  "commit": "b92c34e493bbefab1d7747b0855d1ab2f984cb7c",
-  "sha256": "0cp918ihbjqxfgqnifknl5hphmvq5bl42dhp5ylvijsfa8kvbsb9",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "06cxvd7w7bw4gw061k3vsmvx7kvm2kz71nr4kmwya7zamz171gwh",
   "fetcher": "github",
-  "repo": "raxod502/prescient.el",
+  "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20211228,
-    417
+    20220509,
+    2300
    ],
    "deps": [
     "company",
     "prescient"
    ],
-   "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca",
-   "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j"
+   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
+   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
   },
   "stable": {
    "version": [
@@ -15589,15 +15592,15 @@
   "repo": "rafalcieslak/emacs-company-terraform",
   "unstable": {
    "version": [
-    20190607,
-    1037
+    20220509,
+    1759
    ],
    "deps": [
     "company",
     "terraform-mode"
    ],
-   "commit": "2d11a21fee2f298e48968e479ddcaeda4d736e12",
-   "sha256": "0hxilq7289djrn6kgw7n926zpz0pr7iyd1wm6cy8yfhxf546a4px"
+   "commit": "8d5a16d1bbeeb18ca49a8fd57b5d8cd30c8b8dc7",
+   "sha256": "0s3n2hi7x21pza8nfayy86w4m30l95x0lcbpsknl50v15z5sch0i"
   },
   "stable": {
    "version": [
@@ -16465,15 +16468,15 @@
   "repo": "OlMon/consult-projectile",
   "unstable": {
    "version": [
-    20220505,
-    1139
+    20220511,
+    2103
    ],
    "deps": [
     "consult",
     "projectile"
    ],
-   "commit": "8e618bc62405e345cc59e891f82d8ee45691010a",
-   "sha256": "1mpj0sxy1x8333h88av4nmawy5amgbszxfzc653w3325s6x39xnc"
+   "commit": "130ba9d3879bc293d81b1aa9fbfd0dffae3b5579",
+   "sha256": "0gvrhh58097lry1d13xx4il2kbkljrk170hgr8ibxdzq0jf09aah"
   }
  },
  {
@@ -16961,8 +16964,8 @@
    "deps": [
     "counsel"
    ],
-   "commit": "f618411fc8f607e4c93b5efa98584fd461c53ac6",
-   "sha256": "0jidrijrb28j81w7jhsl87vjagvq5x4h144cynd2kiyb8y2qpg2s"
+   "commit": "3e731889dd4519d16c38d5ad20f4ecdea0c95475",
+   "sha256": "1c4y9j0dlwxcahg7r62llv6w66iz48zmsnfwj9pv9pdhw6cnpc23"
   }
  },
  {
@@ -18360,17 +18363,17 @@
  },
  {
   "ename": "ctrlf",
-  "commit": "46073c430c271aa1971e27948e7f6d4b65b3d533",
-  "sha256": "01d2zv7x588r55namcda58l21lg5sbwcn1ycnvg5md69pv5cg461",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "1lls531qj0ls61byx0546diq2d8jkvk6x250rvwaiw225476mc0i",
   "fetcher": "github",
-  "repo": "raxod502/ctrlf",
+  "repo": "radian-software/ctrlf",
   "unstable": {
    "version": [
-    20220501,
-    2234
+    20220509,
+    2344
    ],
-   "commit": "efe9534747e056b210e359c3abc67ef94a8ea5ad",
-   "sha256": "12i6mis37196c13jw5wnybfhdkhw3cfny3v0l98ksp6ki6sr2h5w"
+   "commit": "d37d7a997e1e3ef5e2223aeecbbef92f369b0760",
+   "sha256": "1lfd20xknpxxb9qiqhj9mqabsgibzdkhf335mm4vl9jvgim6j7vs"
   },
   "stable": {
    "version": [
@@ -18556,20 +18559,20 @@
   "repo": "russell/cue-mode",
   "unstable": {
    "version": [
-    20220507,
-    1728
+    20220512,
+    2104
    ],
-   "commit": "598c9b33b888e067e7472710a5f159cee98a0307",
-   "sha256": "08px1mxpsl5n7yd8pgkpj0xkmhfvhgppbwwrjm59wgnaiq0mw8sf"
+   "commit": "f98b9f9088fcb66c97f9200f6c8a0cd16c11caae",
+   "sha256": "08nxlgf02v8gz92dif3fy72qz3yisybxlx1i0any3sxn5swi7g7y"
   },
   "stable": {
    "version": [
     1,
     0,
-    8
+    9
    ],
-   "commit": "598c9b33b888e067e7472710a5f159cee98a0307",
-   "sha256": "08px1mxpsl5n7yd8pgkpj0xkmhfvhgppbwwrjm59wgnaiq0mw8sf"
+   "commit": "f98b9f9088fcb66c97f9200f6c8a0cd16c11caae",
+   "sha256": "08nxlgf02v8gz92dif3fy72qz3yisybxlx1i0any3sxn5swi7g7y"
   }
  },
  {
@@ -18855,8 +18858,8 @@
     20211111,
     1407
    ],
-   "commit": "d4cbe45b38695cd27c56ea0b786c52caa4e164de",
-   "sha256": "0z1bdrs5v6rxgbakawzcv57llsccgmc6lch0c31qss6dchih9y98"
+   "commit": "89591f7c85f6b8eb580ac8f3a00014f28c61a139",
+   "sha256": "0yj3i2jrajh33v0h6djlzsl5l5gb2958z365d1zjbabqxj202wg3"
   },
   "stable": {
    "version": [
@@ -19063,8 +19066,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20220507,
-    1711
+    20220512,
+    513
    ],
    "deps": [
     "bui",
@@ -19076,8 +19079,8 @@
     "posframe",
     "s"
    ],
-   "commit": "d534b4a2f9ec3f9e4d804a660830764bed062e15",
-   "sha256": "1ww9hlwa3912gkny16chvk4s7qzn2sl0hf81dijismxwwlpcmhid"
+   "commit": "52ac284dafff3fbae561d1743b73131339421d76",
+   "sha256": "112qpba47csbhqha4y3vlccgzm14x7x522r2n1p9q4ssknn7va4i"
   },
   "stable": {
    "version": [
@@ -19430,8 +19433,8 @@
     20220409,
     620
    ],
-   "commit": "09290bf700cc269ad3c07d9518cd758b90971fcd",
-   "sha256": "16in48zcxq2zdlz40zf6nxi87xk6a6p14fms9z931rcilhl5p2d8"
+   "commit": "0a86c0eabe6bb5e188e6ae915d971103248a3d26",
+   "sha256": "1ki4g5s4n2c4zvsk56w4ync2rrwbchz63ms68a2xjkmnihy83x90"
   },
   "stable": {
    "version": [
@@ -19479,8 +19482,8 @@
    "deps": [
     "dashboard"
    ],
-   "commit": "d8c435ac251ec6493da10882cb161c0e9df03b91",
-   "sha256": "1dca3s6lj19x0vrmqgw7d4wlqby528lal2q1nvq2zm159y6r6bv6"
+   "commit": "f9e199a20c654c3d1d8f405fdec9acb294afc004",
+   "sha256": "0l0bylzd9r6cc04r1b5ky3dqshzc2k6j47hqini35ibk331dm804"
   },
   "stable": {
    "version": [
@@ -21009,8 +21012,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "09073e6bfd21f3a7f8fcf1e2e7c49994cdee7d2a",
-   "sha256": "0g8wdsf8rbyl2z9h4d40hjxqp3krj3vkrwwc3j36pzrc48ms2wl1"
+   "commit": "81c94b0707d5ddd9a3b9962ee441206db1d25967",
+   "sha256": "00xba7dpmsiq13zhcxcvwlb65v4mnbl8xd32vwvr3pm54bv59fzs"
   },
   "stable": {
    "version": [
@@ -22130,11 +22133,11 @@
   "repo": "alexluigit/dirvish",
   "unstable": {
    "version": [
-    20220508,
-    1705
+    20220512,
+    1734
    ],
-   "commit": "75d5abb62670dac0dce3e43e8dbe2e42b7abe6ab",
-   "sha256": "0li4sgwv68w70dfig4r1y4ksax88ffwbhlqri8wps2kaa9786gny"
+   "commit": "e40cc2dd1594d4285ec78100e98a0b0516d23782",
+   "sha256": "0qzz9bzl0rjllr84hqfczjg6h4ra4ylpcsikhdx25gc7jfvah1zi"
   },
   "stable": {
    "version": [
@@ -23753,11 +23756,11 @@
   "url": "https://git.sr.ht/~niklaseklund/dtache",
   "unstable": {
    "version": [
-    20220501,
-    931
+    20220512,
+    1524
    ],
-   "commit": "9becf3a921a0fde3a6e5d6f30379cf3d9826d565",
-   "sha256": "0h2kr7clrn0knws52dm5h7pmx2ws5bm1y3z4xmrhsc1vrv4rlk16"
+   "commit": "5a39733299cae60da2aab0e0b9f559bcc022369f",
+   "sha256": "166sbnq9n70yp7w8in2qkv921gzkzhzwkr3bjgnj427gxn34m1xd"
   },
   "stable": {
    "version": [
@@ -23961,8 +23964,8 @@
     20210909,
     1010
    ],
-   "commit": "9ccfc6122533ab8ed80e0c4587b582baa214c6d5",
-   "sha256": "1bgs80aw6jhrwpx7y56mxpx921hap99nxhiaq5ccjql6wfm47mzi"
+   "commit": "862831cd6e1146b0c18e6bdbf7daafb42868d439",
+   "sha256": "0kfykznv16lmbxhccnp9f1qn9wswadizp3mhq1kf1b29pvppf1yr"
   },
   "stable": {
    "version": [
@@ -24611,14 +24614,14 @@
   "repo": "leoliu/easy-kill",
   "unstable": {
    "version": [
-    20220311,
-    1506
+    20220511,
+    557
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f9b450a87c41e5ef616df565ed158cb236aa5189",
-   "sha256": "05drsb7kaksdsk1v0i5gip255rvlziirl4wcana08cpm9v9p4m21"
+   "commit": "de7d66c3c864a4722a973ee9bc228a14be49ba0c",
+   "sha256": "0zr836c9c5bhf0cslwk6jqf1xn9w6wfjn4faisq5v8ydyxn78925"
   },
   "stable": {
    "version": [
@@ -25142,20 +25145,20 @@
   "repo": "Fanael/edit-indirect",
   "unstable": {
    "version": [
-    20220216,
-    1812
+    20220511,
+    1124
    ],
-   "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081",
-   "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x"
+   "commit": "f80f63822ffae78de38dbe72cacaeb1aaa96c732",
+   "sha256": "13v0fvzh3nv3bm4c3ld7pknw2g76cjkx81hsrmbrd1irlv4s4b00"
   },
   "stable": {
    "version": [
     0,
     1,
-    8
+    10
    ],
-   "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081",
-   "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x"
+   "commit": "f80f63822ffae78de38dbe72cacaeb1aaa96c732",
+   "sha256": "13v0fvzh3nv3bm4c3ld7pknw2g76cjkx81hsrmbrd1irlv4s4b00"
   }
  },
  {
@@ -25620,8 +25623,8 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20220503,
-    953
+    20220509,
+    1904
    ],
    "deps": [
     "eldoc",
@@ -25631,8 +25634,8 @@
     "seq",
     "xref"
    ],
-   "commit": "f8556b7e76ef7086191c469979274e499d992aed",
-   "sha256": "011i3afyxqfs7nidm7f0p4gb3v62fhxzvq2jhlygla5fz7bf36ww"
+   "commit": "ba618d2cee55c8c339d46621b7e721957cc30a72",
+   "sha256": "08ynxy8wpb1ran8r7h51n5r1njpjvz7hdxkgvr5njlhwp5wz2jd5"
   },
   "stable": {
    "version": [
@@ -25849,8 +25852,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20220414,
-    1329
+    20220511,
+    1619
    ],
    "deps": [
     "clomacs",
@@ -25858,8 +25861,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "5c6341c751da9c7dbed43eafc8e99f456c1de0d2",
-   "sha256": "0809fv33w9lnlfj46adm2jvy5fmhvinhkxr0pkmvy3ppnc1ira5k"
+   "commit": "900cf3ff0a8cffeeb0155ca131fa2e425ca9137d",
+   "sha256": "0r7rfpfxxn620cafw2h3in384lql3qbnpdrc8j2yyqlqgp73yygk"
   },
   "stable": {
    "version": [
@@ -25923,20 +25926,20 @@
   "repo": "xgqt/emacs-el-fetch",
   "unstable": {
    "version": [
-    20220426,
-    2053
+    20220510,
+    1536
    ],
-   "commit": "f9d396437ee0cc5362a80b8ce11e15cfe4d2d510",
-   "sha256": "0gldjrggh829cllad5hzgi5my5c98c1qf6nkbyrc144ds79qnpj5"
+   "commit": "3aa9594e807cb03af228c13224b381ecdd7ba2e3",
+   "sha256": "0rpdmhck3qn325jscysvgj2nzdy09rl895wsk5jhssmgmnp92zxs"
   },
   "stable": {
    "version": [
-    1,
-    1,
-    1
+    2,
+    0,
+    0
    ],
-   "commit": "2350ae0bf7ed6a98b63c25b73ce8862528ac3a1e",
-   "sha256": "0gldjrggh829cllad5hzgi5my5c98c1qf6nkbyrc144ds79qnpj5"
+   "commit": "3fa818577238adf9db7264e302d9614ce973d307",
+   "sha256": "0fbbnwxm96zmj2hlsjjxki901vs98qcxn8shyz8bs3qzb6kvlwyw"
   }
  },
  {
@@ -26073,17 +26076,17 @@
  },
  {
   "ename": "el-patch",
-  "commit": "2f4f57e0edbae35597aa4a7744d22d2f971d5de5",
-  "sha256": "1imijmsni8c8fxjrzprnanf94c1pma3h5w9p75c4y99l8l3xmj7g",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "0xfpkpkyzf8bpp9fhlswc96vw9v3lwhhkc3qwsnzmqkzkim9idrk",
   "fetcher": "github",
-  "repo": "raxod502/el-patch",
+  "repo": "radian-software/el-patch",
   "unstable": {
    "version": [
-    20220417,
-    1946
+    20220509,
+    2253
    ],
-   "commit": "d4f4574bcf4005f4fbafde8874cb19b907783956",
-   "sha256": "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa"
+   "commit": "156c61b72c1c9c61bd886b5931b8a382153f52fa",
+   "sha256": "043m4lpm7m7mbprnb5igx0rz2r6c425vl33m7is5j47pm1ysvp31"
   },
   "stable": {
    "version": [
@@ -27651,11 +27654,7 @@
     833
    ],
    "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-e2NiTqKt/elpher-bf0dd36/.git/\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nUnable to checkout bf0dd36eb2f5b339c6b561dbe3ee9693565b484b from https://thelambdalab.xyz/git/elpher.git.\n"
-   ]
+   "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6"
   },
   "stable": {
    "version": [
@@ -27664,11 +27663,7 @@
     1
    ],
    "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b",
-   "error": [
-    "exited abnormally with code 1\n",
-    "",
-    "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-e2NiTqKt/elpher-bf0dd36/.git/\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nUnable to checkout bf0dd36eb2f5b339c6b561dbe3ee9693565b484b from https://thelambdalab.xyz/git/elpher.git.\n"
-   ]
+   "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6"
   }
  },
  {
@@ -28218,8 +28213,8 @@
     "emacsql",
     "emacsql-sqlite"
    ],
-   "commit": "5501f7b7577dc8aa968c0d2183d081f334ad051a",
-   "sha256": "06wi7z526gxqa763i214z19nx399ijx8arjyg33j1mj6bssjpys3"
+   "commit": "3e820c66fdaa9937f9e612900954dcd6c7d01943",
+   "sha256": "1mhffs3lxw5q9gccrdpj5bdg2ks04hbp183gmdn1rl5y51x8xp96"
   }
  },
  {
@@ -28238,8 +28233,8 @@
     "emacsql-sqlite",
     "sqlite3"
    ],
-   "commit": "5501f7b7577dc8aa968c0d2183d081f334ad051a",
-   "sha256": "06wi7z526gxqa763i214z19nx399ijx8arjyg33j1mj6bssjpys3"
+   "commit": "3e820c66fdaa9937f9e612900954dcd6c7d01943",
+   "sha256": "1mhffs3lxw5q9gccrdpj5bdg2ks04hbp183gmdn1rl5y51x8xp96"
   }
  },
  {
@@ -28376,11 +28371,11 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20220507,
-    1654
+    20220509,
+    2259
    ],
-   "commit": "857c8403529f54bfeecf460fe98b1a0b8e206802",
-   "sha256": "09rpnr8lxk5gpjx4vbsi59027yggwh68909vqyxhbqqs2d7f9n26"
+   "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1",
+   "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc"
   },
   "stable": {
    "version": [
@@ -28406,8 +28401,8 @@
     "consult",
     "embark"
    ],
-   "commit": "857c8403529f54bfeecf460fe98b1a0b8e206802",
-   "sha256": "09rpnr8lxk5gpjx4vbsi59027yggwh68909vqyxhbqqs2d7f9n26"
+   "commit": "81c7f751be1de33dee9f7523fd3429ee3fe9a0d1",
+   "sha256": "11yvhhq251qmbnljjcfxnc53dqa63jm6ximfd0618hcwcgxlkkdc"
   },
   "stable": {
    "version": [
@@ -29305,15 +29300,15 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20220503,
-    1115
+    20220510,
+    2036
    ],
    "deps": [
     "closql",
     "compat"
    ],
-   "commit": "384222d9396f14e6b36a8d67abe6b3ede7418f0b",
-   "sha256": "0dmpwhk8ym6adsnfdb0qphksqmb20pwssxhzab528wylz5hcny1k"
+   "commit": "4524f9a8f19717c4afb84a184db7841b4ffcbf56",
+   "sha256": "01j2190srr9mkc68f1l9rcpxvqadn4qprddamj351n97079jw4cs"
   },
   "stable": {
    "version": [
@@ -29336,16 +29331,16 @@
   "repo": "emacscollective/epkg-marginalia",
   "unstable": {
    "version": [
-    20220424,
-    2211
+    20220511,
+    1942
    ],
    "deps": [
     "compat",
     "epkg",
     "marginalia"
    ],
-   "commit": "73519c62db12c17804bfbcdfb0a6028389374bec",
-   "sha256": "0r3pxnd0rbfafzfmjln37c0njs1pnn6rzfblvbmplscyzqw7iqgy"
+   "commit": "ee784211346c7c374accec2bda78788cc68fa641",
+   "sha256": "0pl4qwh3fhrj306qrhkfgp8w3yv2hbz2y88gsx1ifsipq22n2343"
   },
   "stable": {
    "version": [
@@ -29959,8 +29954,8 @@
     20200914,
     644
    ],
-   "commit": "7615aa55068754d36711e19bfc926b87d5b8f33c",
-   "sha256": "1ix15ff08adkvlpvh6v5cpx6an0y965rm9d06zallsg1wrzr2rcl"
+   "commit": "9a5f2b4a8cd14edbde9d16dcdfcb8db2a91be0d8",
+   "sha256": "1pn3w2prmz9ibhy5l22c6mmccr7lfy561gkd2s41hlcjsyd4ar00"
   },
   "stable": {
    "version": [
@@ -29984,8 +29979,8 @@
     20220215,
     1844
    ],
-   "commit": "76c8ad7cf3c0c2c0d940ec1ad170c156f89213a1",
-   "sha256": "1w8l0j4mxasrw5y5s65mph48h44mw2ybxb5vjmrzvr7qbwdvrs5a"
+   "commit": "4bf325feb5885056ad3315d9a0316b652613b3d9",
+   "sha256": "0dwjafw8ab71bqvwpv49cwqarrcd5pa0wyh7yxjn3spnl6f80j1l"
   },
   "stable": {
    "version": [
@@ -31555,15 +31550,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20220507,
-    902
+    20220510,
+    2302
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "61a680042f422be715b42ceccb2418847c5f6b65",
-   "sha256": "0imcxr2lq1bqpcbqv97lly904iq8iz30gry1qgj4phmksji73b42"
+   "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736",
+   "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha"
   },
   "stable": {
    "version": [
@@ -32322,14 +32317,14 @@
   "repo": "redguardtoo/evil-matchit",
   "unstable": {
    "version": [
-    20220414,
-    1316
+    20220513,
+    230
    ],
    "deps": [
     "evil"
    ],
-   "commit": "b314e816bacfc01bb7df9b19a06b18638af5cdbe",
-   "sha256": "01r85bnmqbmvwlhv5ihglp0dhws1g2wsw2vy0vsw5mi5mmx2xsqr"
+   "commit": "b47931128c6b7924ea432895f469769986de410d",
+   "sha256": "1zjdwqqrc2znk2y8f424ygnkxsvx0hq46gicjb4nllbvvvbx6kyb"
   },
   "stable": {
    "version": [
@@ -33082,8 +33077,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "61a680042f422be715b42ceccb2418847c5f6b65",
-   "sha256": "0imcxr2lq1bqpcbqv97lly904iq8iz30gry1qgj4phmksji73b42"
+   "commit": "5a9cfbc443219c4063b17853b7828ec0a00d2736",
+   "sha256": "1vr46xn72l5m0r9v3d1xaz86q607ga5adxlqdh7mlymw15w004ha"
   },
   "stable": {
    "version": [
@@ -34321,15 +34316,15 @@
   "repo": "rejeep/f.el",
   "unstable": {
    "version": [
-    20220405,
-    1534
+    20220511,
+    1502
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "b5cb884b3b4372a6f3d1d4428cf092ca1e5c8044",
-   "sha256": "04wa28css71k5h7faxybczl0qy008kk1m5pdfb53g7ybjrn5cxdn"
+   "commit": "ad2c7dd369a15988f1c6298b5edb901ce2e1f446",
+   "sha256": "0rjggym7a7sb12bspdydk2vx12hqjqv0qmkpfi0z6s7mcnpl7fhq"
   },
   "stable": {
    "version": [
@@ -34492,11 +34487,11 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20220407,
-    145
+    20220512,
+    21
    ],
-   "commit": "f824c3f55ea42d65e0b632879c6948d3eb43b2f3",
-   "sha256": "1i36ndcak5svml173v98dnw9vwa8bc0qxhnkwsrwmrnvg44rw0a0"
+   "commit": "33b3344848ae17d45c19d222e53b368ea6867e7e",
+   "sha256": "1yi2xzp1a945p11h6ac5ci0n56ffd40sm3ja6i4hrw4dd41axgyg"
   },
   "stable": {
    "version": [
@@ -34992,11 +34987,11 @@
   "url": "https://git.sr.ht/~technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20220429,
-    1636
+    20220510,
+    748
    ],
-   "commit": "90498bd9c8dac2749baaddb605d35370aa79ba15",
-   "sha256": "1793gakvc7rdjx2f41f3wlk10l34577dwrrlw82rp6gy668x6zw5"
+   "commit": "0e9ed013a163d91993a2883ad5c37c02694c2b92",
+   "sha256": "0rdrap1kyj0csaa25d46xvb5hgbwlcqvmwrq6yicmbsnpdrwpwy7"
   },
   "stable": {
    "version": [
@@ -35005,7 +35000,7 @@
     1
    ],
    "commit": "54ed0792d0ac43a2d5db39741cf070c627368419",
-   "sha256": "1bfd983zdhq097bb101k8p7x4jkmkgaxfj7s7aiyf4s3zq84v6xy"
+   "sha256": "0dwas3ivhxdyw6njkcadc8c17cirq325cmby04qls8zkmrvlil1w"
   }
  },
  {
@@ -37281,8 +37276,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "327f1c13e4f404b1bdd25b10f7e7ac7d7e3bdac0",
-   "sha256": "0mxzcms7i2jmagfbgj9sb605c21q6a9v5bs5nsjfqvi5jbj9prfv"
+   "commit": "c52ba814f299f62a2a339bae679f3d6d04566854",
+   "sha256": "11l69nj1f61lvw4arn9k0g9n5pczypn15qq4c02x1kljjlx0h1zs"
   },
   "stable": {
    "version": [
@@ -37360,8 +37355,8 @@
     "grammarly",
     "s"
    ],
-   "commit": "6cc8a7553ac84a229090ca8ffa6aa7d34de35cde",
-   "sha256": "1qqw9if8cv0mgk2xgki2yzhjmhj20acj2aqmqvhf8ndi4k0s13f4"
+   "commit": "abc66e71d542f65a90c394058cdd3a7b2002c6a6",
+   "sha256": "0irp6cpi9qy80wssrncdlxjr2612l2mnprrfjjm5hjggflp5wygg"
   },
   "stable": {
    "version": [
@@ -37786,8 +37781,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "6dc29319973ff86f8f83c988f3e093b28c746aba",
-   "sha256": "17d392z4m6r06xnk67ipzp5vh585bs21lc7d60v9sihar61awdn4"
+   "commit": "63674d8b928377d763df40317e15f4ca257f77d6",
+   "sha256": "14fjv2wckymhfw0sm89bkbn6lvmcxsivv5m1dva0wr5j0gppaj47"
   },
   "stable": {
    "version": [
@@ -39093,8 +39088,8 @@
    "deps": [
     "flymake"
    ],
-   "commit": "95806594cacddbbc0c3aa2351a6a7cf28e73a8bf",
-   "sha256": "19h47khw9p68yk9z4z7jrakniiwc1b3ca1r2017h3ldzmpacwa6y"
+   "commit": "6ce75c17bc02ae9755deda50d5ac366785c94091",
+   "sha256": "0nbggmz3b6r2rixbn20r58dca05h45lsdyfbbw74syd4fv5g8s9c"
   },
   "stable": {
    "version": [
@@ -39321,8 +39316,8 @@
     "grammarly",
     "s"
    ],
-   "commit": "7764178e6b51ccf0ce984b97385c22b2696d54f0",
-   "sha256": "1q5qn4abjh1l93n56ps856j6aqha2j7yjxbwjwwj0clyfb7bxccf"
+   "commit": "74ab6bb817205dbf1cd77a161be76904c1e17b75",
+   "sha256": "0ngs38h3zcg2znqbfy0m886g4spn39bnch4s1zcl8f8zcn3s24mg"
   },
   "stable": {
    "version": [
@@ -39577,14 +39572,14 @@
   "repo": "emacs-languagetool/flymake-languagetool",
   "unstable": {
    "version": [
-    20220414,
-    429
+    20220512,
+    2355
    ],
    "deps": [
     "s"
    ],
-   "commit": "db6abad075734dd01dbbd31cfec7ecb65ba16404",
-   "sha256": "06w5mr32mrmys8gfbpx5srbbap76607by5y3l174y0n5zxgmzz9w"
+   "commit": "c24339b50a4b42cc2bd7e8e167c77a75d8227774",
+   "sha256": "1lvpyn9s3x9wyhdsa9krra03appn8p0dv8086hixpmqm10d21wl1"
   },
   "stable": {
    "version": [
@@ -39700,8 +39695,8 @@
    "deps": [
     "flymake"
    ],
-   "commit": "ee515ffdeb2a3b1162c82089e94cc31186eb2001",
-   "sha256": "1nv82s7m6mpkjlqx5diis9kzmlqkc2q6l3f1mkdf9h7vhkk6had6"
+   "commit": "06d819c6d1292f8c87ebc0681c83c9fb48620bbe",
+   "sha256": "1blzcr2c176wlqv8fr4mna0qqm20cd77s8b4gz21jzrq44d7qqf8"
   },
   "stable": {
    "version": [
@@ -39789,8 +39784,8 @@
    "deps": [
     "flymake-easy"
    ],
-   "commit": "2d442cff3408ecf3e576f0f3406fd6f567b16fa7",
-   "sha256": "03fhic235z8vywmnj5yri275pggwc87hlahypdvh5w4i45hxa78r"
+   "commit": "10d3e7e1c31c104e3da694b2b52cd34df61efa5e",
+   "sha256": "1gzg5xz2vchz6kq7hyc1pvd250kfnwkpy88gmh857v3mnzrq71dg"
   },
   "stable": {
    "version": [
@@ -40769,8 +40764,8 @@
     20191004,
     1850
    ],
-   "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2",
-   "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj"
+   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
+   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
   }
  },
  {
@@ -40862,8 +40857,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "29fc1302382700dc7ecb5e0fe20e47b8a9d0a1a4",
-   "sha256": "1v5nq39fqzzc83syap8icclic7hjaq91y45rx5y9a6rs5dv53akc"
+   "commit": "05babf69068de7a982bd2e8ad888f37dc7319003",
+   "sha256": "02mck5c2cbz61j2xwgpwaqlpbnp5svn6g05lylhmw7g0sprzcdvb"
   },
   "stable": {
    "version": [
@@ -40918,15 +40913,15 @@
   "repo": "lassik/emacs-format-all-the-code",
   "unstable": {
    "version": [
-    20220412,
-    1141
+    20220510,
+    2108
    ],
    "deps": [
     "inheritenv",
     "language-id"
    ],
-   "commit": "a07bf109ce8e27458a40420508943f53856549fc",
-   "sha256": "0sj30s70nmm09rlq5h2fxjmrlw2mcwq30ncwqvlxqawpfpxzn5yj"
+   "commit": "828280eaf3b46112e17746a7d03235570a633425",
+   "sha256": "157bn3s0lrmfjzp7a8sw8sqbblp5r85yaqb1phjk0prvdn798q2n"
   },
   "stable": {
    "version": [
@@ -41223,14 +41218,14 @@
   "repo": "tarsius/frameshot",
   "unstable": {
    "version": [
-    20220422,
-    1610
+    20220509,
+    2010
    ],
    "deps": [
     "compat"
    ],
-   "commit": "fa5e2363efabc2e61e79bd66c96e7d1a5c827a0d",
-   "sha256": "1ywl7dc6ksynvcx3v3y8j96lpydwx5jkb2b90dd3skqrxpfqr9vm"
+   "commit": "ea57484dbba917a437ad3a20ea956aa2275bdc9a",
+   "sha256": "18hv2ldysxf5s46a2pjbxfq9fc3bkbdlkr01mfqk7ghs0wg6h6xs"
   },
   "stable": {
    "version": [
@@ -41687,8 +41682,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "b90d529eacb643421991f94288151e72ed573b55",
-   "sha256": "0qfkryfmmhv5h5i0xx50ggs0d4kagy3zpifinr831fswkgc1garv"
+   "commit": "041430cda31c73fd51d7c16e736dcf08db13eb11",
+   "sha256": "10kv8hpqh08mgyhn04i72kvzncdaqyflai6h0flg89wv1air0m46"
   },
   "stable": {
    "version": [
@@ -41886,8 +41881,8 @@
     20211231,
     1837
    ],
-   "commit": "ea361ce0f702c5f92ad4a89017def9c1619a3191",
-   "sha256": "11kni370swrlvhj38piw55kwa1wfn6g20fjqrlaq9hg93xrah9xp"
+   "commit": "7691a73a85f014a34cc161650e989801f2aba5a3",
+   "sha256": "1xm0cmfyvypxhygl36m3r68asixmrdq23q4c3vkx8y7i7yaml4w1"
   },
   "stable": {
    "version": [
@@ -41960,8 +41955,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "4bd3c23c3dc649ab5412e2bad7eebe3069363190",
-   "sha256": "112a291aznh3jzcbdl4hm8xqk3nbhkab2yx604a89w69hwi960yl"
+   "commit": "e6eeac7552b61d4f7abd51aff6ce72394133663e",
+   "sha256": "0xs5fl74cxksab7pplvkaa0dd74fhlr35l3c7f80w44zh1mmpmff"
   },
   "stable": {
    "version": [
@@ -42082,11 +42077,11 @@
   "repo": "ShiroTakeda/gams-mode",
   "unstable": {
    "version": [
-    20220501,
-    1507
+    20220512,
+    222
    ],
-   "commit": "1964d9a52693f3aa9279eed8864bc317ee5c6dc4",
-   "sha256": "070qmshqn6gz4av3rzbjihlw6psx5c61kbcwdymswzfzmhg5dyn6"
+   "commit": "d7f5bb688e569c7c517e4c3af32a5319c492362b",
+   "sha256": "19p84xr9xs0224wmy4r7r0167vwd99qx4804hnrxw0y1855qih3g"
   },
   "stable": {
    "version": [
@@ -42189,11 +42184,11 @@
   "repo": "godotengine/emacs-gdscript-mode",
   "unstable": {
    "version": [
-    20210328,
-    2037
+    20220510,
+    944
    ],
-   "commit": "4badcf6a0c951daba4d7259db3913b78254c0423",
-   "sha256": "0m2nqgv6k5ficqym5z453ni12bncxyi5xhxx1dii4vfckx80b1n6"
+   "commit": "d9e1f7f766c73115de8ce2815bc249069636c3db",
+   "sha256": "165xf8sg0sfnw8cvgfpym0jcfkn1dm7skpnvhrl647wmhba175is"
   },
   "stable": {
    "version": [
@@ -42877,11 +42872,11 @@
   "repo": "leoliu/ggtags",
   "unstable": {
    "version": [
-    20220420,
-    1610
+    20220511,
+    610
    ],
-   "commit": "22d3a3a951cb605d29138f1acee191ef674a4518",
-   "sha256": "05jl5b2s3chqz67fapxrr3189scrsb2mvjn255hficrghzw0dh1s"
+   "commit": "40635a1effd3a9c2adef63c4760010c9468a7a4d",
+   "sha256": "0ycvia6zabh02idl2j26j4r2lxhf0srpg0s2qxxr82n3wsk7z00q"
   },
   "stable": {
    "version": [
@@ -43093,8 +43088,8 @@
     "let-alist",
     "treepy"
    ],
-   "commit": "f3a26544575303e86b423a3406656f0e5a576d67",
-   "sha256": "1ha1mcrgnckz04hq2vslcdd60m0dqqrcbqj2h601wmv8qrf6m5hz"
+   "commit": "f14c1bc84135fe149c42348dce6eaa23ba610224",
+   "sha256": "01ac9789ns56bsishxl904ypc3kvc1w6svfrww8phd6hpwl0f8wc"
   },
   "stable": {
    "version": [
@@ -43460,8 +43455,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f",
-   "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3"
+   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
+   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
   },
   "stable": {
    "version": [
@@ -43801,8 +43796,8 @@
     20220422,
     1611
    ],
-   "commit": "96abfb732d695cbd2075ba701254651a7b28d693",
-   "sha256": "0d3d1nwjbx6843344kvf80gmcnad0jdxml6abw27b5pi31dx2wp4"
+   "commit": "eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5",
+   "sha256": "0vyxczxf1dsszdnv6jbgg5vj7fys5mam0jwgfsyzmhclrfgp5kwy"
   },
   "stable": {
    "version": [
@@ -46381,8 +46376,8 @@
   "repo": "vmware/govmomi",
   "unstable": {
    "version": [
-    20191213,
-    2131
+    20220509,
+    1455
    ],
    "deps": [
     "dash",
@@ -46390,8 +46385,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "be5528b51ec58f28601350e466e662727cf6c7c4",
-   "sha256": "0w9hv2h74cdk84fj6vdsnw4pbqfcf9n0ibj2qp3xn8aw8spkg70f"
+   "commit": "b4c0b4fe98b2692cf84e445ad2528911e3e1a622",
+   "sha256": "1wcr3bw7ck5v5w1x3ivhmgm4lq7ln0fvszl7sw0cyj95jqcd7brd"
   },
   "stable": {
    "version": [
@@ -46617,16 +46612,16 @@
   "repo": "emacs-grammarly/grammarly",
   "unstable": {
    "version": [
-    20220222,
-    638
+    20220509,
+    1937
    ],
    "deps": [
     "request",
     "s",
     "websocket"
    ],
-   "commit": "1d616a446c64dfe7d85f80cd38ce2a1e2a3b0f34",
-   "sha256": "0rrq46pg4h8ymyq3s9iqkkcjxd0rd2a018zksxg2xsj6hdq6rrh3"
+   "commit": "3e14e53b87465ca35b08b5355061e380afb87b31",
+   "sha256": "0zia9hpamwjhyc38l903jwfij06y237j5c2sx600g5r9y36byg9z"
   },
   "stable": {
    "version": [
@@ -47815,20 +47810,20 @@
   "repo": "iain/hamburger-menu-mode",
   "unstable": {
    "version": [
-    20160825,
-    2031
+    20220509,
+    1341
    ],
-   "commit": "3568159c693c30bed7f61580e4f3b6241253ad4e",
-   "sha256": "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"
+   "commit": "06bc9d6872007a31226d7410d497a0acd98b272b",
+   "sha256": "0wwsfc114s1rksrja2cxhl2kkk550imm3rnwnwq9ng0nv855qc5m"
   },
   "stable": {
    "version": [
     1,
     0,
-    5
+    6
    ],
-   "commit": "fd37f013c2f2619a88d3ed5311a9d1308cc82614",
-   "sha256": "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"
+   "commit": "06bc9d6872007a31226d7410d497a0acd98b272b",
+   "sha256": "0wwsfc114s1rksrja2cxhl2kkk550imm3rnwnwq9ng0nv855qc5m"
   }
  },
  {
@@ -48454,15 +48449,15 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20220508,
-    1455
+    20220512,
+    1048
    ],
    "deps": [
     "helm-core",
     "popup"
    ],
-   "commit": "4402bd042f9af15cc671175061795b36d0cbe434",
-   "sha256": "1zlnfbddi67h6ks6z0q24jpqzkgqj3y7w0i537zsi3f8rdpv1m8a"
+   "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e",
+   "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs"
   },
   "stable": {
    "version": [
@@ -49360,14 +49355,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20220503,
-    622
+    20220512,
+    856
    ],
    "deps": [
     "async"
    ],
-   "commit": "4402bd042f9af15cc671175061795b36d0cbe434",
-   "sha256": "1zlnfbddi67h6ks6z0q24jpqzkgqj3y7w0i537zsi3f8rdpv1m8a"
+   "commit": "0f7d7acf5724d79ed51ae22349ceb743c4868a3e",
+   "sha256": "177gpf0s722xdya74gdx8my3jw49f38im31i3impw5c25g8x9ajs"
   },
   "stable": {
    "version": [
@@ -52362,8 +52357,8 @@
     "s",
     "searcher"
    ],
-   "commit": "fcb4aa5a36ee4555e46756704da50ccf7f13c21d",
-   "sha256": "1g5vpak8ibsh68a5zh0a4bjdcpiik4q0ljamph98iqq7nwj1a4r2"
+   "commit": "d0a3aa7c4a882c6563c053c3317600582043d71c",
+   "sha256": "10hvm4xym1886b02jqpg83p2pz6s9nkkrs7ifnydhn2zn5khn855"
   },
   "stable": {
    "version": [
@@ -54251,8 +54246,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "6769accd7003ba5a0376d2c5cef0fcffce8f45be",
-   "sha256": "16jgnv26jp3zxz2gry6703gi4p9v8ggm4ljhm85bg84ana81rhw0"
+   "commit": "2337eac8cab0d4b73a96fb3936d2ac87600e3c91",
+   "sha256": "1l64inwrjvmjgm5852aclz3izy58vnf0xpxhr7rp3kg947qhr72a"
   },
   "stable": {
    "version": [
@@ -56424,8 +56419,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "51aeac9f3a24f23d063f591066675d1d70dcea09",
-   "sha256": "1zl2lkdflssii5mvxr2hgz6spx4qpbvixrm1jj0nrh128s23jx9m"
+   "commit": "4dbc59789835396fdc76bfde4ae4971c8a9ceaed",
+   "sha256": "0hq6hvp5cvys13ms7zfd8477c4mwvwxgk6rqczyfnzgi4qjyjz54"
   },
   "stable": {
    "version": [
@@ -58916,21 +58911,21 @@
  },
  {
   "ename": "ivy-prescient",
-  "commit": "a92495d09689932ab9f0b716078ceeeb9cc154e0",
-  "sha256": "017ibpbj390q5d051k3wn50774wvcixzbwikvi5ifzqkhgixqk9c",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "15fynfhsr75v285szkqqamlcs25pzsz5nywp5j1asp33dnkvqdhi",
   "fetcher": "github",
-  "repo": "raxod502/prescient.el",
+  "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20220501,
-    2235
+    20220509,
+    2300
    ],
    "deps": [
     "ivy",
     "prescient"
    ],
-   "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca",
-   "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j"
+   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
+   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
   },
   "stable": {
    "version": [
@@ -60061,11 +60056,11 @@
   "repo": "Michael-Allan/Java_Mode_Tamed",
   "unstable": {
    "version": [
-    20220312,
-    1945
+    20220510,
+    430
    ],
-   "commit": "44280538a2b780536c56ee2a51b7a5b03d376a2e",
-   "sha256": "1x5k9d1iq33ds8cszcyl2bhbr8hkldq6hph1b77zayqyg00pnly4"
+   "commit": "f968413df2c2bd1e00c5b6c61c53bdd208b90ee3",
+   "sha256": "0gyf61krqy6d5sjvj5c9z57vqx2nq0fia2pxmk32slisxc9drcqm"
   }
  },
  {
@@ -60995,8 +60990,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20220508,
-    456
+    20220512,
+    539
    ],
    "deps": [
     "dash",
@@ -61006,8 +61001,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "47cfc8cc0c5b383b0647c91e657f1ffeaf73cce8",
-   "sha256": "1n7igv0lfkx9zh12lhbc77mg3ycl3qmc58982damh7r4cvq1lv4w"
+   "commit": "88ce4fadc065736e154506538d365a8f1dd643e1",
+   "sha256": "1gj9mnv0kyq20hdz506qlz80kx28zwng12vnnahshji6bh6wbwj5"
   },
   "stable": {
    "version": [
@@ -61034,14 +61029,14 @@
   "repo": "shg/julia-vterm.el",
   "unstable": {
    "version": [
-    20220503,
-    7
+    20220510,
+    2259
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "443924f6eb77d64a20b4b34a99d3c7d2d54f73a8",
-   "sha256": "00piv8ifjhpwsk0rwnz9nph02ws1yiybqn4yxb7wv3ppxy139vzx"
+   "commit": "5374776991232de966efca245f9ce24c59728588",
+   "sha256": "0cg5mqiciawigb5n7w8q5hi8q1h253nbjif3p9n7vhbckwx318rx"
   },
   "stable": {
    "version": [
@@ -61948,8 +61943,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "0c37db482ca98e729430121209d70dd093082a5e",
-   "sha256": "1i4l145k9jrl8dv5wkcg3nbm6s0as1myz8vzh4k9rdi2ra6lkajr"
+   "commit": "296fba536287e7a0d88109e75a0bc0181647dc5e",
+   "sha256": "14v77x0knvjb7czrhgarq0apxavbnxqi3ra833qf0f1s599wkv77"
   },
   "stable": {
    "version": [
@@ -62048,8 +62043,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "0fd91fef890fb4c18c552e5ecaddd53c9bdac2bd",
-   "sha256": "1qhl8zq0b8qzanglw2j1c7ll4ifryvjmf3z4y9c22pfr5xf187c2"
+   "commit": "f95fded924a7184a638ef233324fcda34c60ff7e",
+   "sha256": "0rbngqw577clsrxjkrhcpw9347796w52dqi2v94a2xmzvhq4rff8"
   },
   "stable": {
    "version": [
@@ -62180,8 +62175,8 @@
     20220222,
     639
    ],
-   "commit": "5236c2aa6a4f2deeb0421c7d1c315ed9e6b6222a",
-   "sha256": "0374kgz3gv9h0gksmn91cbbf5hrwjy981f2prk0wl5djwks8nb3i"
+   "commit": "d6fe2d51769ee5d1d84a74adeae5c3a0aa66a602",
+   "sha256": "0hkp0dl8aqc2javsnl3pm37iy9f534l6wf1vgh44ba6ws6bxxgl5"
   },
   "stable": {
    "version": [
@@ -62751,8 +62746,8 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20220426,
-    1722
+    20220509,
+    104
    ],
    "deps": [
     "dash",
@@ -62760,8 +62755,8 @@
     "transient",
     "yaml-mode"
    ],
-   "commit": "dea03843dc7b152cdfb84c14e076cf79a721a87f",
-   "sha256": "1y4qy6v2nj3pimffdsc2bgjlb10hvvbhpnizv3xnhcb3brfz3ddr"
+   "commit": "c45e19a215e8e7df80a61c10ca1fa26dcfd1de35",
+   "sha256": "03i6iyhiqhi2vxb8qvw99n6h6xg8jnxkazikw6sqnp0flnrgcf7q"
   },
   "stable": {
    "version": [
@@ -62793,8 +62788,8 @@
     "evil",
     "kubel"
    ],
-   "commit": "dea03843dc7b152cdfb84c14e076cf79a721a87f",
-   "sha256": "1y4qy6v2nj3pimffdsc2bgjlb10hvvbhpnizv3xnhcb3brfz3ddr"
+   "commit": "c45e19a215e8e7df80a61c10ca1fa26dcfd1de35",
+   "sha256": "03i6iyhiqhi2vxb8qvw99n6h6xg8jnxkazikw6sqnp0flnrgcf7q"
   },
   "stable": {
    "version": [
@@ -62931,8 +62926,8 @@
    "deps": [
     "s"
    ],
-   "commit": "1c80df0f2c542f54920f18aa4eb837f0a51c7676",
-   "sha256": "0hmsf7kgzmpzri3ggb7l6y3pvfpinfv0d24fnxpbp1zd17lfwks1"
+   "commit": "61d7211469ea3e2c429937869c5a29584103361a",
+   "sha256": "0mi5jln34pd372h7f3rvigis6dll6sxdqg9izj9bip93917cff0y"
   },
   "stable": {
    "version": [
@@ -63015,8 +63010,8 @@
    "deps": [
     "seq"
    ],
-   "commit": "c2466e52702a189fcc1ecad25cc1ad9f203f6627",
-   "sha256": "1j6m799hxwlj9mlnqv4s9ngjfc1m7ih81sv8nmjb1ci9xilkhgdq"
+   "commit": "3ab31ef28596ac2f95be4c4280cd86489232da97",
+   "sha256": "1vgwwzqnbd936lid4aniyvg27p593psnapzk9g8xncssagx7wc64"
   },
   "stable": {
    "version": [
@@ -63039,16 +63034,16 @@
   "repo": "tecosaur/LaTeX-auto-activating-snippets",
   "unstable": {
    "version": [
-    20220301,
-    1629
+    20220509,
+    1234
    ],
    "deps": [
     "aas",
     "auctex",
     "yasnippet"
    ],
-   "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651",
-   "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1"
+   "commit": "44533de4968fee924d9cc81ce9a23c9d82847db3",
+   "sha256": "13rflldz3684qv6xvg44sj6r1dzaqclmjcg0rxfnksf6cb47l1yg"
   },
   "stable": {
    "version": [
@@ -63172,8 +63167,8 @@
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "d264cd8ed859635dc0f71e1d9213a911b46939b6",
-   "sha256": "1x87q32r73vfawk0ijxddlib1f278lwmj8fq8zhs090npj0rw427"
+   "commit": "67ae434d6ce2073e9c914817d21269f5c6a2a66f",
+   "sha256": "14m9i4ikppbf4ffrxibhdlvanyvjfhx68xalga66lj5chhhdqbk5"
   },
   "stable": {
    "version": [
@@ -63687,14 +63682,14 @@
   "repo": "AnselmC/le-thesaurus.el",
   "unstable": {
    "version": [
-    20220508,
-    1442
+    20220509,
+    2120
    ],
    "deps": [
     "request"
    ],
-   "commit": "941390e5ca942c7459faf4e5988898baaa66fa14",
-   "sha256": "076rjjsl4iq7bxky6ca67q3zfc7xnnrl4isdyd1csh0b1sxhalx9"
+   "commit": "2af1ab37097cdd17044ab217e9aa6839add98626",
+   "sha256": "1w2k2pvzgd5v008ma9bc6y16aiyjixhgvrn7bxf6cy43056mh0wf"
   }
  },
  {
@@ -64573,8 +64568,8 @@
     20220209,
     755
    ],
-   "commit": "87084396a2927d6921a794e40322e4affcbde2df",
-   "sha256": "1d6wq2k9js8s4sbwrvlls9w79p4l5d31fkb2hphmaijx07w1a6ks"
+   "commit": "7d706986636b5cfc04f14341c19046b56b61b51c",
+   "sha256": "0v7306fq02q36smg157xcsil0r99vznzf7fx0xnys2df5id0ww36"
   },
   "stable": {
    "version": [
@@ -64583,7 +64578,7 @@
     3
    ],
    "commit": "8fcf8424cbfb06d3b5a89b2ce60826a5e4bf76f4",
-   "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72"
+   "sha256": "12c0g379jx2m30c3m9rarhh7hwg8sjsb2bbh0j6f3k51ya90kcbh"
   }
  },
  {
@@ -64603,8 +64598,8 @@
     "indicators",
     "ov"
    ],
-   "commit": "41bc1b7f0e9dd150b99aeb47c4c9874d7c6c2d9b",
-   "sha256": "088g5wlgq6xvix2kkwzh4df556p9bn8hjlwks420ym3lp97syx9a"
+   "commit": "c0cebef629a98556f5696f78436f4d8428ce8135",
+   "sha256": "0k7gzx3g33wf7w3wbpiv6b3amnl2miyynvr3x6wlpzmh3q57s11a"
   },
   "stable": {
    "version": [
@@ -65440,11 +65435,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20220404,
-    0
+    20220512,
+    34
    ],
-   "commit": "b466460b6783caacf1ea3fcfa28752cb73fd0805",
-   "sha256": "0r0959gy5jq42656pqimap2l790hyb0l3zxqdi2wb02d21276jwl"
+   "commit": "7eaf6dc55caaaa65c5d6937b25e1748df75dbdb3",
+   "sha256": "0gcszam4qsl64jx5yggbawsawrj74cqsp7mbzmvvs40gr8pvx2yp"
   },
   "stable": {
    "version": [
@@ -65560,8 +65555,8 @@
    "deps": [
     "seq"
    ],
-   "commit": "adc5d169fad53d6d11000a72dc95f8489a8c7534",
-   "sha256": "1c1yvndzs7lry8nw1bhks4vjlvbjg1fikcpf3xdlfahahp3w1dh9"
+   "commit": "3dd1d99ebc99aa39b165569b3d02a87368d4849a",
+   "sha256": "0x41fagf4917yb5y3na5y1x60vfzdi44cpimdmg4dz4vcp3g23mm"
   },
   "stable": {
    "version": [
@@ -66074,15 +66069,15 @@
   "repo": "okamsn/loopy",
   "unstable": {
    "version": [
-    20220508,
-    2220
+    20220510,
+    323
    ],
    "deps": [
     "map",
     "seq"
    ],
-   "commit": "5608825f3eaa30c23ae495a4ce6f6458672743ba",
-   "sha256": "1jgh82idfrcpnyik3zd129lg0f0mayjnc7xd1wk2jbh84vv217ds"
+   "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539",
+   "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h"
   },
   "stable": {
    "version": [
@@ -66113,8 +66108,8 @@
     "dash",
     "loopy"
    ],
-   "commit": "5608825f3eaa30c23ae495a4ce6f6458672743ba",
-   "sha256": "1jgh82idfrcpnyik3zd129lg0f0mayjnc7xd1wk2jbh84vv217ds"
+   "commit": "98537cb29e28d32d3607fa61253ff1bf04db2539",
+   "sha256": "1skl536wmygbnnvcdh307zh5d3y0vz31q0nkwvbd5rpifl4rpk2h"
   },
   "stable": {
    "version": [
@@ -66288,8 +66283,8 @@
   "repo": "emacs-grammarly/lsp-grammarly",
   "unstable": {
    "version": [
-    20220222,
-    638
+    20220511,
+    707
    ],
    "deps": [
     "grammarly",
@@ -66298,14 +66293,14 @@
     "request",
     "s"
    ],
-   "commit": "2c01e3d8ec55835cf18945786f4a74ad6b7c4260",
-   "sha256": "0hwf3i7j2rx2m0p89w14la8kk13k5s3nf19i6bnllymy1aykhwng"
+   "commit": "709c522df7a68e2724dbfb5bd210199dff5a2264",
+   "sha256": "188sx0a6n1kl9awcic1pjbzxsqhq2cbbk8chbp8zgpl0x67ph7d6"
   },
   "stable": {
    "version": [
     0,
-    2,
-    2
+    3,
+    0
    ],
    "deps": [
     "grammarly",
@@ -66314,8 +66309,8 @@
     "request",
     "s"
    ],
-   "commit": "984037557b7e445183453faffc965fbe56df12f2",
-   "sha256": "12q3j0sgsgm73m3i0sw72dzkqa55zn0dbqjgp0g2wryhfhg0zq1p"
+   "commit": "fe47a75700dc4f16ec4ff77d6d0306f39566464b",
+   "sha256": "09kylilfw9qysd8bqf9dbc4mlzxam5iph64c09c5xyfzagmmhx8n"
   }
  },
  {
@@ -66556,8 +66551,8 @@
    "deps": [
     "lsp-mode"
    ],
-   "commit": "8eb3a6ad1f20a44eb446834c03bd688558b07236",
-   "sha256": "1x6lb4ahyyangrkcf5s8ck7f4c8wjirwh0zkrbjbyigzb30mb1kp"
+   "commit": "8c2ba735ed1e21777408167f6a7c7d9681d9e7bc",
+   "sha256": "1iqmvy870vllb794cpmsnpm65hindxym9dnhb0pnxz0mf6hcvz2v"
   },
   "stable": {
    "version": [
@@ -66582,8 +66577,8 @@
   "repo": "emacs-lsp/lsp-metals",
   "unstable": {
    "version": [
-    20220330,
-    1958
+    20220510,
+    1457
    ],
    "deps": [
     "dap-mode",
@@ -66595,8 +66590,8 @@
     "scala-mode",
     "treemacs"
    ],
-   "commit": "b7f77de69431786c54e9a57845e4f2d75fbee053",
-   "sha256": "02bp1j7k5hmp3rmlswhn3plr7f8vl10bqgb68safl88hmqlvvgxd"
+   "commit": "6980fb902c3c7b43ff0d4056a6cd7d8b4709866e",
+   "sha256": "0v2zj1jrgvx6gwhp414v9jg8j0qz724dv2fh8xwqksl5qjiq6kaz"
   },
   "stable": {
    "version": [
@@ -66626,8 +66621,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20220505,
-    630
+    20220511,
+    1331
    ],
    "deps": [
     "dash",
@@ -66637,8 +66632,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "6327359f3b5e19aeaa1c9ee6bd9b80b51f95f843",
-   "sha256": "04aw7iq07nv9b1nhf9qq7sdphhq3fa684rkaxvc23r1zraxxqsdf"
+   "commit": "465bcc5fbeb6293446a3241f5f2c1b872337958c",
+   "sha256": "151vc741rwi2gggkw39msql1y050b1n46rrjnzalz9nqsk6l5dp2"
   },
   "stable": {
    "version": [
@@ -66876,8 +66871,8 @@
     "ht",
     "lsp-mode"
    ],
-   "commit": "3af97828f9c08d782fb2086e3a73bda5759e6788",
-   "sha256": "1d1yfgvdyas6vbg992f5s4sayaxjxs33gh13z629x67hx6p22n3r"
+   "commit": "a429be2aea7797369a3c751ef54e3554733117be",
+   "sha256": "11rgfn9sdwxsncc4xrchiqn9dbqi3zirjvbz91kc5rvjv436077b"
   },
   "stable": {
    "version": [
@@ -66908,8 +66903,8 @@
    "deps": [
     "lsp-mode"
    ],
-   "commit": "97ff36b228a61e69734c7180f33cc6951b1a600f",
-   "sha256": "1pal3mga7nwfcvri1cffsjgcbbhk7wd1icd622qspqgq0zkfs8jd"
+   "commit": "f877659babd3b5f8ec09a8ad7d08193d95b6822e",
+   "sha256": "0v7nz76wah1ihdi3rjrcm3xljj7p16161rzdiqk0ds4y0xll00xs"
   }
  },
  {
@@ -66986,16 +66981,16 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20220425,
-    1046
+    20220510,
+    627
    ],
    "deps": [
     "dash",
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "6cd0409de6ca59c02d752b8e543bb5eaa61357e4",
-   "sha256": "1g82vx17wk8g91bshb7i7j7fbmb63032sz1alqlh8b0qc4fw0r39"
+   "commit": "eba9c4eaa255a14e2facd658e7122674c05390f8",
+   "sha256": "09c6qy17dlqh2jnzk6xf6cj8r7gbwgn59cmhaadzhh3v3n13362z"
   },
   "stable": {
    "version": [
@@ -67330,14 +67325,14 @@
   "repo": "amake/macports.el",
   "unstable": {
    "version": [
-    20220508,
-    656
+    20220512,
+    1330
    ],
    "deps": [
     "transient"
    ],
-   "commit": "c2c93f8095ee47cc1da2d4f77487ba586d696305",
-   "sha256": "0rl7fkrcfd88mx467jlpc7fvqmp4p6f5ccnkm8jvs902dj28bsw2"
+   "commit": "ebca27f8e16d3607070582849bea81d40ca5f584",
+   "sha256": "0xz5y5smfa69ylngkfck935c03ak40i4aazzklzyslv385vv9kd4"
   }
  },
  {
@@ -67524,8 +67519,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220508,
-    1841
+    20220512,
+    1218
    ],
    "deps": [
     "compat",
@@ -67535,8 +67530,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f",
-   "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3"
+   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
+   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
   },
   "stable": {
    "version": [
@@ -67615,14 +67610,14 @@
   "url": "https://codeberg.org/ideasman42/emacs-magit-commit-mark.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220511,
+    2341
    ],
    "deps": [
     "magit"
    ],
-   "commit": "bea29dc0419122b5dbc68b6b56cb0fbe97729e2d",
-   "sha256": "1xl5xr4vi0mafs1sv82sk5bm8qfm9kdl2jfxsv8p3y489fj4pn3c"
+   "commit": "ce2cd6daeb46eaea597a3b2c9d9ead80da9f0d09",
+   "sha256": "0kawy31kd0ywmrz705i5yf7blpd3zllpik0688j7cn0rq663vv2r"
   }
  },
  {
@@ -67902,8 +67897,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f",
-   "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3"
+   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
+   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
   },
   "stable": {
    "version": [
@@ -68058,8 +68053,8 @@
     "compat",
     "dash"
    ],
-   "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f",
-   "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3"
+   "commit": "12272c825d216148454b7cfa57fef202cdfe0c7d",
+   "sha256": "0h9f52c1kmgzr0w85knwvf1r2b6dw0dariy2sn9mpqsvpj3cyv2c"
   },
   "stable": {
    "version": [
@@ -69308,15 +69303,30 @@
   "repo": "matsievskiysv/math-preview",
   "unstable": {
    "version": [
-    20211221,
-    1611
+    20220512,
+    1853
    ],
    "deps": [
     "dash",
+    "json",
     "s"
    ],
-   "commit": "75dd44ad8dcfa12fe03f8e65babe0ea04e1a7d1a",
-   "sha256": "183m24yj54j8mix27q731wdxp1yyjm9qgd82hqflfivldlabm0x8"
+   "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0",
+   "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0"
+  },
+  "stable": {
+   "version": [
+    4,
+    0,
+    0
+   ],
+   "deps": [
+    "dash",
+    "json",
+    "s"
+   ],
+   "commit": "0f0b2315d23e5d18b627c9faa8f231f175b728a0",
+   "sha256": "003ih3nrv753rj4ssdvs6ddqzxgl63vzmrypd41xf4g5dfsbmsf0"
   }
  },
  {
@@ -70386,8 +70396,8 @@
     20210131,
     2152
    ],
-   "commit": "b26f842de19a31c36fb5149f292b9117dbf4bed7",
-   "sha256": "1f3zhvswjnb4dipjbgy9vcddnmzavyygl3xyhcpspxcxqxj1sj4g"
+   "commit": "00f6045b1292d23a0579208521a470d685bdc59f",
+   "sha256": "05w41l2n7y2xrckx95hxa3m96py42m2wnzw2h1278zzbwpn5w1fm"
   },
   "stable": {
    "version": [
@@ -70795,8 +70805,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "b0427eea174adb494efc9fa212c22021861d3f76",
-   "sha256": "0jzmyf9x9nq4jw8a0b5lisam0wz6vy3f8sxn4dj3anawjivn6ml0"
+   "commit": "19dae1c41542777cb5b0311b6e2e77f43e2fd407",
+   "sha256": "0rngii17j938hpri6dlijrwyr18mdbxjkq9nkgi57h6aqvh2s49c"
   },
   "stable": {
    "version": [
@@ -71315,8 +71325,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "d33e76efac6978c755bb5e0ced061b0063a6dff9",
-   "sha256": "1vzqwijlqvlzwh74gmb5cmc4k932x023361k4csxmpg5xvsgbg0f"
+   "commit": "e8e17b96df1b9fdc448bfc5367a24c2917de88d4",
+   "sha256": "1m13xvbh3msnxsr2q3ir88vmhd832rw5rih648064b0fbismszmc"
   },
   "stable": {
    "version": [
@@ -71456,11 +71466,11 @@
   "url": "https://git.sr.ht/~protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20220508,
-    909
+    20220512,
+    1808
    ],
-   "commit": "4da9042dbcf003986dcabcdbccd5cd8f9b583f76",
-   "sha256": "0w427z6fl86nbamclvzcyswrfvngzpwkv0k6v2fsn491az207mnk"
+   "commit": "b6285162d80fe438b4ac99acff74d33b5f901c35",
+   "sha256": "139ycd3p63hlxs70g266xj6i7bng1p2xavwcsxf4j4nvfayib9r7"
   },
   "stable": {
    "version": [
@@ -71809,8 +71819,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "ac647781d2d66d57c84a64dfd33b463b4a99b257",
-   "sha256": "0g9bq9z030kf4l5za54300zq98396a6f50d9rd9vylyjqsfxv7fk"
+   "commit": "d56a70bc71cdf90cfd5cf4d8517aa1d808659241",
+   "sha256": "07n4sqxbifkhsph45waa81ayqk9lpg51zr1zi9474s6wm9vmpf8i"
   },
   "stable": {
    "version": [
@@ -71933,8 +71943,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "b699497363c60bddc18393f68e3c9185e5fbb589",
-   "sha256": "0byaqhb1w0z6i87xj87g6ylx4r5bsjipspla0g0zrk33vk7vcfis"
+   "commit": "3b3716e3f865dd71e3acc3f54a0a9f7e2445695a",
+   "sha256": "01chyar1mss073c90ixnwjzkrxzi1fvvid9hwaddwfg224w3phql"
   },
   "stable": {
    "version": [
@@ -74517,11 +74527,11 @@
   "repo": "m-cat/nimbus-theme",
   "unstable": {
    "version": [
-    20220106,
-    2017
+    20220513,
+    240
    ],
-   "commit": "f9bcec4ce0f6cd656a56034ace7811dea769a7bb",
-   "sha256": "1mfx03mjm8w5djvwafd9p3zyw4aysalw4j57x1sv51shf1fzz2g6"
+   "commit": "958a92a979c88bee909d03a78b2faf6726d0069b",
+   "sha256": "0l4bi6hnwk4lssmya8x6av0j0nhvwccxaiv2ar1byiy7i3bxvr16"
   },
   "stable": {
    "version": [
@@ -74940,14 +74950,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20220505,
-    1324
+    20220509,
+    1733
    ],
    "deps": [
     "compat"
    ],
-   "commit": "76b7335202a5b6ddc6b6798a2e2fd5b09df57dc2",
-   "sha256": "1g48cmb0d2j5fpr5vm0xjv435b43vlx1h5k2g32qcwhygzvck76v"
+   "commit": "fed46eb7060aca624bfe1a18f13b73f94e70f013",
+   "sha256": "169asd32iask7h6m861j1qfg60mxnmxxcwc3f8ddxkpfjb6b27sq"
   },
   "stable": {
    "version": [
@@ -74985,15 +74995,15 @@
   "repo": "thomp/noaa",
   "unstable": {
    "version": [
-    20220504,
-    1857
+    20220509,
+    1600
    ],
    "deps": [
     "dash",
     "request"
    ],
-   "commit": "c1f24d46e08972b2be3912e41337eb630514ac06",
-   "sha256": "1q927nn8hss0h93jjawkcrzk9fkhk0qdsmsry851bi397sva6n7b"
+   "commit": "507831164b09a2d769bd68d5a45608fc0de626dd",
+   "sha256": "1xsnr4y3al9ps2v1y8yjapmghrvcgk8671h300l3w9w0gjcwkbhj"
   }
  },
  {
@@ -75312,8 +75322,8 @@
     "compat",
     "notmuch"
    ],
-   "commit": "2e479851b5cb2d25c31f21b400cfd34777348874",
-   "sha256": "1y9i88hadvdz1cd4792g6rvrj6jshva6p74f83qfhw7rhddzvsqn"
+   "commit": "dd852b09415e755cef6a345a2ee454a6cf1e1d06",
+   "sha256": "1v8idjm2z2jh6dqnwkslbj0masc04qw9yz6q3jxg7xm4biidw9sq"
   },
   "stable": {
    "version": [
@@ -75402,8 +75412,8 @@
     "compat",
     "notmuch"
    ],
-   "commit": "f0dcfd755fe9e58652f0569e3c8641d38cd6dd4c",
-   "sha256": "1hq91mn8gbyahlx2jjh8jqzsi1pm83ajp744m52hipflbz1w9mw5"
+   "commit": "b39cdeaec1afda6015cd0d5f4d851b3d59d0fd2b",
+   "sha256": "1y8nvxn715wpfxh48nxqpil277lknd70dmwnv3czr8iir909fmi1"
   },
   "stable": {
    "version": [
@@ -75433,8 +75443,8 @@
     "compat",
     "notmuch"
    ],
-   "commit": "341fe7f05efe68460451bd5cb7151ca6d8b8cfc8",
-   "sha256": "0pggrrf2xdb6r2h2fm96fhwl1cdawqn4a509wymr33gafnr5f2rf"
+   "commit": "4f64de401b8d955dce528f76575142edd9815dc7",
+   "sha256": "0hrki24izxq34w7m21nqhv2rmngkjxra9s5mdr8mr6shl1678pvz"
   },
   "stable": {
    "version": [
@@ -76100,8 +76110,8 @@
    "deps": [
     "axiom-environment"
    ],
-   "commit": "e60de5ed107ffeb530a56d24d04f38988124d12b",
-   "sha256": "0p8kbxfcrx1ib8g17g6h2i2ygy35qq992n3s2xa6ysij7wrfn4hd"
+   "commit": "b52fa715285e7ad182c8e679ebf05b130dd5b5e2",
+   "sha256": "1hb4npfpg1iy9j0p29q1jrjgx0mrn333m45nmsnxw8nlaxzd97x6"
   }
  },
  {
@@ -76612,14 +76622,15 @@
   "repo": "shg/ob-julia-vterm.el",
   "unstable": {
    "version": [
-    20210418,
-    2306
+    20220512,
+    820
    ],
    "deps": [
-    "julia-vterm"
+    "julia-vterm",
+    "queue"
    ],
-   "commit": "e04ee53d67cbd715c2d84fe5bc367526edfadc74",
-   "sha256": "18866agjrkx2gv38zr14mhf3rlvjdjvn3i8hxg12lrbv6q4rn8aq"
+   "commit": "448b1d0d2edf908c13a99a2424fec20de636f5a3",
+   "sha256": "040k25ikvngczd8yxm8i6qa0q6vbqgsiq1ddwq1wlvhaw9iam6qm"
   },
   "stable": {
    "version": [
@@ -77634,8 +77645,8 @@
     "notmuch",
     "org"
    ],
-   "commit": "744399e054ef3a19f66418fdb98ef9ad139cc3b5",
-   "sha256": "0mxhnh64arm8dlna88ml9x9grm0v4fh1zbk1pfav957fxwx9l9dm"
+   "commit": "1a53d6c707514784cabf33d865b577bf77f45913",
+   "sha256": "16p7j51z8r047alwn2hkb6944f7ds29ckb97b4k8ia00vwch0d67"
   },
   "stable": {
    "version": [
@@ -78589,20 +78600,20 @@
    "deps": [
     "async"
    ],
-   "commit": "5d9f2734c96166722c5057f3a2641ff8e08184cc",
-   "sha256": "10isxdaw7mqnw8flc76rva9y04wsyzpv6v0f3lsvkrx044rcz3cr"
+   "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba",
+   "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx"
   },
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
    "deps": [
     "async"
    ],
-   "commit": "ad3c332f062b5830e88b2ab13287a096ae434657",
-   "sha256": "05yrw59zrzxj1p8n65sk6mvy7jzik812mp9i2nsimwhlhn3si1pj"
+   "commit": "c3cbde261fd66b747374b667cb715ca9ee8c52ba",
+   "sha256": "084pfgjyf41nmwyixvza9vhmfbaq587hx78knpg7c19aiki2r8zx"
   }
  },
  {
@@ -79838,16 +79849,16 @@
   "repo": "ahungry/org-jira",
   "unstable": {
    "version": [
-    20220328,
-    407
+    20220509,
+    2058
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "502de6d31d0b2fd8480787461b7167d5dd3b088a",
-   "sha256": "16wm0k5sa7r12chfz96nfk2474a3wa7q7dinhc7hfl1x5c7v60zk"
+   "commit": "c0c0086419b4e68bb45bf609931916d6d8ae48a2",
+   "sha256": "0yrmgr4jr49qr94j50cbbpgwszgsw6w7c2c0q4pdz2ckqff0y1fx"
   },
   "stable": {
    "version": [
@@ -79951,30 +79962,30 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20220218,
-    1845
+    20220510,
+    2150
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "5310e208d151f460f9b7e3961b4796842e91a3ae",
-   "sha256": "1d7v9vn9bli4lj59lbcldhplg46g79038j9avzicwgrysm74ybic"
+   "commit": "1d3234359fa52fce5ac1006e2c51f14c760d275e",
+   "sha256": "1kvmr1sz3jcd4wc4gybazpigb9yv5wl246axbr7z4m6wjiq0k5nv"
   },
   "stable": {
    "version": [
     0,
     6,
-    3
+    4
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257",
-   "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h"
+   "commit": "1d3234359fa52fce5ac1006e2c51f14c760d275e",
+   "sha256": "1kvmr1sz3jcd4wc4gybazpigb9yv5wl246axbr7z4m6wjiq0k5nv"
   }
  },
  {
@@ -81175,8 +81186,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20220505,
-    2209
+    20220509,
+    1414
    ],
    "deps": [
     "avy",
@@ -81190,8 +81201,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "a5a096b0c621fb42aa80cea14677bfb1d0df1f39",
-   "sha256": "1xirg1cjzr7dm6ffmhybl3s2vvwy72nz775dqmf3aa4kgvg6n47v"
+   "commit": "0d2355d1eb4dcac1095a03d885788a12fe566610",
+   "sha256": "019pbp02fnbb7rcr80cfyi7pa9b413lgdfmbwaak2icb5cpmj452"
   },
   "stable": {
    "version": [
@@ -81338,8 +81349,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20220508,
-    19
+    20220512,
+    1634
    ],
    "deps": [
     "dash",
@@ -81348,8 +81359,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "c0871c42bec9fa836e1b2a8c7691f06694f99714",
-   "sha256": "0d7dvmrpmvp0hw9aygflw4jvvjsq89yg227g7bgkcnq8970qbwfz"
+   "commit": "2657f0b444194e1de6957f9cfc112383980d62f9",
+   "sha256": "1x1222nvy5fq2cyz8ds271xq03bcyn4252vxzdch9gai3n0vg00b"
   },
   "stable": {
    "version": [
@@ -81479,28 +81490,19 @@
   "repo": "tyler-dodge/org-runbook",
   "unstable": {
    "version": [
-    20220107,
-    451
+    20220512,
+    1927
    ],
-   "commit": "dd11d253d3ee94b70f0d2cc74c6e85c6f5ac189d",
-   "sha256": "1vjmpdvcsqrry4jg07l84nfp7kx0wmjn60l60bcfmzj2mwcz4nak"
+   "commit": "ec8b933c1269804546c356fe379169d1f0fce9ea",
+   "sha256": "09lg1ycfb3qkzqnhk088ija62kvv0z5jgg4apcbr2y4plb0bgc6h"
   },
   "stable": {
    "version": [
     1,
-    1,
-    4
-   ],
-   "deps": [
-    "dash",
-    "f",
-    "ht",
-    "mustache",
-    "s",
-    "seq"
+    2
    ],
-   "commit": "e5d1e30a05552ce1d63d13ada1487643a41b92cb",
-   "sha256": "093jbpanvpwxxdyb9136r804ai1147rbq1gfb7pdy0iymhrv3d9r"
+   "commit": "253c2876446650249d59ac35200b373a0aee4e68",
+   "sha256": "007n6rjyvfk9ip0hz0wcfdj4qw86rwg05dk5l7zfynnkbb7ggkp6"
   }
  },
  {
@@ -82383,8 +82385,8 @@
     20220220,
     1757
    ],
-   "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2",
-   "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj"
+   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
+   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
   }
  },
  {
@@ -82889,8 +82891,8 @@
     "magit",
     "org"
    ],
-   "commit": "6dc4d4bfffd6c11550952203a51346b13e120165",
-   "sha256": "1xpkwp3qk2jr1rphrcxdmld498prh3cds12y2a9cln27yfg8lkql"
+   "commit": "b33b916915db5f91d2c9da4cb1a2457ccbb09332",
+   "sha256": "16cbyaafwlfkrnxr7vzcpd3qpg55k6v59qj77njqbzps5axq145b"
   },
   "stable": {
    "version": [
@@ -82924,8 +82926,8 @@
     "org",
     "orgit"
    ],
-   "commit": "72285807707a802ebe7f3c6149de9a78a022b17e",
-   "sha256": "1n5vhpwy2ay1s106icr542wh7a8zrsr7jbprp76qaqhzfzddkiv7"
+   "commit": "8baf1dee795f026d4555687022487fab89c9bcdf",
+   "sha256": "0zdp3yi4vmrhpl8v0vk5d4b8kz77k0qnnhmapm7arv7719ydwzff"
   },
   "stable": {
    "version": [
@@ -82959,8 +82961,8 @@
     "org",
     "seq"
    ],
-   "commit": "36129691e60e992f31065be4c26d58645b83b033",
-   "sha256": "0k3x931fv66asdmmgfr44b9wy0z8xv1r324mw91fj8zf4v3ryj05"
+   "commit": "59bec36eb91e78d508e290b69c4383b27466513f",
+   "sha256": "116c6vbpisdwkh51084768ar8djzl1bsaafgzfjwhc9f9mb9n384"
   },
   "stable": {
    "version": [
@@ -83242,14 +83244,11 @@
   "repo": "minad/osm",
   "unstable": {
    "version": [
-    20220508,
-    853
-   ],
-   "deps": [
-    "compat"
+    20220511,
+    1756
    ],
-   "commit": "45dfc686e527d69b7965752594020a936ddfa9ef",
-   "sha256": "1f5f3dgaqhryqachrzwr0wqknp88jmv62dnlgz5nx4k7pkhrmrfm"
+   "commit": "471f21f0f8bffc078d5ccfd86610a83e5269c2a0",
+   "sha256": "1w8xc4g2fgg9l0yibqc0190afgk71z697ni4yx1v1z1vy46s76c4"
   },
   "stable": {
    "version": [
@@ -83530,8 +83529,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "e92af60c68c4cb05db84c13bb71becaca90763d7",
-   "sha256": "1h2qvvpqz3yi1chhdl8kxc7s98qgn5hyg9131qa5sdn41qx1gi4d"
+   "commit": "ff862866a2c5eb7b20aa96a97fa982e2db1b6640",
+   "sha256": "0wjrf1b5hjrgxgwqz1701xr6hhlmbnnr79f99162py49clljd5mw"
   },
   "stable": {
    "version": [
@@ -84040,14 +84039,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20220505,
-    2123
+    20220512,
+    1805
    ],
    "deps": [
     "tomelr"
    ],
-   "commit": "3c699a1ed3f666735974fb90610d60b41e86a3b2",
-   "sha256": "07bmjxqc3bwmn0rs6886jrmxvjag6y97a4zvnypf0yglq3g9aidx"
+   "commit": "cab606a2098524ea7ac97704cc8df6d2d9d190f8",
+   "sha256": "13gfchjdhalijbf5d4xmz1zvl904syl4lm07ssrqck4h66y4nr9y"
   },
   "stable": {
    "version": [
@@ -84877,25 +84876,22 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20220210,
-    1334
-   ],
-   "deps": [
-    "cl-lib"
+    20220510,
+    2024
    ],
-   "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1",
-   "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r"
+   "commit": "899bb08963c21028a02894426a9d86f768fe06d8",
+   "sha256": "1zw68gg8ai5921kly35fnxapnxqzdqx8ll7w8bdxpv8f06vq24xj"
   },
   "stable": {
    "version": [
-    2,
-    4
+    3,
+    0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "bc06686806d676658b5e962497770e47025c17f1",
-   "sha256": "1lm5mgvjhpxqfw5gcv99h4mwbq728b6f2hj5vjh1j67kdwy7ws8k"
+   "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1",
+   "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r"
   }
  },
  {
@@ -85062,8 +85058,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "3489c97340434096f24c64a33feea22e19c18a2c",
-   "sha256": "04nz6gl7r9sv51n3yaids524v8ccq5wbblxci1vckzsipbc8ys2i"
+   "commit": "6a427d9da742d78a8f6bd6ed9e31fbf241b2ea82",
+   "sha256": "03ypbz7m6qq37v0d2c6pbg17dclmrdyqxfcl7rzl4xfzy89q688p"
   },
   "stable": {
    "version": [
@@ -85450,8 +85446,8 @@
     20200510,
     5
    ],
-   "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2",
-   "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj"
+   "commit": "2f38f3583295e05c9ea491b7d1f6b4791169ba86",
+   "sha256": "0jyy8nl4r70l0dwc55lg75k7chcwb9zprl185x0122fjqgmnq1ri"
   }
  },
  {
@@ -85638,8 +85634,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "5dc2c2e06152dc51f7395073569f448a8f94d296",
-   "sha256": "0plw57g866z6nafgh8czb2hh87z1l2rihv9cvda3gs4fkh8hvimx"
+   "commit": "2c5de87c494ccfbe92c3f1da45f1720d7ecf4acf",
+   "sha256": "0pgwdd6406nldsgbazpr4qmg31k0n60hk6b73p74iimjs3l27ri3"
   },
   "stable": {
    "version": [
@@ -85852,15 +85848,15 @@
   "repo": "clojure-emacs/parseedn",
   "unstable": {
    "version": [
-    20220422,
-    936
+    20220512,
+    1328
    ],
    "deps": [
     "map",
     "parseclj"
    ],
-   "commit": "dce2eed418ad21acf3d2d6d75c37dfa679b22359",
-   "sha256": "0b3j69lym3mwakl7qbi1nj8v9xljxzvnxn5m16dhg50q20wqd5wp"
+   "commit": "35e9f3173a6cca60b6851dddace470b29654ac77",
+   "sha256": "06in2r87rn398bnqfc7bmpfvfbvrx9ybqs8r5yzy5y84f9gbfnm4"
   },
   "stable": {
    "version": [
@@ -86348,11 +86344,11 @@
   "repo": "JonWaltman/pcmpl-args.el",
   "unstable": {
    "version": [
-    20220131,
-    2316
+    20220510,
+    2056
    ],
-   "commit": "94a19b693a226aa11b15627e01f9f4c9af752bab",
-   "sha256": "0y0mnm2fhshvvc9iz4mgzvxhvhj0xriinn155dilnm4skglzgxk1"
+   "commit": "43229e1096f89c277190f09a3d794781f8fa0015",
+   "sha256": "0p2mpifr3ycy4ibr9y1r5lvq91dbw6vvi8g6n3jx1mqnxnh9ld63"
   },
   "stable": {
    "version": [
@@ -86534,16 +86530,16 @@
   "repo": "vedang/pdf-tools",
   "unstable": {
    "version": [
-    20220426,
-    2203
+    20220512,
+    145
    ],
    "deps": [
     "let-alist",
     "nadvice",
     "tablist"
    ],
-   "commit": "3ae9ba9ab9aaa03d1193667cb025a786bef9fe9a",
-   "sha256": "1rkhssb90id5vljk9lrlr8m2z7sxw9x2cb9cgiy06bzpfv4pggar"
+   "commit": "fedd930a09a497c03df3ce5204ccbd80da724662",
+   "sha256": "13yl83ld5z1asjqrsfdzyhnz4nrrr064lwbsgfvk3mmlqpas7b08"
   },
   "stable": {
    "version": [
@@ -87396,26 +87392,26 @@
   "repo": "OVYA/php-cs-fixer",
   "unstable": {
    "version": [
-    20210923,
-    718
+    20220510,
+    1407
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7e12a1af5d65cd8a801eeb5564c6268a4e190c0c",
-   "sha256": "1i0jlszc5z59arwknclhi3vmwp0mf6jk18axisvh5xdqggiwpjqf"
+   "commit": "225ca7127052e2b3d660495d04319e817ec302ab",
+   "sha256": "1zwl6hpw0ka4pdsk9i67dbv42idb0nhi5i3yajy1wzdihj7hqg3y"
   },
   "stable": {
    "version": [
     1,
     0,
-    1
+    2
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ebf78243b468592f4fbeb714923ecc8709d33ae0",
-   "sha256": "0ik5va5q7gpz6kmaaiarh6wjaafal22qcimflfwizs3nbl49y9mx"
+   "commit": "ac2d64c4b672a01744d14cc8ad80e9c9ff55c63c",
+   "sha256": "1jyjqwv4haibv526bwpvyyszs7ga9lmsjhn47hyk3ddffrr84c0y"
   }
  },
  {
@@ -89519,8 +89515,8 @@
     20211231,
     1823
    ],
-   "commit": "3bf430270c74dad830ab9d776aab23cbf3ea3953",
-   "sha256": "1ldxv93gjcfr19smdajs081sli81fw6wr83w78i8mlqhw41ilslw"
+   "commit": "114d646f0f4dd49de19dfedd78630018f71470e5",
+   "sha256": "1hgia0d2j81mlkcl8bilznn4044qjjpy00cdd96zs7p2lbvaz3sb"
   },
   "stable": {
    "version": [
@@ -90079,17 +90075,17 @@
  },
  {
   "ename": "prescient",
-  "commit": "ec02349e31531c347e4a43fbde56ae4386898cc6",
-  "sha256": "04js3hblavfrc6kqp942x5yjdl3ndazf3n64p83423ldsmhbip6s",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "04anqfn48ibmg11s8gp3i8wyghy724hg1qzbw44jfndmv6nibifz",
   "fetcher": "github",
-  "repo": "raxod502/prescient.el",
+  "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20211228,
-    417
+    20220509,
+    2300
    ],
-   "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca",
-   "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j"
+   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
+   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
   },
   "stable": {
    "version": [
@@ -90799,11 +90795,11 @@
   "repo": "buzztaiki/project-rootfile.el",
   "unstable": {
    "version": [
-    20220505,
-    1256
+    20220512,
+    443
    ],
-   "commit": "a4c4f004fbf8ca44e74be845a1c3696d6db5b0d6",
-   "sha256": "00hg3hj2syz8n514h8fcwsyxxf28lbrg8cvhvnk0a2g74s8wk3d1"
+   "commit": "cb87657c4426e39aa2c481190e594c68fb0de8be",
+   "sha256": "07gb9b72gkwz748xwnsjayn68x5qn8b0ka8wmwvqgwgak14f1da3"
   }
  },
  {
@@ -91256,8 +91252,8 @@
     20220329,
     655
    ],
-   "commit": "a894bcc5f915f1c76a2a83c12c12ea3497542426",
-   "sha256": "0s3glxi0382xhs6asv7ajrs3qzfj27qd8j4szdn8a8pmskl3c81m"
+   "commit": "2a8701209b273db5a35f15145ec62f32799e03b1",
+   "sha256": "05l65cwyw2pdyv6rn14h0axplgnlm5z7v90iwcxk9vysz74icdd7"
   }
  },
  {
@@ -91352,17 +91348,18 @@
     20220303,
     1716
    ],
-   "commit": "637a699969baf5930c77b87fbd89bd3286c09c98",
-   "sha256": "0av1bkv6h4q7p294v62w517d0wmr609k4cb488sr839h1y2kb8c5"
+   "commit": "b3cbea18ea02ab82379ba5d014899035aad4b8f4",
+   "sha256": "0x60jy244xm1gkqvsidyj8xfqdfwpn0q8knr28n4giycwlzncgyr"
   },
   "stable": {
    "version": [
-    3,
-    20,
+    21,
+    0,
+    -1,
     1
    ],
-   "commit": "21027a27c4c2ec1000859ccbcfff46d83b16e1ed",
-   "sha256": "14042h3p5xav3kkd04li92kyllxjp4xv6iy6r9mfnh8l7mq1l0x4"
+   "commit": "3cede25cef0c2f5f5b60461b608d8c07a621ac04",
+   "sha256": "0q024rd5y8kd9pjslh118vhl3awr95gfvc6zxxr6i4qwqq1jy5nj"
   }
  },
  {
@@ -92258,15 +92255,15 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20220508,
-    655
+    20220512,
+    930
    ],
    "deps": [
     "async",
     "xr"
    ],
-   "commit": "069ff6b6b039b16ccc135a4288eebfcd76a0fbd2",
-   "sha256": "1wz2c24i530xz62hbx0ahbm3sn2y6iwdpq3wk9npqyvhrk11g6ih"
+   "commit": "dcdae4db85646de85b1ca75e4604691cf9273273",
+   "sha256": "1432ph59plnh41xrmq59n9z987r41xf34qsxl3sbzfw6v8m927ys"
   },
   "stable": {
    "version": [
@@ -92444,8 +92441,8 @@
     20210411,
     1931
    ],
-   "commit": "40ddfabcb0afe5dadab3c4dcd890b8302db9edd0",
-   "sha256": "14zh9mlm5fbsg0myyrw7pc253vw0in1jjx4302x3qsb2r1v20xyd"
+   "commit": "2ea65b12176e575748db64d740ef834cba577d70",
+   "sha256": "18fv0kibj3rj8aydyxzda4mk7qi19hg82q3rm2mdi85082628wmy"
   },
   "stable": {
    "version": [
@@ -92792,11 +92789,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20220508,
-    1854
+    20220512,
+    1206
    ],
-   "commit": "013f79b0f402ebda79c5c0c087a6a33797ef08ba",
-   "sha256": "0jmgm2gspyfq0spvyry50bsl3gv2lp295fqgr1y9zk2lbd53b3mz"
+   "commit": "97bb2d5ca50bec43a22ffc6187d13e3afb38238f",
+   "sha256": "02i5mqx3ip6k9n09yzr395ayhf4i1l7n8sk9q0ibcm2zadxnlqc7"
   },
   "stable": {
    "version": [
@@ -93176,8 +93173,8 @@
     "leaf",
     "quelpa"
    ],
-   "commit": "e220893d29a095234076be1b255fade11f6410b8",
-   "sha256": "0sfz9yp0h45smqcs40an1a2hvmcgqd6fxi0brsx5hsvs4rxhpry2"
+   "commit": "ea60d14a6c8dbe65ad0b3353185945d43ae4393d",
+   "sha256": "0xddhjal99q3s537kcdrcimykmzca73ic3v2abv2ymwby2wm52b9"
   },
   "stable": {
    "version": [
@@ -93474,11 +93471,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20220505,
-    1350
+    20220512,
+    1447
    ],
-   "commit": "fbb4a4664e2cc2b5d21eee62735f73b7f0272e60",
-   "sha256": "0120v4z3qk59bkfcn1gazjp0xyn2vbmb4cpflpir4b0xndpgp92g"
+   "commit": "3b351fbb0d3e81bf260cb3fc7b623f1b782550cc",
+   "sha256": "0gcyb47ld10jvrf3wm63njz0d9y70fi8dwsx14pbdcrw2xs2p4s3"
   }
  },
  {
@@ -95901,11 +95898,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-revert-buffer-all.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220509,
+    1045
    ],
-   "commit": "0296a7101f65d486e13c2674bd4b51631504523d",
-   "sha256": "0avizhbx0a7fnlbjbm4ivg5abbwymmvrzlshazxf5ngn261fgm2w"
+   "commit": "91d0f4f7a0c0c3015887f4ed808537ebebd6385e",
+   "sha256": "1sja06pzvx1hds786q4a071zl8r8034is3l8s8zp5k4kxd6vg760"
   }
  },
  {
@@ -95973,15 +95970,15 @@
   "repo": "dajva/rg.el",
   "unstable": {
    "version": [
-    20220427,
-    1613
+    20220511,
+    1328
    ],
    "deps": [
     "transient",
     "wgrep"
    ],
-   "commit": "a6411f98a695d8b3ef0db156d41b2a62ca36ee7a",
-   "sha256": "046jws1qhi6spy616m7nzclp4jpx1945b6whayb0mr63as2yr886"
+   "commit": "c46c5167ac03f68fd6fee07972017282c62bc942",
+   "sha256": "1pkbkh260k2r7x158b691ppqvxxzqkyylbapwlrxzc2ly23rmaxs"
   },
   "stable": {
    "version": [
@@ -96377,11 +96374,11 @@
   "repo": "jgkamat/rmsbolt",
   "unstable": {
    "version": [
-    20220503,
-    1708
+    20220510,
+    1621
    ],
-   "commit": "de28f7903a3b895c3bf9628ac6d4db4378748fa8",
-   "sha256": "1j5s30rv6qxjiv73zzdl0mnm9qgndyiiqdc29j8iw5m2gv5p5ncl"
+   "commit": "3fe322e5739e57cceea37c4104ac7bc5231555c3",
+   "sha256": "1nc7hh3psw548mzzbcz7226i7pbyrdadmlrw955cl91z51rahxah"
   }
  },
  {
@@ -97282,8 +97279,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20220427,
-    1413
+    20220509,
+    716
    ],
    "deps": [
     "dash",
@@ -97297,8 +97294,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "8c214efb72be9731cd7d613c07672515a0f70664",
-   "sha256": "11kj8rndj907akzr07mqb78n6rc61kcywwmz8hlp1vl83h82885v"
+   "commit": "3b379fc25b7a097a014147d9c8b83ec1a418cd76",
+   "sha256": "129mclfyy6nji7c3avni4y3kzi3z67dv3cv40jmlv1m4isxf59n1"
   },
   "stable": {
    "version": [
@@ -97807,8 +97804,8 @@
     20200830,
     301
    ],
-   "commit": "841808390d8d063c62c60cb70fa02064be2255d6",
-   "sha256": "1smmachhaazvbj9iparakza057bb4ql84dxkq76svizak0krf156"
+   "commit": "b929e705e76e8ff47d170c5e9849f86002f3e09f",
+   "sha256": "1iflrjldvabilvji1zmx1rmkl6z16s50k3hldn3l871gz16wa0h6"
   }
  },
  {
@@ -97899,8 +97896,8 @@
     "request",
     "s"
    ],
-   "commit": "b61fd8324b457cd75494d706a92af89bbf9a4e71",
-   "sha256": "1wqdr3n03a34xdnz0dnf07fgp12vamxf2dbfjl1k0yrbxyy449jc"
+   "commit": "cd0b42e5026426af2bfad57b692760bcb5d05dbb",
+   "sha256": "1kda2yrpm2c8c8p9lg183hf8limc4b2ay5gdssfhc7r29nvvagpv"
   }
  },
  {
@@ -98180,11 +98177,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-scroll-on-drag.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220510,
+    1204
    ],
-   "commit": "fb9af984610f7ef83b031ff04efa32dbdf2eb741",
-   "sha256": "0lyaw728nnxwfaw2rsd4y16gfa66sdsw8b0s5ccfzrwd64vxbxc0"
+   "commit": "01c14f4c024548ed1f644263faa0786c10afc978",
+   "sha256": "09fifi2gsjk47aif3j0vysfgpshh7az3zlyiblpw5zqnmq3xl1a1"
   }
  },
  {
@@ -98195,11 +98192,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-scroll-on-jump.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220509,
+    1046
    ],
-   "commit": "1cfa3e8a91427ef4066e5e62b035dda09cd6a7ae",
-   "sha256": "0ns3zfa421f7hg1kkgczkmj6v2pr0pj424bfak3y294fh6b15pc2"
+   "commit": "8fde237ae6d6a54730445b399513bc6d31d7daba",
+   "sha256": "0fbqmwz519bqdafjygpbk5zj08m3z3rm62sd2071qsxqrf70z72v"
   }
  },
  {
@@ -98296,11 +98293,11 @@
   "repo": "t-e-r-m/sculpture-themes",
   "unstable": {
    "version": [
-    20220406,
-    2330
+    20220512,
+    2235
    ],
-   "commit": "a21871b75cc7cb575ceb43640d039307fbb412e1",
-   "sha256": "0ki45bvc93p76mxpsm5pyknqgf67xz6c122yssps1hcxhdazij5v"
+   "commit": "be3adaf9db276e899b44e5093316cae2014b22c9",
+   "sha256": "0wn066zc72djac8ccss95ydi69ggngknkjh2hg0hi17g3m2pj6f6"
   },
   "stable": {
    "version": [
@@ -98585,11 +98582,11 @@
   "repo": "Kungsgeten/selected.el",
   "unstable": {
    "version": [
-    20200528,
-    606
+    20220509,
+    1810
    ],
-   "commit": "3043fd2609f7e71d809763ae6e8dd4b6c904e63d",
-   "sha256": "11cr55g7rrr4gqb9r2znmff0bp112l7a96d26mznfdprzj7pdzvd"
+   "commit": "81cb32521a05ff2a9125e001b83608e108e480f6",
+   "sha256": "0zk5fnjw5czq71z3qgi7kl9r5y3cw5mx1hswyhli7xhxzjpldxp4"
   }
  },
  {
@@ -98641,21 +98638,21 @@
  },
  {
   "ename": "selectrum-prescient",
-  "commit": "5724ebca5ab5a1c3087cc13ae0693548666ed62b",
-  "sha256": "1zr83pq39i56v5bx78cp5cg2lrwz01975ng4h1ziv6nrh9p7vvr0",
+  "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5",
+  "sha256": "0wwcjqqprz0yikc3cyg6n503dk6rrx8xbw5xjqvydq0204mvw1y9",
   "fetcher": "github",
-  "repo": "raxod502/prescient.el",
+  "repo": "radian-software/prescient.el",
   "unstable": {
    "version": [
-    20211228,
-    417
+    20220509,
+    2300
    ],
    "deps": [
     "prescient",
     "selectrum"
    ],
-   "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca",
-   "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j"
+   "commit": "c05f8a43c6ff07a8b5a3ba8df7a2ec35677b7484",
+   "sha256": "0752dyl4fhi0jvbm238s5p1sv7z4jlkmkdrxvwn0dlhfr0rhfw1c"
   },
   "stable": {
    "version": [
@@ -99365,11 +99362,11 @@
   "repo": "qhga/shanty-themes",
   "unstable": {
    "version": [
-    20220405,
-    1126
+    20220509,
+    1656
    ],
-   "commit": "55b6a2653e43187559ff8b5103bcb9dc54e68ab6",
-   "sha256": "0c11jkzalm714q0qj0rcbk946i2v4gxh73n22k7q63afqdk9sizw"
+   "commit": "14a0e9de08aa6412931b121ae97b700e10ccaa80",
+   "sha256": "188h918n55mhw3jss10nsdc2m04ngdy1mbh7kfh6hhc9d36ydj7y"
   }
  },
  {
@@ -99395,14 +99392,14 @@
   "repo": "sebasmonia/sharper",
   "unstable": {
    "version": [
-    20220321,
-    422
+    20220510,
+    2001
    ],
    "deps": [
     "transient"
    ],
-   "commit": "96edd4a1dbc267afdff0cb97298d1b05b7c2080c",
-   "sha256": "0pprbp9n43g1ijap96fjiz6sckplryi198gci0ywpyglx6illllg"
+   "commit": "8020a5da0327f9a18b4bdab474bf8d81c1b38ea7",
+   "sha256": "0nby923h8hprxqyx48592q5584p8rmq3zvi12g2fbglabff76bmp"
   }
  },
  {
@@ -99773,8 +99770,8 @@
     20220426,
     715
    ],
-   "commit": "2420e7fb0d11372f1fa898a3b996bf2ce00fe66a",
-   "sha256": "05m1nqcvwc7vlki3n8v3d4idpvvbb2lkwwj9z30033g0q4j125m8"
+   "commit": "7baf17355289c29d18f993f383c5d6a187f33b35",
+   "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr"
   }
  },
  {
@@ -100115,11 +100112,11 @@
   "repo": "riscy/shx-for-emacs",
   "unstable": {
    "version": [
-    20201121,
-    1824
+    20220424,
+    2124
    ],
-   "commit": "09ae2124369ded4f38459d2456f72536d172227a",
-   "sha256": "1q07f1ppxx3z01c6zc20pg7kwfmzjzqbsmq3qxgkn3ggchyw0680"
+   "commit": "15bbc0f89a4927792e2e791378de827ab698ed69",
+   "sha256": "1llsf65yz2rzj0dyvqjirb5z3cxdr7251iaffbx9sl761nsg2nk9"
   },
   "stable": {
    "version": [
@@ -100223,11 +100220,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-sidecar-locals.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220510,
+    413
    ],
-   "commit": "3831db67c692f269d1ac8bfdc38c56ee2d110250",
-   "sha256": "1ypjk466z8cm5plm44l182zq5fwiyv6my2a9rbgfw9rb3ci6s2rg"
+   "commit": "7fd5daec1e0a7a091b343948bbb5c77e73724776",
+   "sha256": "1mbfvq1xbplk33363yqshqq7zmvqra73i0i126dcnzpd95pwqsqm"
   }
  },
  {
@@ -100636,14 +100633,14 @@
   "repo": "laishulu/emacs-smart-input-source",
   "unstable": {
    "version": [
-    20220506,
-    1606
+    20220511,
+    1734
    ],
    "deps": [
     "terminal-focus-reporting"
    ],
-   "commit": "f26d25194c65e19b5473fa1a3cdf96be2b209e19",
-   "sha256": "1427qzmr1cmhld24iza0hrkfcs03h4flf3lcyhxfrykikqs486is"
+   "commit": "0eeb75db3eb031bde3e5820ee39a2b7549dc5d8b",
+   "sha256": "06ky6358cc00z18srp6wcid9f0pjy1kwlvvmfznhsfqkjr6pshzp"
   }
  },
  {
@@ -100661,8 +100658,8 @@
     "compat",
     "magit"
    ],
-   "commit": "2af8cec83790980a9a96c15ee3655a179aa3ddb1",
-   "sha256": "0g2rvh7vs3d4mmkflvr2jxl8q3hgwcw0wfq788mxhiwkknyrkfmj"
+   "commit": "9626d9d26dc9f3cc57d41fa119a74e0cb1c4aab9",
+   "sha256": "0npyysnddfbm1dgidqn63jrgl9clx55in1cp1krz03zrif3injis"
   }
  },
  {
@@ -100948,15 +100945,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20220302,
-    1215
+    20220510,
+    2050
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "6ef28864d4a6b4d9390dbd0cac64f2a56582682d",
-   "sha256": "0pscgg31slqggdzrjfmkg721lwvqph9qrp833p1j4b7wcc1j8xvv"
+   "commit": "c5342a3086367c371e8d88b3140e6db070365d43",
+   "sha256": "008qav1p8angqczv8l1yd2ics0pyp69x93s8xvapcrxvhv8ishgn"
   },
   "stable": {
    "version": [
@@ -101686,15 +101683,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20220204,
-    1134
+    20220510,
+    934
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "37f77bf2e2199be9fe27e981317b02cfd0e8c70e",
-   "sha256": "095aqr4mz6yx8xa2gr7k5nf6a82qxdrjh8qv47hfhbc3832gy8jk"
+   "commit": "ec15aaa748b21c9b8453dd95604ccc95fc1138cf",
+   "sha256": "0cza0wnk3fyyh13srczf2976xwhyfmq2v9m7q6k2lyn7jyfvfxiq"
   },
   "stable": {
    "version": [
@@ -103114,11 +103111,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20220429,
-    126
+    20220511,
+    143
    ],
-   "commit": "1405b4f050f8181b8bcbe2951760e6c5b68b08c7",
-   "sha256": "0l0kpmf3acsxr1xbq8kzfs72232vm2szjx9q8w2s982jfwqsfrxr"
+   "commit": "701e7c49c38babaa2b2071febd2b112fef600683",
+   "sha256": "1wkqrlwh9n827x49m71j5ilkgk9xn6smxi11cfbd35hbdkdf5gyn"
   }
  },
  {
@@ -104294,8 +104291,8 @@
     20200606,
     1308
    ],
-   "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5",
-   "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf"
+   "commit": "9ce680a52bd90ce9bac568a6a182b1b3c00577e5",
+   "sha256": "0ab9ri7bdhq0w0hn7ady3xf5rvsvni3j1l9lr6y3nqf6kfrbhzhf"
   },
   "stable": {
    "version": [
@@ -104344,11 +104341,11 @@
   "repo": "motform/stimmung-themes",
   "unstable": {
    "version": [
-    20220508,
-    1737
+    20220511,
+    1245
    ],
-   "commit": "d03558c2aeac781c65c4137839362790f8b36b3d",
-   "sha256": "1gqsbqlc1aygls34mk9l5qywkx71pps4qsh9sinvgyrdwlllyk56"
+   "commit": "d34e83d6a00c248c7ce9ab34425773c30910f634",
+   "sha256": "0vfwa5iw6ac7yijqzridn07ybl295s2kxfc45ld9sp62gj4qxs95"
   }
  },
  {
@@ -106861,11 +106858,11 @@
   "repo": "minad/tempel",
   "unstable": {
    "version": [
-    20220430,
-    1020
+    20220509,
+    2139
    ],
-   "commit": "1ce581e30455b113d9c8358e79952134ca2e0356",
-   "sha256": "1i5vaxfinmj5zrrh80yjjd61sncxvjkb90g2wwa65h3icpa9vvyr"
+   "commit": "b88c58a89390cf3834de898109c5e69a5cf434cd",
+   "sha256": "0mk2ghqvg4raja1hg5hwg6774blba56sg2bmfh8xma4slg5n8js5"
   },
   "stable": {
    "version": [
@@ -107220,11 +107217,11 @@
   "repo": "davidshepherd7/terminal-here",
   "unstable": {
    "version": [
-    20210605,
-    1453
+    20220510,
+    806
    ],
-   "commit": "e0e89344624fadf080f6770132ebdd7991355fdd",
-   "sha256": "11hvyvnbr6skw6czwk8gjw9v08azf8s2kafqh5jb1nlznfghcr11"
+   "commit": "24cb30dea30195108f85aceea28f086a84d47e5e",
+   "sha256": "0cqj8g1pbq24d6zgsd0dq85sam2sl7w2y29ksnv4a93krjw1i2hr"
   },
   "stable": {
    "version": [
@@ -107907,18 +107904,18 @@
     20200212,
     1903
    ],
-   "commit": "321b08352d043708869d5c15f961610392afca16",
-   "sha256": "0pynyavfwwylqibj4az58a3q45di540d0j6dwdwywihn470cinvz"
+   "commit": "200776bcf1296360707c5b8a3f18d2b8817da888",
+   "sha256": "0s1pzpcx6g12hnn48gfyfp9wai5yk6rnsjzn82661rdmhjwm2z64"
   },
   "stable": {
    "version": [
     2022,
     5,
-    2,
+    9,
     0
    ],
-   "commit": "f7a27a8f7fba7b08cc8ff2452afe8e5ecd99acca",
-   "sha256": "0zczzrpc2nwzp48wyqssrv3iykrlmyjdmipwq2fqzdi10wb5paq3"
+   "commit": "321b08352d043708869d5c15f961610392afca16",
+   "sha256": "0pynyavfwwylqibj4az58a3q45di540d0j6dwdwywihn470cinvz"
   }
  },
  {
@@ -108258,7 +108255,7 @@
     0
    ],
    "commit": "9e1a12a494537472fb1f9f9f23dc38b8bca1f9af",
-   "sha256": "1vav4f6g86fh71ddprql0m8b05f4h8l04n7jfskfmvpfwgw2w87r"
+   "sha256": "0bndwcpz2alzimlmkcpcdxsl5xvckks22xmqn78rkg9pscl10gjq"
   }
  },
  {
@@ -108350,11 +108347,11 @@
   "repo": "duckwork/titlecase.el",
   "unstable": {
    "version": [
-    20220503,
-    1344
+    20220510,
+    331
    ],
-   "commit": "dafaa6ca09fdf1ae8413159cae2b5d74e9713440",
-   "sha256": "0kpg1l0rbbwqcmlj9i8xs2dv9h6yik9wgngik5z6wdgxbkaxjln7"
+   "commit": "8f609e46d4d0c06cd442352ca7d296e2ccb1b62a",
+   "sha256": "12ghq6zcv3ldcfr9c0zhlrq8kscf7fz2irpil7zq926alcqiqxkl"
   },
   "stable": {
    "version": [
@@ -108608,11 +108605,11 @@
   "repo": "topikettunen/tok-theme",
   "unstable": {
    "version": [
-    20220505,
-    1155
+    20220509,
+    1324
    ],
-   "commit": "118565dab2d3cf1b083d666bc19ed1b063035732",
-   "sha256": "1l2s99n7gcm810di9z7v79znlg3yy3aj6pdgwgd7mnyjhlxm3m4a"
+   "commit": "a1a224d96665ee14c059eed63dc4b458f6b7a8d8",
+   "sha256": "0amcvd7x1llfjk2a78rkgia6n7vmrpqnh4xq28aczsi1z6khnkvz"
   }
  },
  {
@@ -108742,11 +108739,11 @@
   "repo": "trevorpogue/topspace",
   "unstable": {
    "version": [
-    20220504,
-    2220
+    20220512,
+    2008
    ],
-   "commit": "cbd1f7e8dad4284455488f759946d2f38deff2c6",
-   "sha256": "0lbcabpp5a9zz36j710b1dw1zzjhhm1434nv3icq8q2z6k8n06xb"
+   "commit": "86127bf20f241a3c421b13523f0de6590fe42055",
+   "sha256": "1ahi1kgfis3khbgr3ps9ms71nc4b10aydd97q9mpm6h5rxvl2iv8"
   },
   "stable": {
    "version": [
@@ -109122,14 +109119,14 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20220508,
-    1914
+    20220509,
+    1943
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d9b3a54128065222d35ce4ba49cdb39e23a06d2f",
-   "sha256": "0p9qkgfsqjp5qra10yalm53b74bvm32rfxrvlpl4pqcs3mqlxw3g"
+   "commit": "6fc09a663e408ade0d1b88f47701c96a9b051e34",
+   "sha256": "0xihkzz94s84xkl60hi388lhcdiwnlyq2mpnnqn0vf54amjfdh7x"
   },
   "stable": {
    "version": [
@@ -109186,11 +109183,11 @@
   "repo": "rayw000/translate-mode",
   "unstable": {
    "version": [
-    20220402,
-    853
+    20220511,
+    1357
    ],
-   "commit": "fb73b3d928a8011a21402e2c14aa4aab56bd05ae",
-   "sha256": "1a01kvkpr0d2c7llj5hawwampz45ysv55gzvdvdldc0yc9qhvhyl"
+   "commit": "e1940b333241a4d0c224b7b875962736ca2b693b",
+   "sha256": "18s400rrpqji5dmn453f6cnk69cyskbmzsnkbxmss2wrqazp3l3c"
   },
   "stable": {
    "version": [
@@ -109370,8 +109367,8 @@
     "compat",
     "transient"
    ],
-   "commit": "7c70d499d08321337f860a3cd59cba7296cfcace",
-   "sha256": "0yl0ddn1iz7iph0vxh0fzavgsgrk8ks5axggzbgs8ywl6ya8r7g2"
+   "commit": "1292530acd05956a2f1bd19c94ef6ab59f05ad8a",
+   "sha256": "1vnv7npzwx3bbkd1c3dql98ggrkwr3dfvcx6jrnm15s041y9sjfz"
   },
   "stable": {
    "version": [
@@ -109559,8 +109556,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20220506,
-    1056
+    20220511,
+    1852
    ],
    "deps": [
     "ace-window",
@@ -109572,8 +109569,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109609,8 +109606,8 @@
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109633,15 +109630,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20220427,
-    1331
+    20220511,
+    1852
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109670,8 +109667,8 @@
    "deps": [
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109701,8 +109698,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109734,8 +109731,8 @@
     "persp-mode",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109767,8 +109764,8 @@
     "perspective",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109799,8 +109796,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -109830,8 +109827,8 @@
     "dash",
     "treemacs"
    ],
-   "commit": "07706547a2a927e6787645538d8bdb6e9418fb62",
-   "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x"
+   "commit": "dca83bd42918b510173759df4cc8b3663d5d480d",
+   "sha256": "1cxz5kx9qiv0imlzsbwjkydks2xfrcdchcnia2hyxhjpldff5vnq"
   },
   "stable": {
    "version": [
@@ -110899,11 +110896,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-undo-fu.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220509,
+    1045
    ],
-   "commit": "08a9f1494957ca6513bdf8be5de6801b33e3ee59",
-   "sha256": "1yfkaqs7jkn6cfd2gixxscx303d97hngvni48a9hqa3n4hkg878p"
+   "commit": "97e7f4f6e0754fd1b01db9638b3f534b5b4941c2",
+   "sha256": "0gx4cm6qdl06y9vrwy5wj3zn618zf3w0b8qpdnns3q4xc7qz3b6g"
   }
  },
  {
@@ -110914,11 +110911,11 @@
   "url": "https://codeberg.org/ideasman42/emacs-undo-fu-session.git",
   "unstable": {
    "version": [
-    20220507,
-    1118
+    20220509,
+    1044
    ],
-   "commit": "bc48bb6611d516891b61b2c4b5bc8d7fe8a520f6",
-   "sha256": "1r53bdip485wmyqq0qim7kwspgqgfa377nfb356ff1j0vmkjkwws"
+   "commit": "52c71b1cee2fe944e0013a2823e6fde10b26bc65",
+   "sha256": "0ijw245wg9rxhz419hjw62jsgpwjy9r26z9jbd018r7f4qa5gh3s"
   }
  },
  {
@@ -113305,8 +113302,8 @@
     20220414,
     930
    ],
-   "commit": "f5eb6387506b22ba7e21b4e335e689cf6768f18b",
-   "sha256": "10zpxnp5iv409jfcggvfwva35kr6vzybra4d4mirdkw898rsmsla"
+   "commit": "2801a2354d93920dcd12da3d1090954aec9f7402",
+   "sha256": "1w4fkb7yp8cmpyxqyghiz4rqkzajjh1nqf5wjnxhvjv0av1lddhn"
   },
   "stable": {
    "version": [
@@ -113328,8 +113325,8 @@
     20220414,
     931
    ],
-   "commit": "d585d0a3b87461b01dfad4ceaa7831668c6021d8",
-   "sha256": "0hl1zcf5w5m1lrz7jjk8ac7k6g8rhr9klzdh0nd9f6ksydvs9lfv"
+   "commit": "73e8431576e5b65c227dcf37c7d1a5c609221ac9",
+   "sha256": "0fxwcxdr7ssj7v5bsx42zinas6fp3iigdh98j1mqm54xm61a58jc"
   },
   "stable": {
    "version": [
@@ -113658,11 +113655,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20220426,
-    717
+    20220508,
+    2259
    ],
-   "commit": "2420e7fb0d11372f1fa898a3b996bf2ce00fe66a",
-   "sha256": "05m1nqcvwc7vlki3n8v3d4idpvvbb2lkwwj9z30033g0q4j125m8"
+   "commit": "7baf17355289c29d18f993f383c5d6a187f33b35",
+   "sha256": "1a2m6jkvnv852q07wvi80nbm7437wnvdfdyiq4iffhffmz8c2mrr"
   }
  },
  {
@@ -114944,11 +114941,11 @@
   "url": "https://codeberg.org/akib/emacs-why-this.git",
   "unstable": {
    "version": [
-    20220429,
-    1227
+    20220510,
+    1146
    ],
-   "commit": "b69263c66b63680e1db81f6da98de00c230c7384",
-   "sha256": "1adsq14s4qkhf3d3n2137zrcz0x0gg31y6pa9viwq6hkhi59rddv"
+   "commit": "71baf80f9ae7c1117f3b1bf531e23e43bf567424",
+   "sha256": "1cwasg2dyy86c3hh71xqqsl7wy5c6mf9mnaf251l5fa5895xhbff"
   }
  },
  {
@@ -115486,8 +115483,8 @@
    "deps": [
     "compat"
    ],
-   "commit": "7348f6d5ff90318a1c948d0499d8dc6721fe851a",
-   "sha256": "02m44jrn5yznx4j6dwxsdjxbz8ik0r6mjy6cx9jda2kh7yr9pnc9"
+   "commit": "4ab8c6148bb2698ff793d4a8acdbd8d0d642e133",
+   "sha256": "1mc0ayfhxl8jpdgw2p6prdi4m3ab3hh7hv0p0kyxmlc9m6f3ablc"
   },
   "stable": {
    "version": [
@@ -116011,20 +116008,20 @@
   "repo": "bnbeckwith/writegood-mode",
   "unstable": {
    "version": [
-    20210418,
-    110
+    20220511,
+    2109
    ],
-   "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0",
-   "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z"
+   "commit": "d54eadeedb8bf3aa0e0a584c0a7373c69644f4b8",
+   "sha256": "1a3gmaaa344kigr209b6wnjiw9ikkmw1j5jda04h3g8f9817njyv"
   },
   "stable": {
    "version": [
     2,
-    0,
-    4
+    2,
+    0
    ],
-   "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0",
-   "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z"
+   "commit": "d54eadeedb8bf3aa0e0a584c0a7373c69644f4b8",
+   "sha256": "1a3gmaaa344kigr209b6wnjiw9ikkmw1j5jda04h3g8f9817njyv"
   }
  },
  {
@@ -116168,8 +116165,8 @@
     20210614,
     1527
    ],
-   "commit": "46c8a7c71275ced2c662c1222d4b85319f80dd83",
-   "sha256": "15qxs91inbpr9qk2xlaijargkvj9c6rmw0m4b05qrqni0cgb75dk"
+   "commit": "cf29c6ae6f8d92f012feecec1dccb23b7e93c86f",
+   "sha256": "1nhmndzy936jkgdp30lvnv45y7ixv0hsmxdbibn0lwy8xpd51q7s"
   }
  },
  {
@@ -118160,11 +118157,19 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20220423,
-    944
+    20220509,
+    2156
    ],
-   "commit": "d6d7713cfac073940dcd96b55c18830a64d4ccca",
-   "sha256": "09vnhnf61l5ap60b2kbc11sxj2zqbf57gmcjv954wsd6zr01rzcg"
+   "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d",
+   "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6"
+  },
+  "stable": {
+   "version": [
+    0,
+    4
+   ],
+   "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d",
+   "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6"
   }
  },
  {
@@ -118175,14 +118180,25 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20220505,
-    1403
+    20220509,
+    802
+   ],
+   "deps": [
+    "zk"
+   ],
+   "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d",
+   "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6"
+  },
+  "stable": {
+   "version": [
+    0,
+    4
    ],
    "deps": [
     "zk"
    ],
-   "commit": "d6d7713cfac073940dcd96b55c18830a64d4ccca",
-   "sha256": "09vnhnf61l5ap60b2kbc11sxj2zqbf57gmcjv954wsd6zr01rzcg"
+   "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d",
+   "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6"
   }
  },
  {
@@ -118208,14 +118224,14 @@
   "repo": "nnicandro/emacs-zmq",
   "unstable": {
    "version": [
-    20210613,
-    343
+    20220510,
+    1820
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "38dc6c4119aee57666caf8f97c8a3d7f678823e0",
-   "sha256": "0j7szww8fi2pyvln1bppyq8nly0vkbncz63kzqhi1zx7dfz127ry"
+   "commit": "af5299d80715b1083a18145e9c84ef9563020676",
+   "sha256": "1jn1jkkl0pg2psncrf0rx9csp95pg9wm1pcmy1cb3kbqla9x27p4"
   },
   "stable": {
    "version": [

From 72e2e5843228a28e0a1835cd5dabfc4561567c7d Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Thu, 12 May 2022 14:48:55 +0200
Subject: [PATCH 38/53] dashpay: remove

- unmaintained in nixpkgs
- outdated in nixpkgs & bump not trivial
- build broken
---
 .../blockchains/dashpay/default.nix           | 44 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/dashpay/default.nix

diff --git a/pkgs/applications/blockchains/dashpay/default.nix b/pkgs/applications/blockchains/dashpay/default.nix
deleted file mode 100644
index 0411f8cf32b..00000000000
--- a/pkgs/applications/blockchains/dashpay/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook
-, openssl, db48, boost, zlib, miniupnpc
-, qrencode, glib, protobuf, yasm, libevent
-, util-linux
-, enable_Upnp ? false
-, disable_Wallet ? false
-, disable_Daemon ? false }:
-
-with lib;
-stdenv.mkDerivation rec {
-  pname = "dashpay";
-  version = "0.12.2.3";
-
-  src = fetchFromGitHub {
-    owner = "dashpay";
-    repo= "dash";
-    rev = "v${version}";
-    sha256 = "sha256-DMoiUX8Q0HcBHA6ZIN58uPsTnHjEJMi8eGG2DW8z17Q=";
-  };
-
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
-  buildInputs = [ glib openssl db48 yasm boost zlib libevent
-                  miniupnpc protobuf qrencode util-linux ];
-
-
-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
-                    ++ optional enable_Upnp "--enable-upnp-default"
-                    ++ optional disable_Wallet "--disable-wallet"
-                    ++ optional disable_Daemon "--disable-daemon"
-                    ;
-
-  meta = {
-    description = "A decentralized key/value registration and transfer system";
-    longDescription = ''
-      Dash (DASH) is an open sourced, privacy-centric digital currency
-      with instant transactions.  It allows you to keep your finances
-      private as you make transactions without waits, similar to cash.
-    '';
-    homepage = "https://www.dash.org";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.unix;
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d213a4b2a1f..d4da00d579a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -285,6 +285,7 @@ mapAliases ({
   dart_old = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15
   dart_stable = dart; # Added 2020-01-15
   dat = nodePackages.dat;
+  dashpay = throw "'dashpay' has been removed because it was unmaintained"; # Added 2022-05-12
   dbus_daemon = throw "'dbus_daemon' has been renamed to/replaced by 'dbus.daemon'"; # Converted to throw 2022-02-22
   dbus_glib = throw "'dbus_glib' has been renamed to/replaced by 'dbus-glib'"; # Converted to throw 2022-02-22
   dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1314ab45401..772cadec337 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31082,8 +31082,6 @@ with pkgs;
 
   cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
 
-  dashpay = callPackage ../applications/blockchains/dashpay { };
-
   dcrd = callPackage ../applications/blockchains/dcrd { };
   dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
 

From f9f5c9c8d49d879590aeddcdcb3089c932fc3020 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 12 May 2022 18:19:22 +0000
Subject: [PATCH 39/53] spotdl: 3.9.5 -> 3.9.6

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

diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix
index 7753818fb1f..32dc47f5318 100644
--- a/pkgs/tools/audio/spotdl/default.nix
+++ b/pkgs/tools/audio/spotdl/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "spotdl";
-  version = "3.9.5";
+  version = "3.9.6";
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
-    rev = "v${version}";
-    hash = "sha256-Zdm+OVcFgOO8kbJDNQSVDLnIHzhvm9EPbcG95mNrnTk=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-JoeNVMuEslz7A7G4ZvikimZrG75YrH5Mx3Oamtfy4cM=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 003c3b6444fa2c797d8743992e82f23278a0295e Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 13 May 2022 18:14:24 +1200
Subject: [PATCH 40/53] emacs.pkgs.plz: Use plz from elpa

---
 .../emacs/elisp-packages/elpa-packages.nix    | 15 +++++++++
 .../emacs/elisp-packages/manual-packages.nix  |  2 --
 .../emacs/elisp-packages/plz/default.nix      | 31 -------------------
 3 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/plz/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index fd8d17da60e..2bfc2f18e97 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -104,6 +104,21 @@ self: let
           maintainers = [ lib.maintainers.sternenseemann ];
         };
       });
+
+      plz = super.plz.overrideAttrs (
+        old: {
+          dontUnpack = false;
+          postPatch = old.postPatch or "" + ''
+            substituteInPlace ./plz.el \
+              --replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"'
+          '';
+          preInstall = ''
+            tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]*
+            src="$pname-$version.tar"
+          '';
+        }
+      );
+
     };
 
     elpaPackages = super // overrides;
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 4dc546c6263..80fde736ac4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -194,8 +194,6 @@
 
   control-lock = callPackage ./control-lock { };
 
-  plz = callPackage ./plz { };
-
   pod-mode = callPackage ./pod-mode { };
 
   power-mode = callPackage ./power-mode { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix b/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix
deleted file mode 100644
index 29f71d7f158..00000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ trivialBuild, lib, fetchFromGitHub, curl }:
-
-trivialBuild {
-  pname = "plz";
-  version = "0.pre+date=2021-08-22";
-
-  src = fetchFromGitHub {
-    owner = "alphapapa";
-    repo = "plz.el";
-    rev = "7e456638a651bab3a814e3ea81742dd917509cbb";
-    hash = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY=";
-  };
-
-  postPatch = ''
-    substituteInPlace ./plz.el \
-      --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"'
-  '';
-
-  meta = {
-    description = "An HTTP library for Emacs";
-    longDescription = ''
-      plz is an HTTP library for Emacs. It uses curl as a backend, which avoids
-      some of the issues with using Emacs’s built-in url library. It supports
-      both synchronous and asynchronous requests. Its API is intended to be
-      simple, natural, and expressive. Its code is intended to be simple and
-      well-organized. Every feature is tested against httpbin.org.
-    '';
-    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.all;
-  };
-}

From d47523375d3a6c3f8d29d27b7bbaab7bba2f6c34 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 13 May 2022 08:48:35 +0200
Subject: [PATCH 41/53] python310Packages.jwcrypto: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix
index 174ebc3908a..2904380775f 100644
--- a/pkgs/development/python-modules/jwcrypto/default.nix
+++ b/pkgs/development/python-modules/jwcrypto/default.nix
@@ -3,15 +3,19 @@
 , fetchPypi
 , cryptography
 , deprecated
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "jwcrypto";
   version = "1.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DWRhuhP3wnHYusUBjuYN28rl/zlAP6+kI3X1fQjjmLs=";
+    hash = "sha256-DWRhuhP3wnHYusUBjuYN28rl/zlAP6+kI3X1fQjjmLs=";
   };
 
   propagatedBuildInputs = [
@@ -19,10 +23,14 @@ buildPythonPackage rec {
     deprecated
   ];
 
+  pythonImportsCheck = [
+    "jwcrypto"
+  ];
+
   meta = with lib; {
     description = "Implementation of JOSE Web standards";
     homepage = "https://github.com/latchset/jwcrypto";
     license = licenses.lgpl3Plus;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From b92f37a40e7ff7f8660a4bfe9c71670dbe9c193e Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Thu, 12 May 2022 23:41:56 -0700
Subject: [PATCH 42/53] yubikey-touch-detector: Linux only

This tool is Linux only[*] but got merged with `platform.unix` meta at
init.

[*] https://github.com/maximbaz/yubikey-touch-detector/blob/0f30ac2da53f8ae1c70f38aae348a81d599eed28/README.md?plain=1#L13

ZHF: #172160
---
 pkgs/tools/security/yubikey-touch-detector/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix
index 476ea3dbfb5..5ea91c3012f 100644
--- a/pkgs/tools/security/yubikey-touch-detector/default.nix
+++ b/pkgs/tools/security/yubikey-touch-detector/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
     homepage = "https://github.com/maximbaz/yubikey-touch-detector";
     maintainers = with maintainers; [ sumnerevans ];
     license = licenses.isc;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 54c84396c8de1cf4af437d1d4755f1c1eade88db Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 13 May 2022 19:43:32 +1200
Subject: [PATCH 43/53] sqlc: init at 1.13.0

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

diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix
new file mode 100644
index 00000000000..d63a220dff1
--- /dev/null
+++ b/pkgs/development/tools/database/sqlc/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+let
+  version = "1.13.0";
+in
+buildGoModule {
+  pname = "sqlc";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "kyleconroy";
+    repo = "sqlc";
+    rev    = "v${version}";
+    sha256 = "sha256-HPCt47tctVV8Oz9/7AoVMezIAv6wEsaB7B4rgo9/fNU=";
+  };
+
+  proxyVendor = true;
+  vendorSha256 = "sha256-zZ0IrtfQvczoB7th9ZCUlYOtyZr3Y3yF0pKzRCqmCjo=";
+
+  subPackages = [ "cmd/sqlc" ];
+
+  meta = let
+    inherit (lib) licenses platforms maintainers;
+  in {
+    description = " Generate type-safe code from SQL";
+    homepage = "https://sqlc.dev/";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.adisbladis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e3e5abeab1..4d20eabb4d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16218,6 +16218,8 @@ with pkgs;
 
   spruce = callPackage ../development/tools/misc/spruce {};
 
+  sqlc = callPackage ../development/tools/database/sqlc { };
+
   sqlcheck = callPackage ../development/tools/database/sqlcheck { };
 
   sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };

From 710266396ab95ed4dfb66df4cebe8d6603cc5999 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 13 May 2022 10:10:37 +0200
Subject: [PATCH 44/53] fspy: fix the build

Issue seems to have been introduced by 6ea33082ac1092db1e870c0fbf8be7108161ad29.

ZHF: #172160
---
 pkgs/applications/misc/fspy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/applications/misc/fspy/default.nix
index f3a5094831e..d2384446ed3 100644
--- a/pkgs/applications/misc/fspy/default.nix
+++ b/pkgs/applications/misc/fspy/default.nix
@@ -12,7 +12,7 @@ in appimageTools.wrapType2 {
   inherit pname version src;
 
   extraInstallCommands = ''
-    mv $out/bin/${pname}-v${version} $out/bin/${pname}
+    mv $out/bin/${pname}-${version} $out/bin/${pname}
   '';
 
   meta = with lib; {

From cfd4a8fe092233871539a7e9b10755088f4345d6 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Fri, 13 May 2022 09:13:24 +1200
Subject: [PATCH 45/53] header-file-mode: unstable-2022-04-19 ->
 unstable-2022-05-13

Update to version with a fix to make the package work with Emacs 28.
---
 .../emacs/elisp-packages/header-file-mode/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix
index df001ea8ff7..139bddffa87 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix
@@ -5,13 +5,13 @@
 
 trivialBuild {
   pname = "header-file-mode";
-  version = "unstable-2022-04-19";
+  version = "unstable-2022-05-13";
 
   src = fetchFromGitHub {
-    owner = "0x4b";
+    owner = "aidalgol";
     repo = "header-file-mode";
-    rev = "fdf1930730e1b0c3f82490099a1325805491eff5";
-    sha256 = "sha256-FJgRI6RLQk9osh7d+YRfrV5CoGCDx2cZvsjAWlm969c=";
+    rev = "bcfd19a2c70030ebf5fa68e87aca4b3db8fad13e";
+    sha256 = "sha256-XMXOU+vWJ/0e0ny4Dz3DxWpdEfSNXGzm03sBke32Dwc=";
   };
 
   postUnpack = ''

From 2802e8f05cef9641921aceb5f058a4084896ae48 Mon Sep 17 00:00:00 2001
From: Max Hausch <max.hausch@helsinki-systems.de>
Date: Fri, 13 May 2022 10:27:51 +0200
Subject: [PATCH 46/53] nixos/hedgedoc: Set StateDirectory to workDir and
 uploadsPath

This is needed to make uploading files possible in the hedgedoc ui.
---
 nixos/modules/services/web-apps/hedgedoc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix
index 9eeabb9d566..6a46ffbd17d 100644
--- a/nixos/modules/services/web-apps/hedgedoc.nix
+++ b/nixos/modules/services/web-apps/hedgedoc.nix
@@ -1023,6 +1023,7 @@ in
       '';
       serviceConfig = {
         WorkingDirectory = cfg.workDir;
+        StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ];
         ExecStart = "${cfg.package}/bin/hedgedoc";
         EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
         Environment = [

From ba114515f67a97a7a168bcd6f51b5cd84e6aa9ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 13 May 2022 11:06:30 +0200
Subject: [PATCH 47/53] cliam: init at 1.0.0

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

diff --git a/pkgs/tools/security/cliam/default.nix b/pkgs/tools/security/cliam/default.nix
new file mode 100644
index 00000000000..7b7ee342a12
--- /dev/null
+++ b/pkgs/tools/security/cliam/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
+
+buildGoModule rec {
+  pname = "cliam";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "securisec";
+    repo = pname;
+    rev = version;
+    hash = "sha256-bq7u6pknokyY4WwO1qMYPuY86UZlDgeYEa1AJpk8d+4=";
+  };
+
+  vendorSha256 = "sha256-aGBA97EvIUv9myqcrtltiVxh1/0VtrQy2j9GU6r197g=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/securisec/cliam/cli/version.Version=${version}"
+  ];
+
+  postBuild = ''
+    # should be called cliam
+    mv $GOPATH/bin/{cli,cliam}
+  '';
+
+  postInstall = ''
+    installShellCompletion --cmd cliam \
+      --bash <($out/bin/cliam completion bash) \
+      --fish <($out/bin/cliam completion fish) \
+      --zsh <($out/bin/cliam completion zsh)
+  '';
+
+  meta = with lib; {
+    description = "Cloud agnostic IAM permissions enumerator";
+    homepage = "https://github.com/securisec/cliam";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2ec4e7668d..59cc6fe3a6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2964,6 +2964,8 @@ with pkgs;
 
   cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
 
+  cliam = callPackage ../tools/security/cliam { };
+
   clickclack = callPackage ../tools/misc/clickclack { };
 
   clickgen = with python3Packages; toPythonApplication clickgen;

From 02e15da6921bd7ca099d4518ca8bc1f403a6ef3b Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Fri, 13 May 2022 09:11:55 +0000
Subject: [PATCH 48/53] explotidb: 2022-04-27 -> 2022-05-13

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

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 2c76d28bae2..5fc46e66629 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2022-04-27";
+  version = "2022-05-13";
 
   src = fetchFromGitHub {
     owner = "offensive-security";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-GYAIbE6Vrq6gBnCkeOSvo6gSJqPOhDh2f8n1b6B/x30=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-hSsVgH6iyfTrHwu/fNc00zhheys8mYYmuDAKJqSWGqo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bcdc4a4f00bf7ba61b5a384c3971639f4cadd123 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 13 May 2022 11:22:13 +0200
Subject: [PATCH 49/53] cadaver: add missing openssl dep

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

diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix
index 7ded22f0103..e8c57e529cf 100644
--- a/pkgs/tools/networking/cadaver/default.nix
+++ b/pkgs/tools/networking/cadaver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
+{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "cadaver";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-ssl" "--with-readline" ];
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ neon readline zlib ];
+  buildInputs = [ neon readline zlib openssl ];
 
   meta = with lib; {
     description = "A command-line WebDAV client";

From 3ea36f0f74b2e45221140b98212b5d26ceb6d936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 13 May 2022 11:42:34 +0200
Subject: [PATCH 50/53] metrics job: schedule on any machine, for now

For non-time metrics it doesn't matter,
and those seem more important anyway.
So better this than nothing, for now.
---
 pkgs/top-level/metrics.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix
index d413b881eaa..6caec7327e5 100644
--- a/pkgs/top-level/metrics.nix
+++ b/pkgs/top-level/metrics.nix
@@ -4,7 +4,8 @@ with pkgs;
 
 runCommand "nixpkgs-metrics"
   { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ];
-    requiredSystemFeatures = [ "benchmark" ]; # dedicated `t2a` machine, by @vcunat
+    # see https://github.com/NixOS/nixpkgs/issues/52436
+    #requiredSystemFeatures = [ "benchmark" ]; # dedicated `t2a` machine, by @vcunat
   }
   ''
     export NIX_STORE_DIR=$TMPDIR/store

From f2f5d1266881c0e415fa5a88016555efb08c9c91 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 13 May 2022 21:45:05 +1200
Subject: [PATCH 51/53] poetry2nix: 1.28.0 -> 1.29.0

---
 .../tools/poetry2nix/poetry2nix/default.nix   |   2 +-
 .../poetry2nix/poetry2nix/hooks/default.nix   |  66 +++----
 .../hooks/pyproject-without-special-deps.py   |  20 +-
 .../hooks/remove-special-dependencies.sh      |  17 +-
 .../poetry2nix/overrides/build-systems.json   |  63 ++++++
 .../poetry2nix/overrides/default.nix          | 181 +++++++-----------
 .../poetry2nix/overrides/shapely-rewrite.py   |  46 +++++
 .../tools/poetry2nix/poetry2nix/pep425.nix    |   4 +-
 8 files changed, 236 insertions(+), 163 deletions(-)
 create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index f42ee6b79cc..45a7e6619d1 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
 }:
 let
   # Poetry2nix version
-  version = "1.28.0";
+  version = "1.29.0";
 
   inherit (poetryLib) isCompatible readTOML moduleName;
 
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
index 5d562017b8f..f6d1ea5418f 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -3,48 +3,46 @@
 , makeSetupHook
 , wheel
 , pip
+, pkgs
 }:
 let
   callPackage = python.pythonForBuild.pkgs.callPackage;
   pythonInterpreter = python.pythonForBuild.interpreter;
   pythonSitePackages = python.sitePackages;
+
+  nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]);
+  makeRemoveSpecialDependenciesHook = { fields, kind }:
+    nonOverlayedPython.pkgs.callPackage
+      (
+        {}:
+        makeSetupHook
+          {
+            name = "remove-path-dependencies.sh";
+            deps = [ ];
+            substitutions = {
+              # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion
+              # because building of tomlkit and its dependencies also use these hooks.
+              pythonPath = nonOverlayedPython.pkgs.makePythonPath [ nonOverlayedPython ];
+              pythonInterpreter = nonOverlayedPython.interpreter;
+              pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
+              fields = fields;
+              kind = kind;
+            };
+          } ./remove-special-dependencies.sh
+      )
+      { };
 in
 {
+  removePathDependenciesHook = makeRemoveSpecialDependenciesHook {
+    fields = [ "path" ];
+    kind = "path";
+  };
 
-  removePathDependenciesHook = callPackage
-    (
-      {}:
-      makeSetupHook
-        {
-          name = "remove-path-dependencies.sh";
-          deps = [ ];
-          substitutions = {
-            inherit pythonInterpreter;
-            yj = "${buildPackages.yj}/bin/yj";
-            pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
-            fields = [ "path" ];
-            kind = "path";
-          };
-        } ./remove-special-dependencies.sh
-    )
-    { };
+  removeGitDependenciesHook = makeRemoveSpecialDependenciesHook {
+    fields = [ "git" "branch" "rev" "tag" ];
+    kind = "git";
+  };
 
-  removeGitDependenciesHook = callPackage
-    ({}:
-      makeSetupHook
-        {
-          name = "remove-git-dependencies.sh";
-          deps = [ ];
-          substitutions = {
-            inherit pythonInterpreter;
-            yj = "${buildPackages.yj}/bin/yj";
-            pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
-            fields = [ "git" "branch" "rev" "tag" ];
-            kind = "git";
-          };
-        } ./remove-special-dependencies.sh
-    )
-    { };
 
   pipBuildHook = callPackage
     (
@@ -89,6 +87,4 @@ in
         } ./wheel-unpack-hook.sh
     )
     { };
-
-
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
index 9f79f9afab5..b74bfebf640 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
-# Patch out special dependencies (git and path) from a pyproject.json file
+# Patch out special dependencies (git and path) from a pyproject.toml file
 
 import argparse
-import json
 import sys
 
+import tomlkit
+
 
 def main(input, output, fields_to_remove):
-    data = json.load(input)
+    data = tomlkit.loads(input.read())
 
     try:
         deps = data["tool"]["poetry"]["dependencies"]
@@ -22,12 +23,7 @@ def main(input, output, fields_to_remove):
                 if any_removed:
                     dep["version"] = "*"
 
-    # Set ensure_ascii to False because TOML is valid UTF-8 so text that can't
-    # be represented in ASCII is perfectly legitimate
-    # HACK: Setting ensure_asscii to False breaks Python2 for some dependencies (like cachy==0.3.0)
-    json.dump(
-        data, output, separators=(",", ":"), ensure_ascii=sys.version_info.major < 3
-    )
+    output.write(tomlkit.dumps(data))
 
 
 if __name__ == "__main__":
@@ -37,20 +33,20 @@ if __name__ == "__main__":
         "--input",
         type=argparse.FileType("r"),
         default=sys.stdin,
-        help="Location from which to read input JSON",
+        help="Location from which to read input TOML",
     )
     p.add_argument(
         "-o",
         "--output",
         type=argparse.FileType("w"),
         default=sys.stdout,
-        help="Location to write output JSON",
+        help="Location to write output TOML",
     )
     p.add_argument(
         "-f",
         "--fields-to-remove",
         nargs="+",
-        help="The fields to remove from the dependency's JSON",
+        help="The fields to remove from the dependency's TOML",
     )
 
     args = p.parse_args()
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh
index 2d37667d6fd..904efa615b1 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh
@@ -1,18 +1,21 @@
 remove-@kind@-dependencies-hook() {
+    # Tell poetry not to resolve special dependencies. Any version is fine!
+
     if ! test -f pyproject.toml; then
         return
     fi
 
     echo "Removing @kind@ dependencies"
 
-    # Tell poetry not to resolve special dependencies. Any version is fine!
-    @yj@ -tj < pyproject.toml | \
-        @pythonInterpreter@ \
-        @pyprojectPatchScript@ \
-        --fields-to-remove @fields@ > pyproject.json
-    @yj@ -jt < pyproject.json > pyproject.toml
+    # NOTE: We have to reset PYTHONPATH to avoid having propagatedBuildInputs
+    # from the currently building derivation leaking into our unrelated Python
+    # environment.
+    PYTHONPATH=@pythonPath@ \
+    @pythonInterpreter@ \
+    @pyprojectPatchScript@ \
+      --fields-to-remove @fields@ < pyproject.toml > pyproject.formatted.toml
 
-    rm pyproject.json
+    mv pyproject.formatted.toml pyproject.toml
 
     echo "Finished removing @kind@ dependencies"
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
index e4d64b05b99..78e1e87f6bf 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
@@ -50,6 +50,9 @@
   "aiokafka": [
     "cython"
   ],
+  "aiolimiter": [
+    "poetry-core"
+  ],
   "aiomultiprocess": [
     "flit-core"
   ],
@@ -229,6 +232,9 @@
     "flit-core",
     "flitBuildHook"
   ],
+  "copier": [
+    "poetry-core"
+  ],
   "cpyparsing": [
     "cython"
   ],
@@ -239,6 +245,9 @@
     "cython",
     "poetry-core"
   ],
+  "cruft": [
+    "poetry-core"
+  ],
   "cssselect2": [
     "flit",
     "flit-core"
@@ -350,6 +359,9 @@
   "enumatch": [
     "poetry"
   ],
+  "envs": [
+    "poetry-core"
+  ],
   "exceptiongroup": [
     "flit-core",
     "flitBuildHook"
@@ -366,6 +378,9 @@
   "fastavro": [
     "cython"
   ],
+  "fastbencode": [
+    "cython"
+  ],
   "fastdtw": [
     "cython"
   ],
@@ -429,6 +444,9 @@
   "gensim": [
     "cython"
   ],
+  "gidgethub": [
+    "flitBuildHook"
+  ],
   "glances-api": [
     "poetry-core"
   ],
@@ -480,6 +498,9 @@
   "hashids": [
     "flit-core"
   ],
+  "hatch-vcs": [
+    "hatchling"
+  ],
   "hdate": [
     "poetry-core"
   ],
@@ -711,6 +732,9 @@
   "monosat": [
     "cython"
   ],
+  "more-itertools": [
+    "flit-core"
+  ],
   "motioneye-client": [
     "poetry-core"
   ],
@@ -720,6 +744,9 @@
   "msgpack-numpy": [
     "cython"
   ],
+  "msgpack-types": [
+    "poetry"
+  ],
   "msoffcrypto-tool": [
     "poetry-core"
   ],
@@ -735,6 +762,9 @@
   "mypy-boto3-builder": [
     "poetry-core"
   ],
+  "myst-parser": [
+    "flit-core"
+  ],
   "nats-python": [
     "poetry-core"
   ],
@@ -807,6 +837,9 @@
   "openstacksdk": [
     "pbr"
   ],
+  "openstep-plist": [
+    "cython"
+  ],
   "openvino": [
     "cython"
   ],
@@ -889,6 +922,9 @@
   "pixelmatch": [
     "poetry-core"
   ],
+  "pkgconfig": [
+    "poetry-core"
+  ],
   "poetry": [
     "poetry-core"
   ],
@@ -925,6 +961,12 @@
   "prometheus-fastapi-instrumentator": [
     "poetry"
   ],
+  "prospector": [
+    "poetry-core"
+  ],
+  "protoletariat": [
+    "poetry-core"
+  ],
   "ptyprocess": [
     "flit-core"
   ],
@@ -1234,6 +1276,9 @@
   "python-swiftclient": [
     "pbr"
   ],
+  "python-trovo": [
+    "poetry"
+  ],
   "python_openzwave": [
     "cython"
   ],
@@ -1276,6 +1321,9 @@
   "qiskit-terra": [
     "cython"
   ],
+  "qstylizer": [
+    "pbr"
+  ],
   "questionary": [
     "poetry-core"
   ],
@@ -1330,6 +1378,9 @@
   "rich": [
     "poetry-core"
   ],
+  "rio-tiler": [
+    "flit-core"
+  ],
   "ripser": [
     "cython"
   ],
@@ -1367,6 +1418,9 @@
   "sarif-om": [
     "pbr"
   ],
+  "sat-search": [
+    "pytest-runner"
+  ],
   "scikit-bio": [
     "cython"
   ],
@@ -1430,6 +1484,9 @@
   "single-version": [
     "poetry-core"
   ],
+  "skia-pathops": [
+    "cython"
+  ],
   "slowapi": [
     "poetry-core"
   ],
@@ -1602,6 +1659,9 @@
   "toggl-cli": [
     "pbr"
   ],
+  "toml-cli": [
+    "poetry"
+  ],
   "toml-sort": [
     "poetry"
   ],
@@ -1620,6 +1680,9 @@
   "traceback2": [
     "pbr"
   ],
+  "traitlets": [
+    "flit-core"
+  ],
   "transmission-rpc": [
     "poetry-core"
   ],
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
index a04e2d65385..83e5bb339dd 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
@@ -74,6 +74,12 @@ lib.composeManyExtensions [
       inherit (pkgs) buildPackages;
       pyBuildPackages = self.python.pythonForBuild.pkgs;
 
+      selectQt5 = version:
+        let
+          selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version));
+        in
+          pkgs."qt${selector}" or pkgs.qt5;
+
     in
 
     {
@@ -287,6 +293,7 @@ lib.composeManyExtensions [
             "36.0.0" = "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk=";
             "36.0.1" = "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ=";
             "36.0.2" = "1a0ni1a3dbv2dvh6gx2i54z8v5j9m6asqg97kkv7gqb1ivihsbp8";
+            "37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8=";
           }.${version} or null;
           sha256 = getCargoHash super.cryptography.version;
           scrypto =
@@ -517,6 +524,14 @@ lib.composeManyExtensions [
         }
       );
 
+      file-magic = super.file-magic.overridePythonAttrs (
+        old: {
+          postPatch = ''
+            substituteInPlace magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'"
+          '';
+        }
+      );
+
       fiona = super.fiona.overridePythonAttrs (
         old: {
           buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
@@ -735,6 +750,14 @@ lib.composeManyExtensions [
         }
       );
 
+      jinja2-ansible-filters = super.jinja2-ansible-filters.overridePythonAttrs (
+        old: {
+          preBuild = (old.preBuild or "") + ''
+            echo "${old.version}" > VERSION
+          '';
+        }
+      );
+
       jira = super.jira.overridePythonAttrs (
         old: {
           inherit (pkgs.python3Packages.jira) patches;
@@ -1056,6 +1079,18 @@ lib.composeManyExtensions [
 
       mypy = super.mypy.overridePythonAttrs (
         old: {
+          buildInputs = (old.buildInputs or [ ]) ++ [
+            self.types-typed-ast
+          ];
+          # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
+          # version is also the default in the wheels on Pypi that include binaries.
+          # is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
+          MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;
+
+          # when testing reduce optimisation level to drastically reduce build time
+          # (default is 3)
+          # MYPYC_OPT_LEVEL = 1;
+        } // lib.optionalAttrs (old.format != "wheel") {
           # FIXME: Remove patch after upstream has decided the proper solution.
           #        https://github.com/python/mypy/pull/11143
           patches = (old.patches or [ ]) ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.900") && lib.strings.versionOlder old.version "0.940") [
@@ -1069,17 +1104,6 @@ lib.composeManyExtensions [
               sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM=";
             })
           ];
-          buildInputs = (old.buildInputs or [ ]) ++ [
-            self.types-typed-ast
-          ];
-          # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
-          # version is also the default in the wheels on Pypi that include binaries.
-          # is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
-          MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;
-
-          # when testing reduce optimisation level to drastically reduce build time
-          # (default is 3)
-          # MYPYC_OPT_LEVEL = 1;
         }
       );
 
@@ -1566,106 +1590,35 @@ lib.composeManyExtensions [
 
       pyqt5 =
         let
-          drv = super.pyqt5;
-          withConnectivity = drv.passthru.args.withConnectivity or false;
-          withMultimedia = drv.passthru.args.withMultimedia or false;
-          withWebKit = drv.passthru.args.withWebKit or false;
-          withWebSockets = drv.passthru.args.withWebSockets or false;
+          qt5 = selectQt5 super.pyqt5.version;
         in
         super.pyqt5.overridePythonAttrs (
           old: {
-            format = "other";
-
+            dontConfigure = true;
             dontWrapQtApps = true;
-
-            nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
-              pkg-config
-              pkgs.qt5.qmake
-              pkgs.xorg.lndir
-              pkgs.qt5.qtbase
-              pkgs.qt5.qtsvg
-              pkgs.qt5.qtdeclarative
-              pkgs.qt5.qtwebchannel
-              pkgs.qt5.qt3d
-              # self.pyqt5-sip
-              self.sip
-            ]
-              ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
-              ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia
-              ++ lib.optional withWebKit pkgs.qt5.qtwebkit
-              ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
-            ;
-
-            buildInputs = (old.buildInputs or [ ]) ++ [
-              pkgs.dbus
-              pkgs.qt5.qtbase
-              pkgs.qt5.qtsvg
-              pkgs.qt5.qtdeclarative
+            nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
+              self.pyqt-builder
               self.sip
-            ]
-              ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity
-              ++ lib.optional withWebKit pkgs.qt5.qtwebkit
-              ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
-            ;
-
-            # Fix dbus mainloop
-            patches = pkgs.python3.pkgs.pyqt5.patches or [ ];
-
-            configurePhase = ''
-              runHook preConfigure
-
-              export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}
-
-              mkdir -p $out/${self.python.sitePackages}/dbus/mainloop
-              ${self.python.executable} configure.py  -w \
-                --confirm-license \
-                --no-qml-plugin \
-                --bindir=$out/bin \
-                --destdir=$out/${self.python.sitePackages} \
-                --stubsdir=$out/${self.python.sitePackages}/PyQt5 \
-                --sipdir=$out/share/sip/PyQt5 \
-                --designer-plugindir=$out/plugins/designer
-
-              runHook postConfigure
-            '';
-
-            postInstall = ''
-              ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/
-              for i in $out/bin/*; do
-                wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
-              done
-
-              # Let's make it a namespace package
-              cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py
-              from pkgutil import extend_path
-              __path__ = extend_path(__path__, __name__)
-              EOF
-            '';
-
-            installCheckPhase =
-              let
-                modules = [
-                  "PyQt5"
-                  "PyQt5.QtCore"
-                  "PyQt5.QtQml"
-                  "PyQt5.QtWidgets"
-                  "PyQt5.QtGui"
-                ]
-                ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
-                ++ lib.optional withWebKit "PyQt5.QtWebKit"
-                ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
-                ++ lib.optional withConnectivity "PyQt5.QtConnectivity"
-                ;
-                imports = lib.concatMapStrings (module: "import ${module};") modules;
-              in
-              ''
-                echo "Checking whether modules can be imported..."
-                ${self.python.interpreter} -c "${imports}"
-              '';
-
-            doCheck = true;
+              qt5.full
+            ];
+          }
+        );
 
-            enableParallelBuilding = true;
+      pyqt5-qt5 =
+        let
+          qt5 = selectQt5 super.pyqt5-qt5.version;
+        in
+        super.pyqt5-qt5.overridePythonAttrs (
+          old: {
+            dontWrapQtApps = true;
+            propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [
+              qt5.full
+              qt5.qtgamepad # As of 2022-05-13 not a port of qt5.full
+              pkgs.gtk3
+              pkgs.speechd
+              pkgs.postgresql
+              pkgs.unixODBC
+            ];
           }
         );
 
@@ -1681,7 +1634,10 @@ lib.composeManyExtensions [
         old: {
           # Fixes https://github.com/pytest-dev/pytest/issues/7891
           postPatch = old.postPatch or "" + ''
-            sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
+            # sometimes setup.cfg doesn't exist
+            if [ -f setup.cfg ]; then
+              sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
+            fi
           '';
         }
       );
@@ -1758,6 +1714,10 @@ lib.composeManyExtensions [
         }
       );
 
+      python-twitter = super.python-twitter.overridePythonAttrs (old: {
+        buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
+      });
+
       pythran = super.pythran.overridePythonAttrs (old: {
         buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
       });
@@ -1925,7 +1885,14 @@ lib.composeManyExtensions [
       shapely = super.shapely.overridePythonAttrs (
         old: {
           buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];
-          inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
+          inherit (pkgs.python3.pkgs.shapely) GEOS_LIBRARY_PATH;
+
+          GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
+
+          # Fix library paths
+          postPatch = old.postPatch or "" + ''
+            ${self.python.pythonForBuild.interpreter} ${./shapely-rewrite.py} shapely/geos.py
+          '';
         }
       );
 
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py
new file mode 100644
index 00000000000..d3b365459bd
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py
@@ -0,0 +1,46 @@
+"""
+Rewrite libc/library path references to Nix store paths
+Nixpkgs uses a normal patch for this but we need to be less
+sensitive to changes between versions.
+"""
+from textwrap import dedent
+import sys
+import ast
+import os
+
+
+with open(sys.argv[1]) as f:
+    mod = ast.parse(f.read(), "geos.py")
+
+
+class LibTransformer(ast.NodeTransformer):
+    _lgeos_replaced = False
+
+    def visit_If(self, node):
+        if ast.unparse(node).startswith("if sys.platform.startswith('linux')"):
+            return ast.parse(
+                dedent(
+                    """
+            free = CDLL(%s).free
+            free.argtypes = [c_void_p]
+            free.restype = None
+            """
+                )
+                % (lambda x: "'" + x + "'" if x else None)(os.environ.get("GEOS_LIBC"))
+            )
+        return node
+
+    def visit_Assign(self, node):
+        _target = node.targets[0]
+        if (
+            not self._lgeos_replaced
+            and isinstance(_target, ast.Name)
+            and _target.id == "_lgeos"
+        ):
+            self._lgeos_replaced = True
+            return ast.parse("_lgeos = CDLL('%s')" % os.environ["GEOS_LIBRARY_PATH"])
+        return node
+
+
+with open(sys.argv[1], "w") as f:
+    f.write(ast.unparse(LibTransformer().visit(mod)))
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index b16bd5f3ceb..00c33956edd 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -23,7 +23,9 @@ let
     let
       entries' = splitString "-" str;
       # Hack: Remove version "suffixes" like 2.11.4-1
-      entries = builtins.filter (x: builtins.match "[0-9]" x == null) entries';
+      # Some wheels have build tag with more than one digit
+      # like openvino-2022.1.0-7019-cp36-cp36m-manylinux_2_27_x86_64.whl
+      entries = builtins.filter (x: builtins.match "[0-9]*" x == null) entries';
       p = removeSuffix ".whl" (builtins.elemAt entries 4);
     in
     {

From 46a196d39ae0e2ef7844c209fcb7bdd2c3fa4e9c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 13 May 2022 10:40:25 +0200
Subject: [PATCH 52/53] libcutl: fix the build

Moved back to C++14 where dynamic exception specifications are deprecated but still present.

Darwin is marked as broken since another issue seems to be present.

ZHF: #172160
---
 pkgs/development/libraries/libcutl/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index ed6aae0f308..dca7a6148f2 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
     homepage = "https://codesynthesis.com/projects/libcutl/";
     changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}";
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
     maintainers = with maintainers; [ ];
     license = licenses.mit;
   };
@@ -26,4 +27,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ xercesc ];
   enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
 }

From 710dfd7955f210a4527475a854e23d15379248fe Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 13 May 2022 12:57:42 +0200
Subject: [PATCH 53/53] libde265: fix CVE-2022-1253 (#172536)

Closes #172496
---
 pkgs/development/libraries/libde265/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix
index bbbcdc3f054..762fe1765fd 100644
--- a/pkgs/development/libraries/libde265/default.nix
+++ b/pkgs/development/libraries/libde265/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.0.8";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "1dzflqbk248lz5ws0ni5acmf32b3rmnq5gsfaz7691qqjxkl1zml";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2022-1253.patch";
+      url = "https://github.com/strukturag/libde265/commit/8e89fe0e175d2870c39486fdd09250b230ec10b8.patch";
+      sha256 = "sha256-F1BOWFx9oXR2trM22atyD3AJ5x6vVfURQ/PTlYP2Ibg=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   enableParallelBuilding = true;
@@ -22,5 +30,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ gebner ];
   };
-
 }