From ef036bfba51d9f1f0a4f705e8726c7ac90649618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=BChrk?= <andy@yaxi.tech>
Date: Tue, 14 Nov 2023 17:31:58 +0100
Subject: [PATCH 001/319] fakeroot: 1.29 -> 1.32.2

---
 pkgs/tools/system/fakeroot/default.nix | 29 ++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index dd6ab9868aa8..3638ce6052ae 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,31 +1,31 @@
 { lib
 , coreutils
 , stdenv
-, fetchurl
+, fetchFromGitLab
 , fetchpatch
 , getopt
 , libcap
 , gnused
 , nixosTests
 , testers
+, autoreconfHook
+, po4a
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.29";
+  version = "1.32.2";
   pname = "fakeroot";
 
-  src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${finalAttrs.version}.orig.tar.gz";
-    sha256 = "sha256-j7uvt4DJFz46zkoEr7wdkA8zfzIWiDk59cfbNDG+fCA=";
+  src = fetchFromGitLab {
+    owner = "clint";
+    repo = "fakeroot";
+    rev = "upstream/${finalAttrs.version}";
+    domain = "salsa.debian.org";
+    hash = "sha256-j1qSMPNCtAxClqYqWkRNQmtxkitYi7g/9KtQ5XqcX3w=";
   };
 
   patches = lib.optionals stdenv.isLinux [
     ./einval.patch
-    (fetchpatch {
-      name = "also-wrap-stat-library-call.patch";
-      url = "https://sources.debian.org/data/main/f/fakeroot/1.29-1/debian/patches/also-wrap-stat-library-call.patch";
-      sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b";
-    })
 
     # patches needed for musl libc, borrowed from alpine packaging.
     # it is applied regardless of the environment to prevent patchrot
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  nativeBuildInputs = [ autoreconfHook po4a ];
   buildInputs = lib.optional (!stdenv.isDarwin) libcap;
 
   postUnpack = ''
@@ -50,7 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
       -e 's@kill@${coreutils}/bin/kill@g' \
       -e 's@/bin/ls@${coreutils}/bin/ls@g' \
       -e 's@cut@${coreutils}/bin/cut@g' \
-      fakeroot-${finalAttrs.version}/scripts/fakeroot.in
+      source/scripts/fakeroot.in
+  '';
+
+  postConfigure = ''
+    pushd doc
+    po4a -k 0 --variable "srcdir=../doc/" po4a/po4a.cfg
+    popd
   '';
 
   passthru = {

From 054927c2f17fca05149bf8192c5320d77dbb0d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=BChrk?= <andy@yaxi.tech>
Date: Tue, 28 Nov 2023 15:58:31 +0100
Subject: [PATCH 002/319] po4a: Use absolute path to perl

Fixes an issue under Darwin where perl cannot be found
---
 pkgs/development/perl-modules/Po4a/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix
index 38569204f5a8..4f4c08cffdf6 100644
--- a/pkgs/development/perl-modules/Po4a/default.nix
+++ b/pkgs/development/perl-modules/Po4a/default.nix
@@ -57,6 +57,7 @@ buildPerlPackage rec {
     ./Build install
     for f in $out/bin/*; do
       substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl"
+      substituteInPlace $f --replace "exec perl" "exec ${perl}/bin/perl"
     done
   '';
   meta = {

From 25a46651dfcc24c186eb4fad9587b62154891499 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Mar 2024 07:51:30 +0000
Subject: [PATCH 003/319] python311Packages.tensorflow-estimator-bin: 2.11.0 ->
 2.15.0

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

diff --git a/pkgs/development/python-modules/tensorflow-estimator/bin.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix
index c7d8e4d630be..f8b0d4830231 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/bin.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/bin.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "2.11.0";
+  version = "2.15.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    hash = "sha256-6jtkrP/z2aJE8GF4yb3ty90/Eltn0IiNuoIpSY0GRos=";
+    hash = "sha256-rt8h7sf7LckRUPyRoc4SvETbtyJ4oItY55/4fJ4o8VM=";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];

From 7a98f6d3ca84ba3cbee695787352d7d8bf6ae123 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Mar 2024 01:11:32 +0000
Subject: [PATCH 004/319] bubblewrap: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 0e890270a52b..2ec57721e419 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bubblewrap";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bubblewrap";
     rev = "v${version}";
-    hash = "sha256-UiZfp1bX/Eul5x31oBln5P9KMT2oFwawQqDs9udZUxY=";
+    hash = "sha256-dfr6MiBdCHVscrS6XE0pT67q18NxrtqJliVbbQDFl5g=";
   };
 
   postPatch = ''

From 1343c795cb59b273a4893a8ba85ff258ed63702b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Mar 2024 07:32:29 +0000
Subject: [PATCH 005/319] flatbuffers: 23.5.26 -> 24.3.25

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

diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 747a976f4c9e..00bb9cc8d187 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flatbuffers";
-  version = "23.5.26";
+  version = "24.3.25";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
     rev = "v${version}";
-    hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
+    hash = "sha256-uE9CQnhzVgOweYLhWPn2hvzXHyBbFiFVESJ1AEM3BmA=";
   };
 
   nativeBuildInputs = [ cmake python3 ];

From 1c942babfa83fbf3eb5c0f42f115d5e04d1cac1c Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sat, 13 Apr 2024 14:06:44 +0200
Subject: [PATCH 006/319] libmicrohttpd: init at 1.0.1

https://git.gnunet.org/libmicrohttpd.git/tree/NEWS?h=v1.0.1
---
 pkgs/development/libraries/libmicrohttpd/1.0.nix     | 10 ++++++++++
 pkgs/development/libraries/libmicrohttpd/generic.nix | 10 +++-------
 pkgs/top-level/all-packages.nix                      |  4 +++-
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/libmicrohttpd/1.0.nix

diff --git a/pkgs/development/libraries/libmicrohttpd/1.0.nix b/pkgs/development/libraries/libmicrohttpd/1.0.nix
new file mode 100644
index 000000000000..16a4f2ed884e
--- /dev/null
+++ b/pkgs/development/libraries/libmicrohttpd/1.0.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchurl }:
+
+callPackage ./generic.nix (rec {
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
+    hash = "sha256-qJ4J/JtN403eGfT8tPqqHOECmbmQjbETK7+h3keIK5Q=";
+  };
+})
diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix
index 0af066c71238..531b5e5f017a 100644
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -1,10 +1,6 @@
 { lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }:
 
-let
-  meta_ = meta;
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmicrohttpd";
   inherit version src;
 
@@ -34,5 +30,5 @@ stdenv.mkDerivation rec {
 
     maintainers = with maintainers; [ eelco vrthra fpletz ];
     platforms = platforms.unix;
-  } // meta_;
-}
+  } // meta;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2783826e5b9..11018e6fd840 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22793,11 +22793,13 @@ with pkgs;
   inherit
     ({
       libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
+      libmicrohttpd_1_0 = callPackage ../development/libraries/libmicrohttpd/1.0.nix { };
     })
     libmicrohttpd_0_9_77
+    libmicrohttpd_1_0
     ;
 
-  libmicrohttpd = libmicrohttpd_0_9_77;
+  libmicrohttpd = libmicrohttpd_1_0;
 
   libmikmod = callPackage ../development/libraries/libmikmod {
     inherit (darwin.apple_sdk.frameworks) CoreAudio;

From 691ae1799766379bfa1f140280fde697a0790b31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 May 2024 06:41:13 +0000
Subject: [PATCH 007/319] appstream: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index b2b1e40576ea..86cafeac417d 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -36,7 +36,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "appstream";
-  version = "1.0.2";
+  version = "1.0.3";
 
   outputs = [ "out" "dev" "installedTests" ];
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ximion";
     repo = "appstream";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-0NzZku6TQyyaTOAMWZD459RayhsH8cotlOaSKkVY/EQ=";
+    sha256 = "sha256-pniZq+rR9wW86QqfRw4WZiBo1F16aSAb1J2RjI4aqE0=";
   };
 
   patches = [

From aae4c61160304a84b06b477808e40c7b8e20ec93 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 6 May 2024 21:55:39 +0100
Subject: [PATCH 008/319] adns: 1.6.0 -> 1.6.1

While at it added a trivial updater.

Changes: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blob;f=changelog;h=b48004eab7fa54363f93de218f4217a880ba1aec;hb=961a6b281cd7871701519adc001959b7995730b0
---
 pkgs/development/libraries/adns/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix
index 42edfc190c09..60de8957d088 100644
--- a/pkgs/development/libraries/adns/default.nix
+++ b/pkgs/development/libraries/adns/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, fetchurl, gnum4 }:
+{ stdenv, lib, fetchurl, gnum4, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "adns";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     urls = [
       "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
       "mirror://gnu/adns/adns-${version}.tar.gz"
     ];
-    sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv";
+    hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0=";
   };
 
   nativeBuildInputs = [ gnum4 ];
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/githttp/adns.git";
+    rev-prefix = "adns-";
+  };
+
   meta = with lib; {
     homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
     description = "Asynchronous DNS Resolver Library";

From 1cd1651d771e6032b03acbe2603aec6a97fc711f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 May 2024 20:50:44 +0000
Subject: [PATCH 009/319] kdePackages.wayland-protocols: 1.35 -> 1.36

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

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index a260b2b63b92..ca1e84b1c609 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -6,14 +6,14 @@
 
 stdenv.mkDerivation rec {
   pname = "wayland-protocols";
-  version = "1.35";
+  version = "1.36";
 
   # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
-    hash = "sha256-N6JxaigTPcgZNBxWiinSHoy3ITDlwSah/PyfQsI9las=";
+    hash = "sha256-cf1N4F55+aHKVZ+sMMH4Nl+hA0ZCL5/nlfdNd7nvfpI=";
   };
 
   postPatch = lib.optionalString doCheck ''

From 7d9102e75bad58d9b1460bf4dde70cc31acca76d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 16 May 2024 22:05:57 +0100
Subject: [PATCH 010/319] libimagequant: 4.3.0 -> 4.3.1

Changes: https://github.com/ImageOptim/libimagequant/compare/4.3.0...4.3.1
---
 .../libraries/libimagequant/Cargo.lock        | 69 +++++++++----------
 .../libraries/libimagequant/default.nix       |  5 +-
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock
index 8e542f358693..4925fc1a9e31 100644
--- a/pkgs/development/libraries/libimagequant/Cargo.lock
+++ b/pkgs/development/libraries/libimagequant/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -28,15 +28,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
 
 [[package]]
 name = "c_test"
@@ -48,12 +48,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
 
 [[package]]
 name = "cfg-if"
@@ -63,9 +60,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -97,9 +94,9 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "fallible_collections"
@@ -112,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -131,7 +128,7 @@ dependencies = [
 
 [[package]]
 name = "imagequant"
-version = "4.3.0"
+version = "4.3.1"
 dependencies = [
  "arrayvec",
  "lodepng",
@@ -152,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "lodepng"
@@ -171,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -186,27 +183,27 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -233,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -244,9 +241,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -266,18 +263,18 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
index 3473a7aa4e16..fc76620850b0 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -15,16 +15,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "libimagequant";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "libimagequant";
     rev = version;
-    hash = "sha256-/gHe3LQaBWOQImBesKvHK46T42TtRld988wgxbut4i0=";
+    hash = "sha256-dau+oGwcyN7AA1jEBtCgYV/cmrx5Wo3koKXbloYagrw=";
   };
 
   cargoLock = {
+    # created it by running `cargo update` in the source tree.
     lockFile = ./Cargo.lock;
   };
 

From a02f19658522c5da57adb0234328e3e2643fb46c Mon Sep 17 00:00:00 2001
From: mangoiv <contact@mangoiv.com>
Date: Fri, 17 May 2024 12:38:29 +0200
Subject: [PATCH 011/319] tree-sitter: 0.22.5 -> 0.22.6

---
 pkgs/development/tools/parsing/tree-sitter/default.nix |  6 +++---
 .../tree-sitter/grammars/tree-sitter-clojure.json      | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-cpp.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-css.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-dart.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-dockerfile.json   | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-earthfile.json    | 10 +++++-----
 .../grammars/tree-sitter-embedded-template.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-glsl.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-haskell.json      | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-janet-simple.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-javascript.json   | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-jsdoc.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-json.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-json5.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-julia.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-just.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-kotlin.json       | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-norg.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-nu.json   | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-pgn.json  | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-python.json       | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-ql-dbscheme.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-ql.json   | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-query.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-r.json    | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-regex.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-sql.json  | 10 +++++-----
 .../grammars/tree-sitter-supercollider.json            | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-templ.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-tlaplus.json      | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-verilog.json      | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-wing.json | 10 +++++-----
 34 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 14f5e32b505c..eee7e8e5c865 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -27,8 +27,8 @@ let
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
   # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
   # 4) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.22.5";
-  hash = "sha256-f8bdpiPNo5M8aefTmrQ2MQVg7lS0Yq7j312K1slortA=";
+  version = "0.22.6";
+  hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  cargoHash = "sha256-Fk6V/kPKc/GL/q6QsaCUrq+ZG0R+N5FLOpIm77Y+n2A=";
+  cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g=";
 
   buildInputs =
     lib.optionals stdenv.isDarwin [ Security CoreServices ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
index 66ef359104cd..e79396e609fb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-clojure",
-  "rev": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9",
-  "date": "2023-05-05T15:36:48+09:00",
-  "path": "/nix/store/fx50ap0gdspwcpgf0zni4j1pzz29abk5-tree-sitter-clojure",
-  "sha256": "0hcl4svn0q4979mx0nn3hhi27xfxj1lz7g1926lcjx6sv1z4ihmj",
-  "hash": "sha256-ssJIftjadMmoESm882mQ3fUjIoTDWtBrOolgYLcmlEE=",
+  "rev": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e",
+  "date": "2024-05-15T19:51:17+09:00",
+  "path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure",
+  "sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4",
+  "hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 53a829c4a941..c5a2a628c4db 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "72fd00128f1c38319670cbf4bcedbba0dc849d96",
-  "date": "2024-04-14T21:38:58-04:00",
-  "path": "/nix/store/sy0ln7q947bv9k313q4z6kkibl2zgdi1-tree-sitter-cpp",
-  "sha256": "0qaa48gq4n3300apwx1mdcwqnfg59q8bdj88c3ssd45pr1n47s88",
-  "hash": "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE=",
+  "rev": "2369fa991eba294e9238e28280ffcd58132f94bc",
+  "date": "2024-04-30T23:37:25-04:00",
+  "path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp",
+  "sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d",
+  "hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index 224b48ea5284..47cf0bc2a32b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-css",
-  "rev": "02b4ee757654b7d54fe35352fd8e53a8a4385d42",
-  "date": "2024-02-14T18:09:29-05:00",
-  "path": "/nix/store/l2vr6xj78qrqjlpj6lzc0bi8dirqvfkx-tree-sitter-css",
-  "sha256": "0j1kg16sly7xsvvc3kxyy5zaznlbz7x2j2bwwv1r1nki2249ly12",
-  "hash": "sha256-IniaiBBx2pDD5nwJKfr5i9qvfvG+z8H21v14qk14M0g=",
+  "rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af",
+  "date": "2024-05-05T18:14:34-04:00",
+  "path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css",
+  "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp",
+  "hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index f492de75ad54..40f4c4bab4cf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/usernobody14/tree-sitter-dart",
-  "rev": "6da46473ab8accb13da48113f4634e729a71d335",
-  "date": "2024-04-07T18:27:24-06:00",
-  "path": "/nix/store/v04h2p45ngm7llrckpkkbnvj9m5763vm-tree-sitter-dart",
-  "sha256": "1jxz4s0j8pmjxl7cz7s9blzqhr1w5jannxihidqrd6dqxawc6gh1",
-  "hash": "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s=",
+  "rev": "ac0bb849ccd1a923963af47573b5e396736ff582",
+  "date": "2024-04-28T11:52:00-06:00",
+  "path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart",
+  "sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8",
+  "hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
index f089eea14505..951deac2d086 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/camdencheek/tree-sitter-dockerfile",
-  "rev": "d34a0cebd094e830bdd2106a28cb2f1fb22401d8",
-  "date": "2022-01-27T11:20:14-07:00",
-  "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile",
-  "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd",
-  "hash": "sha256-zTpsNj6Urhpv7/B+cxPlRhTJd1t35MouRVLZojthxE0=",
+  "rev": "868e44ce378deb68aac902a9db68ff82d2299dd0",
+  "date": "2024-05-09T10:18:45-04:00",
+  "path": "/nix/store/mcyxjcriszp3av7pjxfqn9igpcxrd0jg-tree-sitter-dockerfile",
+  "sha256": "09iw9mqlpgsi6ak4mxrv16anvmbyap6vf61r2pi2lqdp9h1mp7g0",
+  "hash": "sha256-4J1bA0y3YSriFTkYt81VftVtlQk790qmMlG/S3FNPCY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
index 10a75441a466..0241aff6a8e0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/glehmann/tree-sitter-earthfile",
-  "rev": "9badbe4b107647672f627e7d6bddc8a0b61d1f50",
-  "date": "2024-04-17T16:28:53+02:00",
-  "path": "/nix/store/n7jprqmy1r5xgr0bl5d7rsz4xi10m9rf-tree-sitter-earthfile",
-  "sha256": "0yslldcxpmi2hdgja1ygz3grsaj2jj52xm1dqdwlv296ahx5wqkh",
-  "hash": "sha256-cGJeOlQmiU15wy3ULoqUQiqd3/jPByVfgyLW21mjVHs=",
+  "rev": "450546b6db9a37a178fd87aeda93a287301e9570",
+  "date": "2024-05-16T21:54:01+02:00",
+  "path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile",
+  "sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h",
+  "hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index 2d29f1f4011b..e8722c898174 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "6d791b897ecda59baa0689a85a9906348a2a6414",
-  "date": "2024-02-14T20:15:12-05:00",
-  "path": "/nix/store/fj8gk7h81lgj15x79cbrkfvdw2hmbmyb-tree-sitter-embedded-template",
-  "sha256": "0d4kc2bpbx1bvd0xv37wd87hbi775hq4938qz2n657h036dzg0i3",
-  "hash": "sha256-I4L3mxkAnmKs+BiNRDAs58QFD2r8jN1B2yv0dZdgkzQ=",
+  "rev": "38d5004a797298dc42c85e7706c5ceac46a3f29f",
+  "date": "2024-05-05T21:28:26-04:00",
+  "path": "/nix/store/i2kni0fn6yqgags7l329bbg3n45dc9ww-tree-sitter-embedded-template",
+  "sha256": "178cvdmlvzq2c29n0x8aganqbx3vz6w9m90gwhk63qxa2rxw5wr0",
+  "hash": "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
index eb12bf0a26a1..7faba26b25a2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-glsl",
-  "rev": "e7817c982e0e921c5ee89a1e0283121bb5cc5e01",
-  "date": "2024-04-14T19:48:45+02:00",
-  "path": "/nix/store/fs5zdqn1lilbd6f0g6kgjjl35dli61fv-tree-sitter-glsl",
-  "sha256": "1gxg9d3i7iyzxv0sijllbl57dl7ai7z48f1639xd8ljhwl7yyim6",
-  "hash": "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78=",
+  "rev": "8c9fb41836dc202bbbcf0e2369f256055786dedb",
+  "date": "2024-05-11T23:58:08+02:00",
+  "path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl",
+  "sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9",
+  "hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index f0bb17721691..ed82da289c31 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-haskell",
-  "rev": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be",
-  "date": "2024-03-24T15:47:21+01:00",
-  "path": "/nix/store/ay1m5h51pp7p84hh5mlmxir8fsr68bs5-tree-sitter-haskell",
-  "sha256": "0kwbknxk8f6824bijqqkmlfg04074v31ava8qsf97bqsgs6039vf",
-  "hash": "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08=",
+  "rev": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19",
+  "date": "2024-05-05T18:23:47+02:00",
+  "path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell",
+  "sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6",
+  "hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
index 547cf21ab05d..a68ad7d89d75 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-janet-simple",
-  "rev": "51271e260346878e1a1aa6c506ce6a797b7c25e2",
-  "date": "2023-11-11T12:18:30+09:00",
-  "path": "/nix/store/whms9s60xj63bl0b7m2gqkd7900h5qwy-tree-sitter-janet-simple",
-  "sha256": "018vwy6y1kr1bh5wp399vspc1y4wpvvgh0c6p7541xl196rzywa1",
-  "hash": "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU=",
+  "rev": "25d0687433ed0ed8e320861c2c625711ce1716f9",
+  "date": "2024-05-17T12:45:28+09:00",
+  "path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple",
+  "sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4",
+  "hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 67e30dd121ea..4e5bb91173ff 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "ac10a11e0c8db512f70e6b798260d2516d22454c",
-  "date": "2024-04-07T02:36:56-04:00",
-  "path": "/nix/store/b5fahwmcx0riy3bfaarlggncfgfkhx38-tree-sitter-javascript",
-  "sha256": "1f0k7mk785ijppw1swcrilr5bl2nddi7hifml431y4lsqm7y6kmg",
-  "hash": "sha256-r07jT8WaEh8GodVFeGJrVtBVMo2ZcR34vTIWdGY9E7g=",
+  "rev": "e88537c2703546f3f0887dd3f16898e1749cdba5",
+  "date": "2024-05-10T14:09:58-04:00",
+  "path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript",
+  "sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py",
+  "hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index fbc2c37c8a29..d2dce87abbc4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
-  "rev": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55",
-  "date": "2024-02-14T18:13:00-05:00",
-  "path": "/nix/store/9i7fgay23cjnvjapg95bj07jbliv8bmk-tree-sitter-jsdoc",
-  "sha256": "1xmkkqyb9mc18jh6dlffzw9j560mmc5i6fbic8ki9z0r30b1ravw",
-  "hash": "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y=",
+  "rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14",
+  "date": "2024-05-05T20:47:41-04:00",
+  "path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc",
+  "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii",
+  "hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 3a43b67184e2..785c855a2323 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-json",
-  "rev": "80e623c2165887f9829357acfa9c0a0bab34a3cd",
-  "date": "2024-04-07T15:21:58-04:00",
-  "path": "/nix/store/9cixfhx0x72pvn0ak349cbbzvhzlvhll-tree-sitter-json",
-  "sha256": "0mjphf34k5d0h28wwafwljk486h5mzx30dqdxz23lcmvnh0s79y1",
-  "hash": "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y=",
+  "rev": "94f5c527b2965465956c2000ed6134dd24daf2a7",
+  "date": "2024-05-06T15:10:02-04:00",
+  "path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json",
+  "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp",
+  "hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
index 505875342f49..5565bdfabf8e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/joakker/tree-sitter-json5",
-  "rev": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d",
-  "date": "2023-10-05T17:25:17-03:00",
-  "path": "/nix/store/k0jyqq66qp3nq8nmzr1dhm3pk2vxhg1r-tree-sitter-json5",
-  "sha256": "11j8sjq2b0ibiygmcnxzl5vxa0p9ygngfhzjvjl19jnlnf0h7a6p",
-  "hash": "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY=",
+  "rev": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd",
+  "date": "2024-04-30T19:40:01-04:00",
+  "path": "/nix/store/3ag1lv1h8wg3cvbjbigyqmvqr0jy1i48-tree-sitter-json5",
+  "sha256": "0n33v04d5q79j1qp1l26ygfqywl7vxfam38dap78g6i7ys78581d",
+  "hash": "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index d55e2ca470ee..aa993c30c3a5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-julia",
-  "rev": "0a80d33aca49dd257625ab25ef3a506e2b99a554",
-  "date": "2024-04-14T10:47:45-07:00",
-  "path": "/nix/store/zi4q89960k33nkic7wm19fiq05bhx2bq-tree-sitter-julia",
-  "sha256": "057hg3v4rzzq19swb2mv2zlxp8zd746zxklxc0vw1i1fkr2x34yi",
-  "hash": "sha256-0ZPRRZ4uxMA3YJ3O/g057aPb6Re7isV1Cvj/TPZ48BQ=",
+  "rev": "acd5ca12cc278df7960629c2429a096c7ac4bbea",
+  "date": "2024-04-17T13:39:34-05:00",
+  "path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia",
+  "sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym",
+  "hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 8e480f72a406..2d3d16425630 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/IndianBoy42/tree-sitter-just",
-  "rev": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff",
-  "date": "2024-03-22T16:21:21-05:00",
-  "path": "/nix/store/8p22m5p2clrcc563v2z6pmhnhh03yyvg-tree-sitter-just",
-  "sha256": "0752hfkkqk92g0s68b01wf5d5q2y7aw87wsj8kz2vxkbj0i38x8j",
-  "hash": "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw=",
+  "rev": "fd814fc6c579f68c2a642f5e0268cf69daae92d7",
+  "date": "2024-05-02T02:56:00-04:00",
+  "path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just",
+  "sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a",
+  "hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
index ecd5333bc045..7cf5bab4e707 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/fwcd/tree-sitter-kotlin",
-  "rev": "51e451be6c18e2cc123249f49edf8e26fc50311c",
-  "date": "2024-03-14T00:25:12+01:00",
-  "path": "/nix/store/ab6r0biy5244mbw88zxbskfxi0xs4r6s-tree-sitter-kotlin",
-  "sha256": "0s41qgir95lcc68y2xvy7zzai7mm58mlx6w7xkndpc5jvgkc3akx",
-  "hash": "sha256-farB5tuysNvs7IebTisqtZ6o/j9+d+GRYYyWlOPDgWg=",
+  "rev": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03",
+  "date": "2024-05-08T00:38:43+02:00",
+  "path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin",
+  "sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6",
+  "hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index f9be1d893588..5253f32efcb1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-neorg/tree-sitter-norg",
-  "rev": "ceb44e4cdb58fbeea52301835bdd461817ddb57e",
-  "date": "2024-04-14T13:26:39+02:00",
-  "path": "/nix/store/gmzacfd1sbdbgvc26bnv3cpyl5l3csq9-tree-sitter-norg",
-  "sha256": "1jzk1wxqah5ajgpxmmbhrjk43hhk9vpg1f7v9wnj1xgp7zv4w6mv",
-  "hash": "sha256-uxpO9j/39SAtT/u48O5OE8JBpsxw1drvk6pAhTsP88s=",
+  "rev": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688",
+  "date": "2024-04-19T19:37:12+02:00",
+  "path": "/nix/store/pas31z7l3x16113qa7k7ywb6hbarnwvs-tree-sitter-norg",
+  "sha256": "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd",
+  "hash": "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index 8a5f286af0c6..5f43ea1f7ab9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "b090676f0205f52debb93745b9ad788385583276",
-  "date": "2024-04-14T14:09:50-05:00",
-  "path": "/nix/store/f8pjwwdy175mayqncxicn47lj7gw4vks-tree-sitter-nu",
-  "sha256": "10rmw80xzhpqhjhysfx13pkqzfm4a31wvvmq57wvrcrrrlqb982k",
-  "hash": "sha256-U6C0MM05s7z5KbjuzcNQpLqP5x2hO+2hhPjC3wHiNYM=",
+  "rev": "a58513279e98dc3ff9ed149e3b4310cbb7e11068",
+  "date": "2024-04-20T10:10:30-04:00",
+  "path": "/nix/store/h4jw0skhik308krrqi7rmhw7ls4vp1rs-tree-sitter-nu",
+  "sha256": "00vpw8aai4k7bw57pyjwn6b09lb9rr1n88qc4r4nma86rl63y9ic",
+  "hash": "sha256-LCY/DM0GqWpJJgwjZEPOadEElrFc+nsKX2eSqBTidwM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
index ee5733041b82..433932e93683 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/rolandwalker/tree-sitter-pgn",
-  "rev": "e26ee30850f0cb81541480cf1e2c70385bdb013a",
-  "date": "2021-08-25T17:57:38-04:00",
-  "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn",
-  "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq",
-  "hash": "sha256-+AnCzu0SxwY21nNRuV4eP9BhkDk3fnr1uecOXKUAhrA=",
+  "rev": "c5b2f2346e4148702b1343ec9bcc42b4a9aa88dc",
+  "date": "2024-04-27T16:35:50-04:00",
+  "path": "/nix/store/klrbfqwbmrwpgrghr2jijy0yy4yra3c3-tree-sitter-pgn",
+  "sha256": "1p6vn84f06c38kanv6j7w5pdwxny0gc7vk357s8ykiz0wv6r8ay9",
+  "hash": "sha256-ySuUzebgx+mRPmXMfdgD3nbebuFHmm3VRIMZ4Aiy29w=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 059ce3aed9a6..688de10aa445 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a",
-  "date": "2024-04-05T08:52:41-04:00",
-  "path": "/nix/store/4zxxl74gpdm4y3dcaxxy831c5zay31bw-tree-sitter-python",
-  "sha256": "1kr3rj4wszpb1bz7xjn8v5cmkp6817d1iyficpdafglv7rx89a1g",
-  "hash": "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88=",
+  "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7",
+  "date": "2024-04-30T21:50:21-04:00",
+  "path": "/nix/store/xqc20db4g26sqsj0jflj4z2jm8hfmd97-tree-sitter-python",
+  "sha256": "1dmg11dbrddf55xhly813cb6ykxmyam2kjs7lyfi8k8xms03jx44",
+  "hash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
index 86a69e6f6731..c213aaa449b5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme",
-  "rev": "6b66b9e6e3d36a49ce4def7abee2a286ac9ca289",
-  "date": "2022-08-29T08:49:16+02:00",
-  "path": "/nix/store/k58fls33kiwgbf8vn4488x5l79c9a18x-tree-sitter-ql-dbscheme",
-  "sha256": "1kpkjg97s5j1dx79r3fk0i2bxhpm9sdawgb1drqnjgz4qsshp7f2",
-  "hash": "sha256-wp0LtcbkP2lxbmE9rppO9cK+RATTjZxOb0EWfdKT884=",
+  "rev": "afd8764736bb7ae52b6628618e8b3e7e28224ab7",
+  "date": "2024-05-07T13:58:04+02:00",
+  "path": "/nix/store/696rbv0z6i563jjqbwgdavy6kvpkja94-tree-sitter-ql-dbscheme",
+  "sha256": "1mb87h2gzv3cwswklnnk2s8xmj060j4aj3ccgic7va23n1mm6rbs",
+  "hash": "sha256-emVTa7BDqH1YfIwNqYgEBsjakRbTWjq55mzs/wQ8aNU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index eb790ecf9cd8..6cf9f8045e67 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ql",
-  "rev": "ff04ba61857ba05b80221e71b423b2728dbebe1e",
-  "date": "2024-02-14T19:32:53-05:00",
-  "path": "/nix/store/9s2i55p2nm5lz9lkxs2kkmhiy3zlgx8l-tree-sitter-ql",
-  "sha256": "1wdjy8287823rgl1vibljgf129ll9srxn9n6m1piaj3z46lv5b7x",
-  "hash": "sha256-/ayyqSF/SBVvqMYm27NOlCYR3JN0xR3oy0OggwTysvE=",
+  "rev": "42becd6f8f7bae82c818fa3abb1b6ff34b552310",
+  "date": "2024-05-07T14:00:59+02:00",
+  "path": "/nix/store/dknbdl1hrgp0kicx2wx1wjnhb7bay643-tree-sitter-ql",
+  "sha256": "1gcgs87cas4qd5ppvzjfgzj2ayjnjfxbyg3gl204w8mrvciq2niq",
+  "hash": "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
index b5ce91ba4c02..09390cce1ead 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-treesitter/tree-sitter-query",
-  "rev": "2e31ca2771f6042b0e4e0c41a6290014a9e1face",
-  "date": "2024-03-26T11:42:51+02:00",
-  "path": "/nix/store/d80f3x65zd87i9zpi7z2rh28a5f03n1k-tree-sitter-query",
-  "sha256": "0g8234yicidpjqc1rc7dvpx5ja49g938w451796nnn02chxa204i",
-  "hash": "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0=",
+  "rev": "d25e8d183f319497b8b22a2a1585975b020da722",
+  "date": "2024-05-06T23:21:15+02:00",
+  "path": "/nix/store/bj3dsdmf608vwagc1nwwhs5z90p6swzc-tree-sitter-query",
+  "sha256": "191h311g14aah7wpibpyhpz925506c3l6qyrfra1kd8pjn1nv2vk",
+  "hash": "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index 7ec43650bb3b..c74499796fbc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57",
-  "date": "2023-07-26T18:01:44-07:00",
-  "path": "/nix/store/ydqli8jal8g3nbr78nl8rimb0m5r7b50-tree-sitter-r",
-  "sha256": "0si338c05z3bapxkb7zwk30rza5w0saw0jyk0pljxi32869w8s9m",
-  "hash": "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=",
+  "rev": "391400572538ff9854341a175ed8ab4b1e45f44b",
+  "date": "2024-05-03T14:16:03-04:00",
+  "path": "/nix/store/dkmd92q56snynssaridhzkd7rv8zckq7-tree-sitter-r",
+  "sha256": "05s0n6qvb3jsx7sv4vzsc794vdxinxf7f8d2sbf9qz3vwwm39kr8",
+  "hash": "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index 24fa8e0c9c8f..fee52809beb5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-regex",
-  "rev": "ba22e4e0cb42b2ef066948d0ea030ac509cef733",
-  "date": "2024-02-14T19:05:11-05:00",
-  "path": "/nix/store/9fwryyszxm2fj1pm0l5p641yqiyggcvp-tree-sitter-regex",
-  "sha256": "02nxl4s5vx8nsmhg7cjaf45nl92x8q60b7jhlp29qdqvbgg35gwr",
-  "hash": "sha256-mb8y3lsbN5zEpVCeBQxGXSRqC3FKsvNg1Rb1XTSh3Qo=",
+  "rev": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7",
+  "date": "2024-05-05T20:53:57-04:00",
+  "path": "/nix/store/4vlp0kgq09yp9bnjkrsc82mh0c0mb4qa-tree-sitter-regex",
+  "sha256": "0j9shwv7j8jnkms1f8h9ddg80cj85vp1pivkdcspdifbi69q8l2z",
+  "hash": "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 3861a460d182..12519a98bf82 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b",
-  "date": "2024-04-08T18:09:37-04:00",
-  "path": "/nix/store/mzkmi2d933cn0imzhvfvm43rwzgv624n-tree-sitter-rust",
-  "sha256": "1i1and7lkrcpxkkm3y8p8v1d6wpb6z3b3vrxk9dlw84mwa03y97d",
-  "hash": "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ=",
+  "rev": "9c84af007b0f144954adb26b3f336495cbb320a7",
+  "date": "2024-05-05T19:28:38-04:00",
+  "path": "/nix/store/5mmx41c8spdf25jci02lw3vmq117dksv-tree-sitter-rust",
+  "sha256": "0wjw8wz34c3h624xi0n133pv4ld1gmx4zn60xfkqgv7cmn9f42cv",
+  "hash": "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index b18c4d8c71ef..210646ac4c5e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/derekstride/tree-sitter-sql",
-  "rev": "c85ffb5228dd643d447ad8ebc75884f6c4fc6158",
-  "date": "2023-12-15T15:40:26-05:00",
-  "path": "/nix/store/mj8yhb4hs86y2yqyz4znpdp9x9bbd8bl-tree-sitter-sql",
-  "sha256": "0p6ay475y30wq949hrffl31lj46axkqi8abf71ak54dibx0892l3",
-  "hash": "sha256-g4qEQF+xkTJVOG4pFPHsyhBJw6DOZZhIwhwMXw7xylw=",
+  "rev": "7d591a1a14ce4d5caf81ae64284c2dc185544cb2",
+  "date": "2024-04-20T18:48:13+02:00",
+  "path": "/nix/store/r6sz2sa4az2p2idl3vjv90nr4zghxmxr-tree-sitter-sql",
+  "sha256": "1x4kw4fflizwb472n8sfpigqyc8y57m28mawsf999011flzg2dmp",
+  "hash": "sha256-tzbxPnUhgJSS01xVJOopHjGPX7xOIysOWfxH6hzhk/Q=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
index ec2da6b0fd02..a83d9b23b034 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-  "rev": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095",
-  "date": "2023-05-30T21:04:53+02:00",
-  "path": "/nix/store/fzb78sqxbxcyldz5m7yx6zirxsvxn5cc-tree-sitter-supercollider",
-  "sha256": "0ib8mja321zwbw59i45xa66p39gikn8n1pihhv26hm5xgdkwwr4r",
-  "hash": "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU=",
+  "rev": "affa4389186b6939d89673e1e9d2b28364f5ca6f",
+  "date": "2024-04-30T09:37:18+02:00",
+  "path": "/nix/store/jhngv28bin50xqq7b898mq55s8mzmvr9-tree-sitter-supercollider",
+  "sha256": "02jbkx3679b5z78fdn62yr1ax7lr4mlcrdq0fs378alx8hm9704g",
+  "hash": "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index 9173e9300fb9..6dbe64089625 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "1f9dae9c273136551684cb41461d00e565150e23",
-  "date": "2024-04-14T01:39:30+02:00",
-  "path": "/nix/store/swrbx6wrw3k022j2g7vq625zvjbmaxnr-tree-sitter-templ",
-  "sha256": "0w9kr1awc9f30mvidz4aysqs5wk3v93yam6ybb2d2jmmnv9kx5zj",
-  "hash": "sha256-8pc+07a1StHEWt5U5UfaY/KisfaK/BZ3BcMlxlXIM3E=",
+  "rev": "d631f60287c0904770bc41aa865e249594b52422",
+  "date": "2024-05-09T13:42:17+02:00",
+  "path": "/nix/store/5h839wwxwjmg799bp79kkcav2ld8k0jy-tree-sitter-templ",
+  "sha256": "16di98f9xnqdpzb69p8hrgisfhsz0r9p4pv342z0cvkjv5n4s0xc",
+  "hash": "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index eda4e2a9669c..f50a35e3f2cb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
-  "rev": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba",
-  "date": "2024-04-12T21:02:56-04:00",
-  "path": "/nix/store/p9q0v9h09nf49ji1fnl3s87xsda7skmj-tree-sitter-tlaplus",
-  "sha256": "0vh0kdab362n1cm1nl1klqixshdzjnx5cxynadrmz021x2dx3xl7",
-  "hash": "sha256-h/bRm+hBgF9zU9Z3VrqVv0HdI6YzUBsqC1aYsVSbAG4=",
+  "rev": "ef18145e7f985f592ad41b04004b24a590f58b71",
+  "date": "2024-05-15T18:54:24-04:00",
+  "path": "/nix/store/saczmakjnrwrvn0dad37bfva1m3mvzc5-tree-sitter-tlaplus",
+  "sha256": "0hnylz5mxsvk1q8bbv7ak4r49l2knx75ln58i4isqs7qr0a2vw6b",
+  "hash": "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
index daa765d0c95d..e0c25f231042 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-verilog",
-  "rev": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17",
-  "date": "2024-02-14T20:12:08-05:00",
-  "path": "/nix/store/6jdd5vk6m85h4mir572admz08pcp7yqx-tree-sitter-verilog",
-  "sha256": "0qqk9066wlwjrmac43i1irjfnimbkdxwvx4srnnkjv466sn7si3s",
-  "hash": "sha256-ekR9rDaGbDmtzZr0zXubq0brZI4hDsJUzZJTbgxIE2M=",
+  "rev": "075ebfc84543675f12e79a955f79d717772dcef3",
+  "date": "2024-04-27T13:13:12-04:00",
+  "path": "/nix/store/6wsakwazlb9y44n2pmr6xfx0dn6hr99x-tree-sitter-verilog",
+  "sha256": "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k",
+  "hash": "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index bb79674690e3..0492557e1be0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/winglang/wing",
-  "rev": "f0b6b11709eb2ed56e5ef76a9b6fcc98615683b8",
-  "date": "2024-04-15T06:16:09+00:00",
-  "path": "/nix/store/iz1a2mwxdx9zqgdds0rfy8apq9l36xpb-wing",
-  "sha256": "105q2w5a3mx8pd0k0jhr6p3fprd85jr7fz3ndkj48yb2m8x2r1is",
-  "hash": "sha256-OoYsOqpieUTkbHZ8d7IsqOXrxjUZSjBBu6jXoQoXuIA=",
+  "rev": "d65e4c03e1b992adc76df2c2485562c8f2204462",
+  "date": "2024-05-17T04:19:16+00:00",
+  "path": "/nix/store/3pdf6cy205v9s4bf2y8r45qpvf3j1zq1-wing",
+  "sha256": "0y0w3559980ryhnnbjkxxlr6w11110fxvvqsk2wr0sijy53j07w5",
+  "hash": "sha256-hR8gR/EyapC5mBrv3R0IIQRuMu19ymUt9BmglEoZHHg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

From 31edf2914fc5254b0bfed4bf657fd4938205ffed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 May 2024 08:20:41 +0000
Subject: [PATCH 012/319] libplist: 2.4.0 -> 2.6.0

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

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 8e38347c722e..3bec7f5578c3 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libplist";
-  version = "2.4.0";
+  version = "2.6.0";
 
   outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     owner = "libimobiledevice";
     repo = pname;
     rev = version;
-    hash = "sha256-bH40HSp76w56tlxO5M1INAW4wRR7O27AY4H/CyEcp+Y=";
+    hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80=";
   };
 
   nativeBuildInputs = [

From 5b37d2cf811b6c7af8f4decc33cd1938fd6ac66f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 May 2024 03:02:16 +0000
Subject: [PATCH 013/319] libcap: 2.69 -> 2.70

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

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 3fb3003d77aa..fdeae8dc651c 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -19,11 +19,11 @@ assert usePam -> pam != null;
 
 stdenv.mkDerivation rec {
   pname = "libcap";
-  version = "2.69";
+  version = "2.70";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
-    sha256 = "sha256-8xH489rYRpnQVm0db37JQ6kpiyj3FMrjyTHf1XSS1+s=";
+    sha256 = "sha256-I6bviq2vHj6HX2M7stEWz++JUtunvHxWmxNFjhlSsw8=";
   };
 
   outputs = [ "out" "dev" "lib" "man" "doc" ]

From 7ed5395b6be6db29b0539440b907b42bb5182c76 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 20 May 2024 21:48:04 +0100
Subject: [PATCH 014/319] libedit: 20230828-3.1 -> 20240517-3.1

---
 pkgs/by-name/li/libedit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index aeb79811d6e7..493e9a74a02b 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libedit";
-  version = "20230828-3.1";
+  version = "20240517-3.1";
 
   src = fetchurl {
     url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-TugYK25WkpDn0fRPD3jayHFrNfZWt2Uo9pnGnJiBTa0=";
+    hash = "sha256-OkiQl7tBFUlfO9ha54KFK3CXxVbZUACI10tvo429Ev8=";
   };
 
   outputs = [ "out" "dev" "man" ];

From 6b2acc10bd75bab0fde5ce3dc570e836262081b6 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Wed, 22 May 2024 09:08:35 +0200
Subject: [PATCH 015/319]  openldap: 2.6.7 -> 2.6.8

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index aa04ff683bfd..aa91622264fe 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "openldap";
-  version = "2.6.7";
+  version = "2.6.8";
 
   src = fetchurl {
     url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
-    hash = "sha256-zXdfYlyUTteKPaGKA7A7CO6nPIqryXtBuzNumhCVSTA=";
+    hash = "sha256-SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4=";
   };
 
   # TODO: separate "out" and "bin"

From ca630f6102f6cf946bdbb96ecb3f68fdf4f34fcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 May 2024 16:32:40 +0000
Subject: [PATCH 016/319] gbenchmark: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 7292b3452826..9a759015a020 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gbenchmark";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${version}";
-    sha256 = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=";
+    sha256 = "sha256-O+1ZHaNHSkKz3PlKDyI94LqiLtjyrKxjOIi8Q236/MI=";
   };
 
   nativeBuildInputs = [ cmake ];

From c51d3e9e145d9e00cecd2d7a798418353d312cfc Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 24 May 2024 22:08:25 +0100
Subject: [PATCH 017/319] sqlite, sqlite-analyzer: 3.45.3 -> 3.46.0

Changes: https://www.sqlite.org/releaselog/3_46_0.html
---
 pkgs/development/libraries/sqlite/default.nix | 4 ++--
 pkgs/development/libraries/sqlite/tools.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index fe39cac8a25f..ab79bef67a95 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -15,13 +15,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite${lib.optionalString interactive "-interactive"}";
-  version = "3.45.3";
+  version = "3.46.0";
 
   # nixpkgs-update: no auto update
   # NB! Make sure to update ./tools.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    hash = "sha256-soCcpTEkwZxg9Cv2J3NurgEa/cwgW7SCcKXumjgZFTE=";
+    hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0=";
   };
 
   outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index d988a71e54e8..c330d2f2cd64 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/pkgs/development/libraries/sqlite/tools.nix
@@ -4,12 +4,12 @@ let
   archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
     inherit pname;
-    version = "3.45.3";
+    version = "3.46.0";
 
     # nixpkgs-update: no auto update
     src = assert version == sqlite.version; fetchurl {
       url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip";
-      hash = "sha256-7AyVnkLLXxgEE10FVfjqMr5v8gSOsYG8zTZ8j1PxhdE=";
+      hash = "sha256-BwNiEJvraJn2V5dXG5i4gkyPQ39bKSb4juBo2Y7zaOw=";
     };
 
     nativeBuildInputs = [ unzip ];

From 30971173aba3105b42b9cc7976f1c6c9e018b56c Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 26 Nov 2023 22:18:23 +0300
Subject: [PATCH 018/319] ruby-modules: improve cross-compilation support

---
 .../ruby-modules/bundled-common/default.nix     |  8 ++++++--
 .../ruby-modules/bundled-common/functions.nix   | 17 +++++++++++++++--
 .../bundled-common/gen-bin-stubs.rb             |  1 +
 .../ruby-modules/bundler-env/default.nix        |  9 +++++----
 pkgs/development/ruby-modules/gem/default.nix   | 10 ++++++++++
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index cd2f6f379efc..ad1d354f6e51 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, runCommand, ruby, lib, rsync
+{ stdenv
+, lib
+, buildPackages
+, runCommand
+, ruby
 , defaultGemConfig, buildRubyGem, buildEnv
 , makeBinaryWrapper
 , bundler
@@ -190,7 +194,7 @@ let
       runCommand name' basicEnvArgs ''
         mkdir -p $out
         for i in $paths; do
-          ${rsync}/bin/rsync -a $i/lib $out/
+          ${buildPackages.rsync}/bin/rsync -a $i/lib $out/
         done
         eval "$postBuild"
       ''
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 57a10dadc400..3f9e49fc53be 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -59,8 +59,21 @@ in rec {
     then attrs // gemConfig.${attrs.gemName} attrs
     else attrs);
 
-  genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
-      ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
+  genStubsScript = { lib, runCommand, ruby, confFiles, bundler, groups, binPaths, ... }:
+    let
+      genStubsScript = runCommand "gen-bin-stubs"
+        {
+          strictDeps = true;
+          nativeBuildInputs = [ ruby ];
+        }
+        ''
+          cp ${./gen-bin-stubs.rb} $out
+          chmod +x $out
+          patchShebangs --build $out
+        '';
+    in
+    ''
+      ${genStubsScript} \
         "${ruby}/bin/ruby" \
         "${confFiles}/Gemfile" \
         "$out/${ruby.gemPath}" \
diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
index 822996b7cbf6..d1d4ad954438 100644
--- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
+++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rbconfig'
 require 'rubygems'
 require 'rubygems/specification'
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index faef3be4d911..35fecb70c005 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -1,5 +1,6 @@
 { ruby, lib, callPackage, defaultGemConfig, buildEnv, runCommand
-, bundler, rsync
+, buildPackages
+, bundler
 }@defs:
 
 { name ? null
@@ -21,7 +22,7 @@
 }@args:
 
 let
-  inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
+  inherit (import ../bundled-common/functions.nix { inherit lib ruby gemConfig groups; }) genStubsScript;
 
   basicEnv = (callPackage ../bundled-common { inherit bundler; }) (args // { inherit pname name; mainGemName = pname; });
 
@@ -51,7 +52,7 @@ in
         pathsToLink = [ "/lib" ];
 
         postBuild = genStubsScript {
-          inherit lib ruby bundler groups;
+          inherit lib runCommand ruby bundler groups;
           confFiles = basicEnv.confFiles;
           binPaths = [ basicEnv.gems.${pname} ];
         } + lib.optionalString (postBuild != null) postBuild;
@@ -67,7 +68,7 @@ in
         runCommand basicEnv.name bundlerEnvArgs ''
           mkdir -p $out
           for i in $paths; do
-            ${rsync}/bin/rsync -a $i/lib $out/
+            ${buildPackages.rsync}/bin/rsync -a $i/lib $out/
           done
           eval "$postBuild"
         ''
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 409c2c9d027b..2ddbcffd18de 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -252,6 +252,16 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
     runHook postInstall
   '';
 
+  # For Ruby-generated binstubs, shebang paths are already in Nix store but for
+  # ruby used to build the package. Update them to match the host system. Note
+  # that patchShebangsAuto ignores scripts where shebang line is already in Nix
+  # store.
+  fixupPhase = attrs.fixupPhase or ''
+    runHook preFixup
+    patchShebangs --update --host $out/${ruby.gemPath}/bin
+    runHook postFixup
+  '';
+
   propagatedBuildInputs = gemPath ++ propagatedBuildInputs;
   propagatedUserEnvPkgs = gemPath ++ propagatedUserEnvPkgs;
 

From b93964f5e94c073af003a95481242b6beddfd77e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 May 2024 23:46:36 +0000
Subject: [PATCH 019/319] dhcpcd: 10.0.6 -> 10.0.8

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 158097d7c166..300c236c76b6 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dhcpcd";
-  version = "10.0.6";
+  version = "10.0.8";
 
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "dhcpcd";
     rev = "v${version}";
-    sha256 = "sha256-tNC5XCA8dShaTIff15mQz8v+YK9sZkRNLCX5qnlpxx4=";
+    sha256 = "sha256-kM+mdB7ul9NYHOEAJtp3M57M2MellrCoY/SaPWFLEpQ=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 923627a8432baa6659c4cb7ad71f18d18994caff Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 30 May 2024 06:42:18 +0100
Subject: [PATCH 020/319] umockdev: 0.18.2 -> 0.18.3

Changes: https://github.com/martinpitt/umockdev/releases/tag/0.18.3
---
 pkgs/development/libraries/umockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index b7926eecb4f2..38b36267ef34 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "umockdev";
-  version = "0.18.2";
+  version = "0.18.3";
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1HKV6IA8bWfgdgMcIlgeP470aIAj1I925ed2qM7IkHM=";
+    hash = "sha256-q6lcMjA3yELxYXkxJgIxuFV9EZqiiRy8qLgR/MVZKUo=";
   };
 
   patches = [

From 02828ac32324446552109118f78c35dfb3e8e494 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 31 May 2024 12:09:13 +0100
Subject: [PATCH 021/319] wayland: 1.22.0 -> 1.23.0

---
 .../libraries/wayland/darwin.patch            | 22 +++++++++----------
 .../development/libraries/wayland/default.nix |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/wayland/darwin.patch b/pkgs/development/libraries/wayland/darwin.patch
index 965294dfa5ff..8300307398cf 100644
--- a/pkgs/development/libraries/wayland/darwin.patch
+++ b/pkgs/development/libraries/wayland/darwin.patch
@@ -1,13 +1,13 @@
 diff --git a/meson.build b/meson.build
-index 35c3b95..f27e472 100644
+index 8e28f2a..c8d1dc9 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -16,7 +16,7 @@ config_h.set_quoted('PACKAGE', meson.project_name())
  config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
  
  cc_args = []
--if host_machine.system() != 'freebsd'
-+if host_machine.system() not in ['darwin', 'freebsd']
+-if host_machine.system() not in ['freebsd', 'openbsd']
++if host_machine.system() not in ['darwin', 'freebsd', 'openbsd']
  	cc_args += ['-D_POSIX_C_SOURCE=200809L']
  endif
  add_project_arguments(cc_args, language: 'c')
@@ -24,16 +24,16 @@ index 35c3b95..f27e472 100644
  config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec)
  
  if get_option('libraries')
--	if host_machine.system() == 'freebsd'
-+	if host_machine.system() in ['darwin', 'freebsd']
+-	if host_machine.system() in ['freebsd', 'openbsd']
++	if host_machine.system() in ['darwin', 'freebsd', 'openbsd']
  		# When building for FreeBSD, epoll(7) is provided by a userspace
  		# wrapper around kqueue(2).
  		epoll_dep = dependency('epoll-shim')
 diff --git a/src/event-loop.c b/src/event-loop.c
-index 37cf95d..49a38cb 100644
+index 45222f7..fb3b464 100644
 --- a/src/event-loop.c
 +++ b/src/event-loop.c
-@@ -48,6 +48,13 @@
+@@ -49,6 +49,13 @@
  
  #define TIMER_REMOVED -2
  
@@ -48,22 +48,22 @@ index 37cf95d..49a38cb 100644
  struct wl_event_source_interface;
  struct wl_event_source_timer;
 diff --git a/src/wayland-os.c b/src/wayland-os.c
-index a9066ca..483fe64 100644
+index f00ead4..4dc01d0 100644
 --- a/src/wayland-os.c
 +++ b/src/wayland-os.c
-@@ -69,17 +69,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol)
+@@ -75,17 +75,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol)
  {
  	int fd;
  
 +#ifdef SOCK_CLOEXEC
- 	fd = socket(domain, type | SOCK_CLOEXEC, protocol);
+ 	fd = wl_socket(domain, type | SOCK_CLOEXEC, protocol);
  	if (fd >= 0)
  		return fd;
  	if (errno != EINVAL)
  		return -1;
 +#endif
  
- 	fd = socket(domain, type, protocol);
+ 	fd = wl_socket(domain, type, protocol);
  	return set_cloexec_or_close(fd);
  }
  
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 8bc53de162f7..5a78a5c993ef 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -34,11 +34,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchurl {
     url = with finalAttrs; "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
-    hash = "sha256-FUCvHqaYpHHC2OnSiDMsfg/TYMjx0Sk267fny8JCWEI=";
+    hash = "sha256-BbPhV00+Z2JrWXT4YvNrW0J8fO65Zcs2pObC00LkWrI=";
   };
 
   patches = [

From 9d76da314b9262ae22086f859f4a815e7b33a54d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 31 May 2024 15:46:11 +0100
Subject: [PATCH 022/319] meson: 1.4.0 -> 1.4.1

---
 ...boost-Do-not-add-system-paths-on-nix.patch |  17 +-
 .../007-Allow-building-via-ninja-12.patch     | 190 ------------------
 pkgs/by-name/me/meson/package.nix             |  12 +-
 3 files changed, 13 insertions(+), 206 deletions(-)
 delete mode 100644 pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch

diff --git a/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
index 0a2eda9de9ac..bfc55b3c0ffb 100644
--- a/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
+++ b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
@@ -1,13 +1,18 @@
-diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py
---- meson-0.60.2-old/mesonbuild/dependencies/boost.py	2021-11-02 16:58:07.000000000 -0300
-+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py	2021-12-12 19:21:27.895705897 -0300
-@@ -682,16 +682,7 @@
+diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
+index 11cf0beca..80f950866 100644
+--- a/mesonbuild/dependencies/boost.py
++++ b/mesonbuild/dependencies/boost.py
+@@ -687,20 +687,7 @@ class BoostDependency(SystemDependency):
          else:
-             tmp = []  # type: T.List[Path]
+             tmp: T.List[Path] = []
  
 -            # Add some default system paths
+-            if m.is_darwin():
+-                tmp.extend([
+-                    Path('/opt/homebrew/'),        # for Apple Silicon MacOS
+-                    Path('/usr/local/opt/boost'),  # for Intel Silicon MacOS
+-                ])
 -            tmp += [Path('/opt/local')]
--            tmp += [Path('/usr/local/opt/boost')]
 -            tmp += [Path('/usr/local')]
 -            tmp += [Path('/usr')]
 -
diff --git a/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch b/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch
deleted file mode 100644
index 009d826aab03..000000000000
--- a/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 8e46d3e37f81bf13f3f62a14fb603feb2e37229d Mon Sep 17 00:00:00 2001
-From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
-Date: Fri, 10 May 2024 23:25:58 +0530
-Subject: [PATCH] Fix builds with Ninja 12 and remove a 5 year old workaround.
-
-Co-authored-by: Jussi Pakkanen <jpakkane@gmail.com>
-Co-authored-by: Masum Reza <masumrezarock100@gmail.com>
----
- run_project_tests.py           |  3 +--
- run_tests.py                   | 35 ++++++++++------------------------
- unittests/baseplatformtests.py | 34 +++++++++++++++++++++++++++------
- 3 files changed, 39 insertions(+), 33 deletions(-)
-
-diff --git a/run_project_tests.py b/run_project_tests.py
-index a14741364..222e12f74 100755
---- a/run_project_tests.py
-+++ b/run_project_tests.py
-@@ -45,7 +45,7 @@ from mesonbuild.coredata import backendlist, version as meson_version
- from mesonbuild.modules.python import PythonExternalProgram
- from run_tests import (
-     get_fake_options, run_configure, get_meson_script, get_backend_commands,
--    get_backend_args_for_dir, Backend, ensure_backend_detects_changes,
-+    get_backend_args_for_dir, Backend,
-     guess_backend, handle_meson_skip_test,
- )
- 
-@@ -720,7 +720,6 @@ def _run_test(test: TestDef,
- 
-     # Touch the meson.build file to force a regenerate
-     def force_regenerate() -> None:
--        ensure_backend_detects_changes(backend)
-         os.utime(str(test.path / 'meson.build'))
- 
-     # just test building
-diff --git a/run_tests.py b/run_tests.py
-index 207653219..0c51f3d69 100755
---- a/run_tests.py
-+++ b/run_tests.py
-@@ -39,29 +39,27 @@ from mesonbuild.mesonlib import OptionKey, setup_vsenv
- if T.TYPE_CHECKING:
-     from mesonbuild.coredata import SharedCMDOptions
- 
--NINJA_1_9_OR_NEWER = False
-+NINJA_1_12_OR_NEWER = False
- NINJA_CMD = None
- # If we're on CI, detecting ninja for every subprocess unit test that we run is slow
- # Optimize this by respecting $NINJA and skipping detection, then exporting it on
- # first run.
- try:
--    NINJA_1_9_OR_NEWER = bool(int(os.environ['NINJA_1_9_OR_NEWER']))
-+    NINJA_1_12_OR_NEWER = bool(int(os.environ['NINJA_1_12_OR_NEWER']))
-     NINJA_CMD = [os.environ['NINJA']]
- except (KeyError, ValueError):
--    # Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219
--    # is fixed
--    NINJA_CMD = detect_ninja('1.9')
-+    # Look for 1.12, which removes -w dupbuild=err
-+    NINJA_CMD = detect_ninja('1.12')
-     if NINJA_CMD is not None:
--        NINJA_1_9_OR_NEWER = True
-+        NINJA_1_12_OR_NEWER = True
-     else:
--        mlog.warning('Found ninja <1.9, tests will run slower', once=True)
-         NINJA_CMD = detect_ninja()
- 
- if NINJA_CMD is not None:
--    os.environ['NINJA_1_9_OR_NEWER'] = str(int(NINJA_1_9_OR_NEWER))
-+    os.environ['NINJA_1_12_OR_NEWER'] = str(int(NINJA_1_12_OR_NEWER))
-     os.environ['NINJA'] = NINJA_CMD[0]
- else:
--    raise RuntimeError('Could not find Ninja v1.7 or newer')
-+    raise RuntimeError('Could not find Ninja.')
- 
- # Emulate running meson with -X utf8 by making sure all open() calls have a
- # sane encoding. This should be a python default, but PEP 540 considered it not
-@@ -271,7 +269,9 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
-         test_cmd = cmd + ['-target', 'RUN_TESTS']
-     elif backend is Backend.ninja:
-         global NINJA_CMD
--        cmd = NINJA_CMD + ['-w', 'dupbuild=err', '-d', 'explain']
-+        cmd = NINJA_CMD + ['-d', 'explain']
-+        if not NINJA_1_12_OR_NEWER:
-+            cmd += ['-w', 'dupbuild=err']
-         if debug:
-             cmd += ['-v']
-         clean_cmd = cmd + ['clean']
-@@ -282,21 +282,6 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
-         raise AssertionError(f'Unknown backend: {backend!r}')
-     return cmd, clean_cmd, test_cmd, install_cmd, uninstall_cmd
- 
--def ensure_backend_detects_changes(backend: Backend) -> None:
--    global NINJA_1_9_OR_NEWER
--    if backend is not Backend.ninja:
--        return
--    need_workaround = False
--    # We're using ninja >= 1.9 which has QuLogic's patch for sub-1s resolution
--    # timestamps
--    if not NINJA_1_9_OR_NEWER:
--        mlog.warning('Don\'t have ninja >= 1.9, enabling timestamp resolution workaround', once=True)
--        need_workaround = True
--    # Increase the difference between build.ninja's timestamp and the timestamp
--    # of whatever you changed: https://github.com/ninja-build/ninja/issues/371
--    if need_workaround:
--        time.sleep(1)
--
- def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]:
-     out = StringIO()
-     with mock.patch.object(sys, 'stdout', out), mock.patch.object(sys, 'stderr', out):
-diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py
-index 6125ed933..226b2e11e 100644
---- a/unittests/baseplatformtests.py
-+++ b/unittests/baseplatformtests.py
-@@ -1,6 +1,8 @@
- # SPDX-License-Identifier: Apache-2.0
- # Copyright 2016-2021 The Meson development team
-+# Copyright © 2024 Intel Corporation
- 
-+from __future__ import annotations
- from pathlib import PurePath
- from unittest import mock, TestCase, SkipTest
- import json
-@@ -9,6 +11,7 @@ import os
- import re
- import subprocess
- import sys
-+import shutil
- import tempfile
- import typing as T
- 
-@@ -28,7 +31,7 @@ import mesonbuild.modules.pkgconfig
- 
- 
- from run_tests import (
--    Backend, ensure_backend_detects_changes, get_backend_commands,
-+    Backend, get_backend_commands,
-     get_builddir_target_args, get_meson_script, run_configure_inprocess,
-     run_mtest_inprocess, handle_meson_skip_test,
- )
-@@ -286,11 +289,11 @@ class BasePlatformTests(TestCase):
-         '''
-         return self.build(target=target, override_envvars=override_envvars)
- 
--    def setconf(self, arg, will_build=True):
--        if not isinstance(arg, list):
-+    def setconf(self, arg: T.Sequence[str], will_build: bool = True) -> None:
-+        if isinstance(arg, str):
-             arg = [arg]
--        if will_build:
--            ensure_backend_detects_changes(self.backend)
-+        else:
-+            arg = list(arg)
-         self._run(self.mconf_command + arg + [self.builddir])
- 
-     def getconf(self, optname: str):
-@@ -304,7 +307,6 @@ class BasePlatformTests(TestCase):
-         windows_proof_rmtree(self.builddir)
- 
-     def utime(self, f):
--        ensure_backend_detects_changes(self.backend)
-         os.utime(f)
- 
-     def get_compdb(self):
-@@ -492,3 +494,23 @@ class BasePlatformTests(TestCase):
- 
-     def assertLength(self, val, length):
-         assert len(val) == length, f'{val} is not length {length}'
-+
-+    def copy_srcdir(self, srcdir: str) -> str:
-+        """Copies a source tree and returns that copy.
-+
-+        ensures that the copied tree is deleted after running.
-+
-+        :param srcdir: The locaiton of the source tree to copy
-+        :return: The location of the copy
-+        """
-+        dest = tempfile.mkdtemp()
-+        self.addCleanup(windows_proof_rmtree, dest)
-+
-+        # shutil.copytree expects the destinatin directory to not exist, Once
-+        # python 3.8 is required the `dirs_exist_ok` parameter negates the need
-+        # for this
-+        dest = os.path.join(dest, 'subdir')
-+
-+        shutil.copytree(srcdir, dest)
-+
-+        return dest
-\ No newline at end of file
--- 
-2.44.0
-
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 5598baeb81ef..d7cb78bff0a3 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -18,13 +18,13 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     rev = "refs/tags/${version}";
-    hash = "sha256-hRTmKO2E6SIdvAhO7OJtV8dcsGm39c51H+2ZGEkdcFY=";
+    hash = "sha256-RBE4AUF5fymUA87JEDWtpUFXmVPFzdhZgDI7/kscTx4=";
   };
 
   patches = [
@@ -68,14 +68,6 @@ python3.pkgs.buildPythonApplication rec {
 
     # This edge case is explicitly part of meson but is wrong for nix
     ./007-freebsd-pkgconfig-path.patch
-
-    # Fix cross-compilation of proc-macro (and mesa)
-    # https://github.com/mesonbuild/meson/issues/12973
-    ./0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch
-
-    # Fix compilation of Meson using Ninja 1.12
-    # FIXME: remove in the next point release
-    ./007-Allow-building-via-ninja-12.patch
   ];
 
   buildInputs = lib.optionals (python3.pythonOlder "3.9") [

From 4ea8c252aa80bf84d8cf0239be6d8361dd700e8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jun 2024 01:05:56 +0000
Subject: [PATCH 023/319] libevdev: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 34af29955abb..abd8185eae2a 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libevdev";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Bqd78qxcmTMFiCvBZBAX9b7BWS1tG2R4e61JKrNPLzY=";
+    sha256 = "sha256-PsqGps5VuB1bzpEGN/xFHIu+NzsflpjzdcfxrQ3jrEg=";
   };
 
   nativeBuildInputs = [ python3 ];

From aa8b17baf32467031e2265cf57be77f852d8af1b Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 3 Jun 2024 21:14:44 +0300
Subject: [PATCH 024/319] buildRubyGem: do not patch shebangs in non-existent
 directory

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

diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index 2ddbcffd18de..2e280364cfcc 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -258,7 +258,9 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
   # store.
   fixupPhase = attrs.fixupPhase or ''
     runHook preFixup
-    patchShebangs --update --host $out/${ruby.gemPath}/bin
+    if [[ -d $out/${ruby.gemPath}/bin ]]; then
+      patchShebangs --update --host $out/${ruby.gemPath}/bin
+    fi
     runHook postFixup
   '';
 

From f049304b69147dd74d8a0eb82d3150dafd3eb97e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 5 Jun 2024 22:00:25 +0100
Subject: [PATCH 025/319] ell: 0.65 -> 0.66

Changes: https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.66
---
 pkgs/os-specific/linux/ell/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 1a5e119ef473..c4f91658f448 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchgit
+, fetchpatch
 , autoreconfHook
 , pkg-config
 , dbus
@@ -9,16 +10,27 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.65";
+  version = "0.66";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    hash = "sha256-q0C9KfWHxdmrG7xcbb8zpFL4ro+BJb7BL2tyKdFIhew=";
+    hash = "sha256-FqJbAE2P6rKKUMwcDShCKNDQu4RRifEGrbE7F4gSpm0=";
   };
 
+  patches = [
+    # Without the revert TCP dbus tests fail to bind the port and fail.
+    # Seemingly a known dbus bug: https://gitlab.freedesktop.org/dbus/dbus/-/issues/28
+    (fetchpatch {
+      name = "revert-tcp-tests.patch";
+      url = "https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=7863e06b18b9cce56392b65928e927297108337d";
+      hash = "sha256-8+M1k0hGE64CHmK1T5/zW8+Q76pIjl5SMaYktRqpudg=";
+      revert = true;
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     autoreconfHook

From 6c4c7909de30d2f0e6ec4ca7f322cb27b84741d1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 5 Jun 2024 22:01:46 +0100
Subject: [PATCH 026/319] iwd: 2.17 -> 2.18

Changes: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.18
---
 pkgs/os-specific/linux/iwd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 5c1d153b83fc..174949a7af4d 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    hash = "sha256-o/Q8vUtB4Yiz1x+/6+8LUKUQNtiAmwcdh++/tTUN4mM=";
+    hash = "sha256-icPYxbCkfgv3v/FIVnrwKoHuLh9Sx2fcpQPO3kXJe4A=";
   };
 
   outputs = [ "out" "man" "doc" ]

From bdb5db0942bc37bd2e6423c9cd95a738ad519843 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 Jun 2024 12:35:26 +0200
Subject: [PATCH 027/319] mailcap: 2.1.53 -> 2.1.54

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

diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix
index 06c8047e1cab..e2270d76bbab 100644
--- a/pkgs/data/misc/mailcap/default.nix
+++ b/pkgs/data/misc/mailcap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mailcap";
-  version = "2.1.53";
+  version = "2.1.54";
 
   src = fetchurl {
     url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
-    sha256 = "sha256-Xuou8XswSXe6PsuHr61DGfoEQPgl5Pb7puj6L/64h4U=";
+    hash = "sha256-mkAyIC/A0rCFj0GxZzianP5SrCTsKC5kebkHZTGd4RM=";
   };
 
   installPhase = ''

From f44584d4dedc7f7a83318aa68f3a5a2dd37a0235 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 Jun 2024 16:18:27 +0200
Subject: [PATCH 028/319] mailcap: add update script

---
 pkgs/data/misc/mailcap/default.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix
index e2270d76bbab..b3560ecc505c 100644
--- a/pkgs/data/misc/mailcap/default.nix
+++ b/pkgs/data/misc/mailcap/default.nix
@@ -1,4 +1,15 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchurl
+
+# updater
+, git
+, coreutils
+, gawk
+, gnused
+, writeScript
+, nix-update
+}:
 
 stdenv.mkDerivation rec {
   pname = "mailcap";
@@ -22,6 +33,17 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = writeScript "update-mailcap" ''
+    export PATH=${lib.makeBinPath [ git coreutils gawk gnused nix-update ]}:$PATH
+    VERSION="$(git ls-remote --tags --sort="v:refname" https://pagure.io/mailcap.git | \
+      awk '{ print $2 }' | \
+      grep "refs/tags/r" | \
+      sed -E -e "s,refs/tags/r(.*)$,\1," -e "s/-/./g" | \
+      sort --version-sort --reverse | \
+      head -n1)"
+    exec nix-update --version "$VERSION" "$@"
+  '';
+
   meta = with lib; {
     description = "Helper application and MIME type associations for file types";
     homepage = "https://pagure.io/mailcap";

From aef7273b6ca48d041bad01b16788ae0a69dabb9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Jun 2024 14:26:09 +0000
Subject: [PATCH 029/319] frei0r: 2.3.2 -> 2.3.3

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

diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix
index 1b0a3007710b..3ee49325c3c3 100644
--- a/pkgs/development/libraries/frei0r/default.nix
+++ b/pkgs/development/libraries/frei0r/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "frei0r-plugins";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "frei0r";
     rev = "v${version}";
-    hash = "sha256-shPCCKcmacSB/mqwLU6BPR1p+/9Myg759MMehj9yijI=";
+    hash = "sha256-uKYCJD88TnrJTTnzCCietNt01QPeFW+hhnjcBNKUWsY=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 0626ef812400f2653a56674d293e4749a7dddc8c Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 5 Jun 2024 19:11:38 +0200
Subject: [PATCH 030/319] texinfo: refactor

---
 pkgs/development/tools/misc/texinfo/4.13a.nix | 23 -----
 pkgs/development/tools/misc/texinfo/5.2.nix   |  4 -
 pkgs/development/tools/misc/texinfo/6.5.nix   |  4 -
 pkgs/development/tools/misc/texinfo/6.7.nix   |  4 -
 pkgs/development/tools/misc/texinfo/6.8.nix   |  8 --
 pkgs/development/tools/misc/texinfo/7.0.nix   |  4 -
 .../development/tools/misc/texinfo/common.nix | 60 +++++-------
 .../tools/misc/texinfo/packages.nix           | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 17 ++--
 9 files changed, 128 insertions(+), 89 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/texinfo/4.13a.nix
 delete mode 100644 pkgs/development/tools/misc/texinfo/5.2.nix
 delete mode 100644 pkgs/development/tools/misc/texinfo/6.5.nix
 delete mode 100644 pkgs/development/tools/misc/texinfo/6.7.nix
 delete mode 100644 pkgs/development/tools/misc/texinfo/6.8.nix
 delete mode 100644 pkgs/development/tools/misc/texinfo/7.0.nix
 create mode 100644 pkgs/development/tools/misc/texinfo/packages.nix

diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
deleted file mode 100644
index c6036c069d0a..000000000000
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, texinfo, ncurses, xz, lib }:
-
-stdenv.mkDerivation rec {
-  pname = "texinfo";
-  version = "4.13a";
-
-  src = fetchurl {
-    url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma";
-    sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
-  };
-
-  buildInputs = [ ncurses ];
-  nativeBuildInputs = [ xz ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
-    "-Wno-error=implicit-function-declaration"
-  ]);
-
-  # Disabled because we don't have zdiff in the stdenv bootstrap.
-  #doCheck = true;
-
-  meta = texinfo.meta // { branch = version; };
-}
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
deleted file mode 100644
index d395494984d5..000000000000
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "5.2";
-  sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
-}
diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix
deleted file mode 100644
index 34596f306581..000000000000
--- a/pkgs/development/tools/misc/texinfo/6.5.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "6.5";
-  sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
-}
diff --git a/pkgs/development/tools/misc/texinfo/6.7.nix b/pkgs/development/tools/misc/texinfo/6.7.nix
deleted file mode 100644
index 7915d6e3c6be..000000000000
--- a/pkgs/development/tools/misc/texinfo/6.7.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "6.7";
-  sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q";
-}
diff --git a/pkgs/development/tools/misc/texinfo/6.8.nix b/pkgs/development/tools/misc/texinfo/6.8.nix
deleted file mode 100644
index 992f695bc92c..000000000000
--- a/pkgs/development/tools/misc/texinfo/6.8.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-import ./common.nix {
-  version = "6.8";
-  sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf";
-  patches = [
-    # glibc 2.34 compat
-    ./fix-glibc-2.34.patch
-  ];
-}
diff --git a/pkgs/development/tools/misc/texinfo/7.0.nix b/pkgs/development/tools/misc/texinfo/7.0.nix
deleted file mode 100644
index 01788f40d78d..000000000000
--- a/pkgs/development/tools/misc/texinfo/7.0.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "7.0.3";
-  sha256 = "sha256-dLQg0J1/Uo6E+XqjMPDdaamKYFPnpOAXZ+7RFQOIB78=";
-}
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index f3f2e9389296..45c6e7566c18 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -1,19 +1,31 @@
-{ version, sha256, patches ? [] }:
-
-{ lib, stdenv, buildPackages, fetchurl, perl, libintl, bash
-, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, freebsd, libiconv
+{ lib
+, stdenv
+, buildPackages
+, fetchurl
+, perl
+, libintl
+, bash
+, updateAutotoolsGnuConfigScriptsHook
+, gnulib
+, gawk
+, freebsd
+, libiconv
+, xz
 
 # we are a dependency of gcc, this simplifies bootstraping
 , interactive ? false, ncurses, procps
+, meta
 }:
 
+{ version, hash, patches ? [] }:
+
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
 let
-  inherit (lib) getDev getLib optional optionals optionalString;
+  inherit (lib) getBin getDev getLib optional optionals optionalString versionOlder;
   crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 
@@ -23,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz";
-    inherit sha256;
+    inherit hash;
   };
 
   patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
@@ -34,7 +46,7 @@ stdenv.mkDerivation {
   # This patch is needed for IEEE-standard long doubles on
   # powerpc64; it does not apply cleanly to texinfo 5.x or
   # earlier.  It is merged upstream in texinfo 6.8.
-  + lib.optionalString (version == "6.7") ''
+  + optionalString (version == "6.7") ''
     patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
   '';
 
@@ -58,8 +70,8 @@ stdenv.mkDerivation {
     # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
     # fallbacks.
     # Also prevent the buildPlatform's awk being used in the texindex script
-    ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${gawk}/bin/awk" ]
-    ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
+    ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${getBin gawk}/bin/awk" ]
+    ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];
   installTargets = [ "install" "install-tex" ];
@@ -71,7 +83,7 @@ stdenv.mkDerivation {
     && !stdenv.isDarwin
     && !stdenv.isSunOS; # flaky
 
-  checkFlags = lib.optionals (!stdenv.hostPlatform.isMusl && lib.versionOlder version "7") [
+  checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
     # Test is known to fail on various locales on texinfo-6.8:
     #   https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html
     "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh"
@@ -84,31 +96,9 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
-    description = "GNU documentation system";
-    homepage = "https://www.gnu.org/software/texinfo/";
-    changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ vrthra oxij ];
-    # see comment above in patches section
-    broken = stdenv.hostPlatform.isPower64 && lib.strings.versionOlder version "6.0";
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
+  meta = meta // {
     branch = version;
+    # see comment above in patches section
+    broken = stdenv.hostPlatform.isPower64 && versionOlder version "6.0";
   };
 }
diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix
new file mode 100644
index 000000000000..49f3d4f72bf1
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/packages.nix
@@ -0,0 +1,93 @@
+{ lib
+, stdenv
+, buildPackages
+, callPackage
+, fetchurl
+, perl
+, libintl
+, bash
+, updateAutotoolsGnuConfigScriptsHook
+, gnulib
+, gawk
+, freebsd
+, libiconv
+, xz
+
+# we are a dependency of gcc, this simplifies bootstraping
+, interactive ? false, ncurses, procps
+}:
+
+let
+  meta = {
+    description = "GNU documentation system";
+    homepage = "https://www.gnu.org/software/texinfo/";
+    changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ oxij ];
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+    mainProgram = "texi2any";
+  };
+  buildTexinfo = callPackage ./common.nix {
+    inherit lib stdenv buildPackages updateAutotoolsGnuConfigScriptsHook
+    fetchurl perl xz libintl libiconv bash gnulib gawk freebsd ncurses procps
+    meta interactive;
+  };
+in
+{
+  texinfo413 = stdenv.mkDerivation (finalAttrs: {
+    pname = "texinfo";
+    version = "4.13a";
+
+    src = fetchurl {
+      url = "mirror://gnu/texinfo/texinfo-${finalAttrs.version}.tar.lzma";
+      hash = "sha256-bSiwzq6GbjU2FC/FUuejvJ+EyDAxGcJXMbJHju9kyeU=";
+    };
+
+    buildInputs = [ ncurses ];
+    nativeBuildInputs = [ xz ];
+
+    # Disabled because we don't have zdiff in the stdenv bootstrap.
+    #doCheck = true;
+
+    meta = meta // {
+      branch = finalAttrs.version;
+    };
+  });
+  texinfo5 = buildTexinfo {
+    version = "5.2";
+    hash = "sha256-VHHvaDpkWIp8/vRu8r3T+8vKidhH4QgyYSKT8QXkTto=";
+  };
+  texinfo6_5 = buildTexinfo {
+    version = "6.5";
+    hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I=";
+  };
+  texinfo6_7 = buildTexinfo {
+    version = "6.7";
+    hash = "sha256-mIQDwVQtFa0ERgC5CZl7owebEOAyJMYRiBF/NnawLKo=";
+  };
+  texinfo6 = buildTexinfo {
+    version = "6.8";
+    hash = "sha256-jrdT7Si8oh+PVsGhgDYq7XiSKb1i//WL+DaOm+tZ/sQ=";
+    patches = [ ./fix-glibc-2.34.patch ];
+  };
+  texinfo7 = buildTexinfo {
+    version = "7.0.3";
+    hash = "sha256-dLQg0J1/Uo6E+XqjMPDdaamKYFPnpOAXZ+7RFQOIB78=";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aac84df0d150..7b9065194619 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19699,13 +19699,16 @@ with pkgs;
 
   tesh = callPackage ../tools/text/tesh {};
 
-  texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo4 = texinfo413;
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
-  texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro
-  texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop
-  texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
-  texinfo7 = callPackage ../development/tools/misc/texinfo/7.0.nix { };
+  texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
+  inherit (texinfoPackages)
+    texinfo413
+    texinfo5 # needed for gcc48
+    texinfo6_5 # needed for allegro
+    texinfo6_7 # needed for gpm, iksemel and fwknop
+    texinfo6
+    texinfo7
+    ;
+  texinfo4= texinfo413; # needed for eukleides and singular
   texinfo = texinfo7;
   texinfoInteractive = texinfo.override { interactive = true; };
 

From e6f90729d2a9cef030b48b58fad9180b134d2796 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 5 Jun 2024 19:13:11 +0200
Subject: [PATCH 031/319] texinfo: 7.0.3 -> 7.1

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

diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix
index 49f3d4f72bf1..0895a11043a4 100644
--- a/pkgs/development/tools/misc/texinfo/packages.nix
+++ b/pkgs/development/tools/misc/texinfo/packages.nix
@@ -87,7 +87,7 @@ in
     patches = [ ./fix-glibc-2.34.patch ];
   };
   texinfo7 = buildTexinfo {
-    version = "7.0.3";
-    hash = "sha256-dLQg0J1/Uo6E+XqjMPDdaamKYFPnpOAXZ+7RFQOIB78=";
+    version = "7.1";
+    hash = "sha256-3u7J8Z8VngRv34rSIjGYGAbawzLMNy8cdjUErYKzCVM=";
   };
 }

From 3ddf4322faa28893ea837a11559cd272db7bea35 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 5 Jun 2024 19:31:19 +0200
Subject: [PATCH 032/319] texinfo: Format with nixfmt

---
 .../development/tools/misc/texinfo/common.nix | 106 +++++++++++-------
 .../tools/misc/texinfo/packages.nix           |  57 ++++++----
 2 files changed, 106 insertions(+), 57 deletions(-)

diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 45c6e7566c18..9b5959d40e47 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -1,23 +1,30 @@
-{ lib
-, stdenv
-, buildPackages
-, fetchurl
-, perl
-, libintl
-, bash
-, updateAutotoolsGnuConfigScriptsHook
-, gnulib
-, gawk
-, freebsd
-, libiconv
-, xz
+{
+  lib,
+  stdenv,
+  buildPackages,
+  fetchurl,
+  perl,
+  libintl,
+  bash,
+  updateAutotoolsGnuConfigScriptsHook,
+  gnulib,
+  gawk,
+  freebsd,
+  libiconv,
+  xz,
 
-# we are a dependency of gcc, this simplifies bootstraping
-, interactive ? false, ncurses, procps
-, meta
+  # we are a dependency of gcc, this simplifies bootstraping
+  interactive ? false,
+  ncurses,
+  procps,
+  meta,
 }:
 
-{ version, hash, patches ? [] }:
+{
+  version,
+  hash,
+  patches ? [ ],
+}:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -25,7 +32,15 @@
 # files.
 
 let
-  inherit (lib) getBin getDev getLib optional optionals optionalString versionOlder;
+  inherit (lib)
+    getBin
+    getDev
+    getLib
+    optional
+    optionals
+    optionalString
+    versionOlder
+    ;
   crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 
@@ -40,15 +55,16 @@ stdenv.mkDerivation {
 
   patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
 
-  postPatch = ''
-    patchShebangs tp/maintain
-  ''
-  # This patch is needed for IEEE-standard long doubles on
-  # powerpc64; it does not apply cleanly to texinfo 5.x or
-  # earlier.  It is merged upstream in texinfo 6.8.
-  + optionalString (version == "6.7") ''
-    patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
-  '';
+  postPatch =
+    ''
+      patchShebangs tp/maintain
+    ''
+    # This patch is needed for IEEE-standard long doubles on
+    # powerpc64; it does not apply cleanly to texinfo 5.x or
+    # earlier.  It is merged upstream in texinfo 6.8.
+    + optionalString (version == "6.7") ''
+      patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
+    '';
 
   # ncurses is required to build `makedoc'
   # this feature is introduced by the ./cross-tools-flags.patch
@@ -59,29 +75,43 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   # A native compiler is needed to build tools needed at build time
-  depsBuildBuild = [ buildPackages.stdenv.cc perl ];
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+    perl
+  ];
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
-  buildInputs = [ bash libintl ]
-    ++ optionals stdenv.isSunOS [ libiconv gawk ]
+  buildInputs =
+    [
+      bash
+      libintl
+    ]
+    ++ optionals stdenv.isSunOS [
+      libiconv
+      gawk
+    ]
     ++ optional interactive ncurses;
 
-  configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
+  configureFlags =
+    [ "PERL=${buildPackages.perl}/bin/perl" ]
     # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
     # fallbacks.
     # Also prevent the buildPlatform's awk being used in the texindex script
-    ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${getBin gawk}/bin/awk" ]
+    ++ optionals crossBuildTools [
+      "--enable-perl-xs=no"
+      "TI_AWK=${getBin gawk}/bin/awk"
+    ]
     ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];
-  installTargets = [ "install" "install-tex" ];
+  installTargets = [
+    "install"
+    "install-tex"
+  ];
 
-  nativeCheckInputs = [ procps ]
-    ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ];
+  nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ];
 
-  doCheck = interactive
-    && !stdenv.isDarwin
-    && !stdenv.isSunOS; # flaky
+  doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky
 
   checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
     # Test is known to fail on various locales on texinfo-6.8:
diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix
index 0895a11043a4..4131b6a53920 100644
--- a/pkgs/development/tools/misc/texinfo/packages.nix
+++ b/pkgs/development/tools/misc/texinfo/packages.nix
@@ -1,20 +1,23 @@
-{ lib
-, stdenv
-, buildPackages
-, callPackage
-, fetchurl
-, perl
-, libintl
-, bash
-, updateAutotoolsGnuConfigScriptsHook
-, gnulib
-, gawk
-, freebsd
-, libiconv
-, xz
+{
+  lib,
+  stdenv,
+  buildPackages,
+  callPackage,
+  fetchurl,
+  perl,
+  libintl,
+  bash,
+  updateAutotoolsGnuConfigScriptsHook,
+  gnulib,
+  gawk,
+  freebsd,
+  libiconv,
+  xz,
 
-# we are a dependency of gcc, this simplifies bootstraping
-, interactive ? false, ncurses, procps
+  # we are a dependency of gcc, this simplifies bootstraping
+  interactive ? false,
+  ncurses,
+  procps,
 }:
 
 let
@@ -44,9 +47,25 @@ let
     mainProgram = "texi2any";
   };
   buildTexinfo = callPackage ./common.nix {
-    inherit lib stdenv buildPackages updateAutotoolsGnuConfigScriptsHook
-    fetchurl perl xz libintl libiconv bash gnulib gawk freebsd ncurses procps
-    meta interactive;
+    inherit
+      lib
+      stdenv
+      buildPackages
+      updateAutotoolsGnuConfigScriptsHook
+      fetchurl
+      perl
+      xz
+      libintl
+      libiconv
+      bash
+      gnulib
+      gawk
+      freebsd
+      ncurses
+      procps
+      meta
+      interactive
+      ;
   };
 in
 {

From 192b17b56937c985ad619ccb43ac4da7f4316519 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 2 Jun 2024 23:27:30 +0100
Subject: [PATCH 033/319] ensureNewerSourcesHook: handle $sourceRoot that
 starts with dash

Without the change `ensureNewerSourcesHook` fails on tarballs like
`diffoscope-269` that contain single top-level `-269` root as:

    diffoscope> unpacking source archive ...-diffoscope-269.tar.bz2
    diffoscope> source root is -269
    diffoscope> find: unknown predicate `-269'

Currently `diffoscope-269` has a `sourceRoot = "./-269";` workaround to
bypass the failure.

Co-authored-by: Philip Taron <philip.taron@gmail.com>
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca611d0d3894..981f2d488b1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -217,7 +217,11 @@ with pkgs;
   } (writeScript "ensure-newer-sources-hook.sh" ''
       postUnpackHooks+=(_ensureNewerSources)
       _ensureNewerSources() {
-        '${findutils}/bin/find' "$sourceRoot" \
+        local r=$sourceRoot
+        # Avoid passing option-looking directory to find. The example is diffoscope-269:
+        #   https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378
+        [[ $r == -* ]] && r="./$r"
+        '${findutils}/bin/find' "$r" \
           '!' -newermt '${year}-01-01' -exec touch -h -d '${year}-01-02' '{}' '+'
       }
     '');

From a3f1b476c71154478fe844ea293adc399ccd9271 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 3 Jun 2024 07:28:26 +0100
Subject: [PATCH 034/319] setup-hooks/set-source-date-epoch-to-latest.sh:
 handle $path that starts with dash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change `updateSourceDateEpoch` fails on tarballs like
`diffoscope-269` that contain single top-level `-269` root as:

    diffoscope> source root is -269
    diffoscope> find: unknown predicate `-269'
    diffoscope> chmod: invalid mode: ‘-269’
    diffoscope> Try 'chmod --help' for more information.

Currently `diffoscope-269` has a `sourceRoot = "./-269";` workaround to
bypass the failure.

Co-authored-by: Philip Taron <philip.taron@gmail.com>
---
 .../setup-hooks/set-source-date-epoch-to-latest.sh             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
index ae34ffec4854..a9a0dc689086 100644
--- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
@@ -1,5 +1,8 @@
 updateSourceDateEpoch() {
     local path="$1"
+    # Avoid passing option-looking directory to find. The example is diffoscope-269:
+    #   https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378
+    [[ $path == -* ]] && path="./$path"
 
     # Get the last modification time of all regular files, sort them,
     # and get the most recent. Maybe we should use

From 193fd8a237ce715a94ce89ec6e7f61c2da9510d1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 3 Jun 2024 18:40:23 +0100
Subject: [PATCH 035/319] generic/setup.sh: handle $sourceRoot that starts with
 dash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Without the change `runPhase` fails on tarballs like
`diffoscope-269` that contain single top-level `-269` root as:

    diffoscope> unpacking source archive /nix/store/p620nidkm73vrp0z6kk5krmrm4vg7bxd-diffoscope-269.tar.bz2
    diffoscope> source root is -269
    diffoscope> setting SOURCE_DATE_EPOCH to timestamp 1717143039 of file ./-269/tests/utils/versions.py
    diffoscope> chmod: invalid mode: ‘-269’
    diffoscope> Try 'chmod --help' for more information.

Currently `diffoscope-269` has a `sourceRoot = "./-269";` workaround to
bypass the failure.
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d7521b1ad5da..02513af6b8f8 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1577,9 +1577,9 @@ runPhase() {
 
     if [ "$curPhase" = unpackPhase ]; then
         # make sure we can cd into the directory
-        [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}"
+        [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}"
 
-        cd "${sourceRoot:-.}"
+        cd -- "${sourceRoot:-.}"
     fi
 }
 

From b20e29f3673d909f952349838b391ec937c8b0cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Jun 2024 03:14:44 +0000
Subject: [PATCH 036/319] libmaxminddb: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index 1651d36710e6..9a944abbb1ec 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmaxminddb";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchurl {
     url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-qAaCqJ2RX99gs10xYjL7BOvzb/8n/am9Of6KONPNPxI=";
+    sha256 = "sha256-Xm23LfQjriJb/oiXBp9t70D6qJMfRWuZ15uLTWZMZnE=";
   };
 
   meta = with lib; {

From 463a120c25e48616e4c2ece380720cee2aaf7c56 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 11 Jun 2024 07:06:53 +0100
Subject: [PATCH 037/319] libaom: 3.9.0 -> 3.9.1

Changes: https://aomedia.googlesource.com/aom/+/refs/tags/v3.9.1
---
 pkgs/development/libraries/libaom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 16a9e872aae8..8f4afbf5a3e0 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libaom";
-  version = "3.9.0";
+  version = "3.9.1";
 
   src = fetchzip {
     url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
-    hash = "sha256-ON/BWCO2k7fADW3ZANKjnRE8SrQZpjdyUF1N0fD/xnc=";
+    hash = "sha256-XQ1sekNZDUAiYP/HriYRj4+40PAvE/OiyG9bbrdg63I=";
     stripRoot = false;
   };
 

From e65038628b54a0536748a2d93551d9516b984448 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:44:03 -0400
Subject: [PATCH 038/319] jansson: migrate to by-name

---
 .../development/libraries/jansson/default.nix | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/jansson/default.nix

diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix
deleted file mode 100644
index e86832420969..000000000000
--- a/pkgs/development/libraries/jansson/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "jansson";
-  version = "2.14";
-
-  src = fetchFromGitHub {
-    owner = "akheron";
-    repo = "jansson";
-    rev = "v${version}";
-    sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [
-    # networkmanager relies on libjansson.so:
-    #   https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
-    "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/akheron/jansson";
-    description = "C library for encoding, decoding and manipulating JSON data";
-    changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b203ccdb5481..bfd40cf894ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21569,8 +21569,6 @@ with pkgs;
 
   jama = callPackage ../development/libraries/jama { };
 
-  jansson = callPackage ../development/libraries/jansson { };
-
   jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { };
 
   jbig2dec = callPackage ../development/libraries/jbig2dec { };

From 326bbd2a1bb3cc18695d1921d508f41d40a292ad Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:44:24 -0400
Subject: [PATCH 039/319] jansson: format with nixfmt

---
 pkgs/by-name/ja/jansson/package.nix | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ja/jansson/package.nix

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
new file mode 100644
index 000000000000..3ec2193fb74c
--- /dev/null
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "jansson";
+  version = "2.14";
+
+  src = fetchFromGitHub {
+    owner = "akheron";
+    repo = "jansson";
+    rev = "v${version}";
+    sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    # networkmanager relies on libjansson.so:
+    #   https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
+    "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/akheron/jansson";
+    description = "C library for encoding, decoding and manipulating JSON data";
+    changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}

From 9b11c7fdef7723e62240ed1220faa27b672e7649 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:45:00 -0400
Subject: [PATCH 040/319] jansson: adopt

---
 pkgs/by-name/ja/jansson/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index 3ec2193fb74c..a045753286aa 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = with maintainers; [ getchoo ];
   };
 }

From 547c1ca823ae706d5e1490a75fd5a29eb7dfde4b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:46:16 -0400
Subject: [PATCH 041/319] jansson: modernize

---
 pkgs/by-name/ja/jansson/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index a045753286aa..45c1c630b5d1 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "akheron";
     repo = "jansson";
     rev = "v${version}";
-    sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
+    hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
     "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
   ];
 
-  meta = with lib; {
-    homepage = "https://github.com/akheron/jansson";
+  meta = {
     description = "C library for encoding, decoding and manipulating JSON data";
-    changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ getchoo ];
+    homepage = "https://github.com/akheron/jansson";
+    changelog = "https://github.com/akheron/jansson/raw/v${src.rev}/CHANGES";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.all;
   };
 }

From d75985387e9aab0ba89bc2de2ca720c6e5f69255 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:48:15 -0400
Subject: [PATCH 042/319] jansson: add validatePkgConfig hook

---
 pkgs/by-name/ja/jansson/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index 45c1c630b5d1..e6b784be4671 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  validatePkgConfig,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +17,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    validatePkgConfig
+  ];
 
   cmakeFlags = [
     # networkmanager relies on libjansson.so:

From fb10cb806862cebb53360ab3db7c60aac52bcdda Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 01:01:23 -0400
Subject: [PATCH 043/319] jansson: add pkg-config test

---
 pkgs/by-name/ja/jansson/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index e6b784be4671..319ea782a140 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -3,17 +3,18 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  testers,
   validatePkgConfig,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jansson";
   version = "2.14";
 
   src = fetchFromGitHub {
     owner = "akheron";
     repo = "jansson";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
   };
 
@@ -28,12 +29,17 @@ stdenv.mkDerivation rec {
     "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
   ];
 
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+  };
+
   meta = {
     description = "C library for encoding, decoding and manipulating JSON data";
     homepage = "https://github.com/akheron/jansson";
-    changelog = "https://github.com/akheron/jansson/raw/v${src.rev}/CHANGES";
+    changelog = "https://github.com/akheron/jansson/raw/${finalAttrs.src.rev}/CHANGES";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
     platforms = lib.platforms.all;
+    pkgConfigModules = [ "jansson" ];
   };
-}
+})

From cc3f383f563cbc007df91a1ec1277eee5696ff6c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 01:02:28 -0400
Subject: [PATCH 044/319] jansson: add updateScript

---
 pkgs/by-name/ja/jansson/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index 319ea782a140..17abf3ded3df 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  nix-update-script,
   testers,
   validatePkgConfig,
 }:
@@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From 7bde538b09855752d07c1c0e3abf015031d941cc Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 01:27:02 -0400
Subject: [PATCH 045/319] jansson: split outputs

---
 pkgs/by-name/ja/jansson/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index 17abf3ded3df..bb0035b97669 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "jansson";
   version = "2.14";
 
+  outputs = [
+    "dev"
+    "out"
+  ];
+
   src = fetchFromGitHub {
     owner = "akheron";
     repo = "jansson";

From 3fbb235809eaf5309ec58a85f3b32c06f49e7cf7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Jun 2024 03:57:38 +0000
Subject: [PATCH 046/319] freeglut: 3.4.0 -> 3.6.0

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

diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 69c3b65e4a51..383bb925605e 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freeglut";
-  version = "3.4.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-PAvLkV2bGAqX7a69ARt6HeVFg6g4ZE3NQrsOoMbz6uw=";
+    sha256 = "sha256-nD1NZRb7+gKA7ck8d2mPtzA+RDwaqvN9Jp4yiKbD6lI=";
   };
 
   outputs = [ "out" "dev" ];

From 081b77fce315f2a4f3def5043cbb9b733434a7a9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 27 May 2024 10:41:15 +0100
Subject: [PATCH 047/319] dav1d: 1.4.1 -> 1.4.3

Changes:
- https://code.videolan.org/videolan/dav1d/-/tags/1.4.2
- https://code.videolan.org/videolan/dav1d/-/tags/1.4.3
---
 pkgs/development/libraries/dav1d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index da1eecdabab3..b6ec274cd4a7 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -26,13 +26,13 @@ assert useVulkan -> withExamples;
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "videolan";
     repo = pname;
     rev = version;
-    hash = "sha256-PBFQrGGP7hKNMuwkl7q/7/C7v41xqdOYW+pJ70fI4Uo=";
+    hash = "sha256-uudtA9ZpGIpw1yfCzbywFyH7EWYHuXfE6pBb2eksx1g=";
   };
 
   outputs = [ "out" "dev" ];

From d544b1259ac1e15d4ac0e49daa6ac5a4f7fee92b Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Fri, 14 Jun 2024 11:04:15 -0400
Subject: [PATCH 048/319] trivial: fix pkgs.writeText test to pass string

Passing a non-string value and relying on pkgs.writeText to implicitly call
builtins.toString is incorrect.
---
 pkgs/build-support/trivial-builders/test/concat-test.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders/test/concat-test.nix b/pkgs/build-support/trivial-builders/test/concat-test.nix
index 5ce435619069..a893408854e5 100644
--- a/pkgs/build-support/trivial-builders/test/concat-test.nix
+++ b/pkgs/build-support/trivial-builders/test/concat-test.nix
@@ -2,7 +2,7 @@
 let
   stri = writeText "pathToTest";
   txt1 = stri "abc";
-  txt2 = stri hello;
+  txt2 = stri (builtins.toString hello);
   res = concatText "textToTest" [ txt1 txt2 ];
 in
 runCommand "test-concatPaths" { } ''

From 5aa55272c2f3fa7b720b5231d3b2f4f2dc731a13 Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Fri, 14 Jun 2024 15:06:29 -0400
Subject: [PATCH 049/319] trivial: input type assertions for writeText

---
 pkgs/build-support/trivial-builders/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 1625b0c96719..ac3898117e8c 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -127,7 +127,13 @@ rec {
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing
-  writeText = name: text: writeTextFile { inherit name text; };
+  writeText = name: text:
+    # TODO: To fully deprecate, replace the assertion with `lib.isString` and remove the warning
+    assert lib.assertMsg (lib.strings.isConvertibleWithToString text) ''
+      pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.'';
+    lib.warnIf (! lib.isString text) ''
+      pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first.''
+    writeTextFile { inherit name text; };
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing

From 9f4b1064c6c9464194eb47cca6f2f42bdbd5c6da Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Fri, 14 Jun 2024 15:35:15 -0400
Subject: [PATCH 050/319] trivial: make pkgs.writeText always fixed output

This can prevent a cascade of rebuilds across nixpkgs versions because these
small files tend to be found at the leaves of dependency trees.
---
 pkgs/build-support/trivial-builders/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index ac3898117e8c..2cc4a4e48ff9 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -133,7 +133,14 @@ rec {
       pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.'';
     lib.warnIf (! lib.isString text) ''
       pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first.''
-    writeTextFile { inherit name text; };
+    writeTextFile {
+      inherit name text;
+      derivationArgs = rec {
+        outputHashAlgo = "sha256";
+        outputHashMode = "flat";
+        outputHash = builtins.hashString outputHashAlgo (builtins.toString text);
+      };
+    };
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing

From 0b95f8d98d03dc439c0d8a2b8d8694e59959152e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 14 Jun 2024 22:01:02 +0100
Subject: [PATCH 051/319] libfido2: 1.14.0 -> 1.15.0

Changes: https://github.com/Yubico/libfido2/blob/1.15.0/NEWS
---
 pkgs/development/libraries/libfido2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index b3c3cc450237..63656f575677 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -14,12 +14,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.14.0";
+  version = "1.15.0";
 
   # releases on https://developers.yubico.com/libfido2/Releases/ are signed
   src = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-NgF5LjIAMtQoACxMzoSZpMe4AzGQUaJaDJ8fE4/+5Fo=";
+    hash = "sha256-q6qxMY0h0mLs5Bb7inEy+pN0vaifb6UrhqmKL1cSth4=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 1f908baaa169621f81192d5c2ba1a07c31a532b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A9=20Dupuis?= <joe@dupuis.io>
Date: Fri, 14 Jun 2024 16:24:18 -0700
Subject: [PATCH 052/319] ruby_3_1: 3.1.5 -> 3.1.6

Changelog: https://github.com/ruby/ruby/releases/tag/v3_1_6

Release Notes: https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/
---
 pkgs/development/interpreters/ruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index a9e5e5a04842..2bfb62626b49 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -299,8 +299,8 @@ in {
   mkRuby = generic;
 
   ruby_3_1 = generic {
-    version = rubyVersion "3" "1" "5" "";
-    hash = "sha256-NoXFHu7hNSwx6gOXBtcZdvU9AKttdzEt5qoauvXNosU=";
+    version = rubyVersion "3" "1" "6" "";
+    hash = "sha256-DQ2vuFnnZ2NDJXGjEJ0VN9l2JmvjCDRFZR3Gje7SXCI=";
   };
 
   ruby_3_2 = generic {

From aa86df04519693f7c8778b954900719304ed433a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A9=20Dupuis?= <joe@dupuis.io>
Date: Fri, 14 Jun 2024 16:25:43 -0700
Subject: [PATCH 053/319] ruby_3_3: 3.3.2 -> 3.3.3

Changelog: https://github.com/ruby/ruby/releases/tag/v3_3_3

Release Notes: https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/
---
 pkgs/development/interpreters/ruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 2bfb62626b49..10906bd67be1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -310,8 +310,8 @@ in {
   };
 
   ruby_3_3 = generic {
-    version = rubyVersion "3" "3" "2" "";
-    hash = "sha256-O+HRAOvyoM5gws2NIs2dtNZLPgShlDvixP97Ug8ry1s=";
+    version = rubyVersion "3" "3" "3" "";
+    hash = "sha256-g8BbIXfunDNbYxspuMB3tHcBZtAvpSfzqfakDRPzzOI=";
     cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
   };
 

From 89621518871e0e9bffc6fc8bce6164b7c161b2e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Jun 2024 02:00:17 +0000
Subject: [PATCH 054/319] kdePackages.packagekit-qt: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index 897f8d9e7b4a..79350e340f90 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -5,13 +5,13 @@ let
   isQt6 = lib.versions.major qttools.version == "6";
 in stdenv.mkDerivation rec {
   pname = "packagekit-qt";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner  = "hughsie";
     repo   = "PackageKit-Qt";
     rev    = "v${version}";
-    sha256 = "sha256-pwDMLd+Gpl0P2ImPjGeZpKAOJ4dH5+P1se0l1qm5Ui0=";
+    sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs=";
   };
 
   buildInputs = [ packagekit ];

From b51c105f921fc2d93c1e7e76f7293b31679504c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Jun 2024 02:15:41 +0000
Subject: [PATCH 055/319] packagekit: 1.2.8 -> 1.3.0

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

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 2e150f692ae9..d0a4ef21d36a 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit";
-  version = "1.2.8";
+  version = "1.3.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "PackageKit";
     repo = "PackageKit";
     rev = "v${version}";
-    hash = "sha256-k51uQHar/uvdTDj/Ud60Oh6H7rfjEc9bfQnH5cvg8hc=";
+    hash = "sha256-MYZFI1Q90F/AXVSJJBhmw+E7IMLXrdwmSuFJwv5D/z4=";
   };
 
   buildInputs = [

From f39973fe655705d99f290fa8530d54c74bf58858 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 15 Jun 2024 16:53:45 +0100
Subject: [PATCH 056/319] libbsd: 0.11.8 -> 0.12.2

Replace the existing Darwin patch (which has been unnecessary for
several releases) with a new one for a new issue.

Closes: #292228
---
 .../libraries/libbsd/darwin-enable-strtonum.patch | 13 +++++++++++++
 .../libraries/libbsd/darwin-fix-libbsd.sym.patch  | 15 ---------------
 pkgs/development/libraries/libbsd/default.nix     | 12 ++++++------
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
 delete mode 100644 pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch

diff --git a/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
new file mode 100644
index 000000000000..b2123c78bec2
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 2a15d720f9...186ab24978 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,7 +254,7 @@
+     abi_strl=no
+     abi_strmode=no
+     abi_strnstr=no
+-    abi_strtonum=no
++    abi_strtonum=yes
+     abi_strtox=yes
+     abi_timeconv=no
+     # On libmd.
diff --git a/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch b/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch
deleted file mode 100644
index de40da981623..000000000000
--- a/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9d22b00..c6848fc 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -198,7 +198,9 @@ libbsd_ctor_a_SOURCES = \
- # Generate a simple libtool symbol export list to be used as a fallback if
- # there is no version script support.
- libbsd.sym: libbsd.map
--	$(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map > $@
-+	$(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map \
-+	  | grep -Ev '(group_from_gid|user_from_uid|nlist|__fdnlist|bsd_getopt)' \
-+	  > $@
- 
- if NEED_TRANSPARENT_LIBMD
- TRANSPARENT_LIBMD_DEPENDS = format.ld
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index fa8b6b65950b..90a92f50f463 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
-  version = "0.11.8";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM=";
+    hash = "sha256-uIzJFj0MZSqvOamZkdl03bocOpcR248bWDivKhRzEBQ=";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libmd ];
 
-  patches = lib.optionals stdenv.isDarwin [
-    # Temporary build system hack from upstream maintainer
-    # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684
-    ./darwin-fix-libbsd.sym.patch
+  patches = [
+    # `strtonum(3)` is not available on our default SDK version.
+    # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/30
+    ./darwin-enable-strtonum.patch
   ];
 
   passthru.updateScript = gitUpdater {

From e66447ad4db1e10ccc47c0fa45a9569c15d1b8a5 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 19 May 2024 00:43:24 -0400
Subject: [PATCH 057/319] openpam: migrate to by-name

---
 .../openpam/default.nix => by-name/op/openpam/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/openpam/default.nix => by-name/op/openpam/package.nix} (100%)

diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/by-name/op/openpam/package.nix
similarity index 100%
rename from pkgs/development/libraries/openpam/default.nix
rename to pkgs/by-name/op/openpam/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ec50cca4052..dd3c341aea28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27617,8 +27617,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  openpam = callPackage ../development/libraries/openpam { };
-
   openbsm = callPackage ../development/libraries/openbsm { };
 
   pagemon = callPackage ../os-specific/linux/pagemon { };

From d30ba201bf2159ba55a936560b53f9cf76a34cfd Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 19 May 2024 00:44:48 -0400
Subject: [PATCH 058/319] openpam: 20170430 -> 20230627

https://git.des.dev/OpenPAM/OpenPAM/wiki/Releases-Ximenia
https://git.des.dev/OpenPAM/OpenPAM/wiki/Releases-Tabebuia

Fixes errata: https://git.des.dev/OpenPAM/OpenPAM/wiki/Errata
---
 pkgs/by-name/op/openpam/package.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/openpam/package.nix b/pkgs/by-name/op/openpam/package.nix
index 9f7f1b7bf415..f0e823780a4a 100644
--- a/pkgs/by-name/op/openpam/package.nix
+++ b/pkgs/by-name/op/openpam/package.nix
@@ -1,14 +1,26 @@
-{ stdenv, fetchurl, lib }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoreconfHook,
+  pkg-config,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openpam";
-  version = "20170430";
+  version = "20230627";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz";
-    sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
+    url = "mirror://sourceforge/openpam/openpam/Ximenia/openpam-${finalAttrs.version}.tar.gz";
+    hash = "sha256-DZrI9bVaYkH1Bz8T7/HpVGFCLEWsGjBEXX4QaOkdtP0=";
   };
 
+  strictDeps = true;
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  __structuredAttrs = true;
+
   meta = with lib; {
     homepage = "https://www.openpam.org";
     description = "Open source PAM library that focuses on simplicity, correctness, and cleanliness";
@@ -16,4 +28,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ matthewbauer ];
     license = licenses.bsd3;
   };
-}
+})

From 534985feaaf54b84e69e58087df4c2edadd3c92f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Jun 2024 04:32:20 +0000
Subject: [PATCH 059/319] ldb: 2.9.0 -> 2.9.1

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

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 6c5fa48affc1..f84dd2d08f06 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ldb";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    hash = "sha256-EFqv9xrYgaf661gv1BauKCIbb94zj/+CgoBlBiwlB6U=";
+    hash = "sha256-yV5Nwy3qiGS3mJnuNAyf3yi0hvRku8OLqZFRoItJP5s=";
   };
 
   outputs = [ "out" "dev" ];

From 0a8814545a1e224a7d5eacedfdb0f195e9189f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 20 Jun 2024 19:00:58 +0200
Subject: [PATCH 060/319] dns-root-data: add DS for the new KSK-2024

The key still won't be used for some time, two years maybe,
and I've been unable to find the DNSKEY itself yet,
but I think it's better to preemptively trust at least the DS already.
(outdated machines, etc.)

Some evidence that it's not just a hash of *my* private key:
https://www.iana.org/dnssec/ceremonies/53-2
https://data.iana.org/ksk-ceremony/53-2/kskm-keymaster-20240426-173035-995.log
https://www.youtube.com/live/gw4PFhtnVpk?si=C8zevM3nG9O0XAJr&t=12726

I also used exactly the same root.ds in knot-resolver upstream:
https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1556
---
 pkgs/data/misc/dns-root-data/default.nix | 2 +-
 pkgs/data/misc/dns-root-data/root.ds     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix
index 1c6121473c74..4d07bce35020 100644
--- a/pkgs/data/misc/dns-root-data/default.nix
+++ b/pkgs/data/misc/dns-root-data/default.nix
@@ -20,7 +20,7 @@ in
 
 stdenv.mkDerivation {
   pname = "dns-root-data";
-  version = "2023-11-27";
+  version = "2024-06-20";
 
   buildCommand = ''
     mkdir $out
diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/data/misc/dns-root-data/root.ds
index e292b5a7bf0c..3009e81f27d4 100644
--- a/pkgs/data/misc/dns-root-data/root.ds
+++ b/pkgs/data/misc/dns-root-data/root.ds
@@ -1 +1,2 @@
 . IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
+. IN DS 38696 8 2 683D2D0ACB8C9B712A1948B27F741219298D0A450D612C483AF444A4C0FB2B16

From 5474272067063b084c3a57635ef72e2822a27c47 Mon Sep 17 00:00:00 2001
From: Tomas Antonio Lopez <entropy.overseer@entropic.network>
Date: Thu, 30 May 2024 00:21:56 +0200
Subject: [PATCH 061/319] openjdk: configure build to support a Clang-based
 stdenv

---
 pkgs/development/compilers/openjdk/11.nix | 16 +++++++++++++---
 pkgs/development/compilers/openjdk/17.nix | 11 +++++++++--
 pkgs/development/compilers/openjdk/19.nix | 11 +++++++++--
 pkgs/development/compilers/openjdk/20.nix | 11 +++++++++--
 pkgs/development/compilers/openjdk/21.nix | 13 ++++++++++---
 pkgs/development/compilers/openjdk/22.nix |  6 ++++++
 6 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 04df2d28a45c..cd176c2f90ec 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -74,9 +74,19 @@ let
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
       "--disable-warnings-as-errors"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    # Cannot be built by recent versions of Clang, as far as I can tell (see
+    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
+    # compile with LLVM 12.
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 1c9aee9af5e9..c54bedbca679 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -98,8 +98,15 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix
index 187d724b57b5..5a94f496898f 100644
--- a/pkgs/development/compilers/openjdk/19.nix
+++ b/pkgs/development/compilers/openjdk/19.nix
@@ -100,8 +100,15 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix
index bdb7d057f263..e4d1749eb2fb 100644
--- a/pkgs/development/compilers/openjdk/20.nix
+++ b/pkgs/development/compilers/openjdk/20.nix
@@ -98,8 +98,15 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix
index 160b3da4c8ee..d8e61bf1e5fb 100644
--- a/pkgs/development/compilers/openjdk/21.nix
+++ b/pkgs/development/compilers/openjdk/21.nix
@@ -91,9 +91,16 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix
index 97d1a3b3b44d..7678e836c626 100644
--- a/pkgs/development/compilers/openjdk/22.nix
+++ b/pkgs/development/compilers/openjdk/22.nix
@@ -160,6 +160,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-lcms=system"
     "--with-stdc++lib=dynamic"
   ]
+  ++ lib.optionals stdenv.cc.isClang [
+    "--with-toolchain-type=clang"
+    # Explicitly tell Clang to compile C++ files as C++, see
+    # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+    "--with-extra-cxxflags=-xc++"
+  ]
   ++ lib.optional headless "--enable-headless-only"
   ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 

From df5bf2f5f08d9c3ddbb611d09f656020b37addb0 Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Sun, 23 Jun 2024 10:48:52 -0700
Subject: [PATCH 062/319] rsync: fix missing ipv6 support (again)

The patch was removed in 21604e8d2bf4 despite not being included
in rsync v3.3.0, which broke IPv6 on at least darwin again.
---
 .../rsync/configure.ac-fix-failing-IPv6-check.patch  | 12 ++++++++++++
 pkgs/applications/networking/sync/rsync/default.nix  |  5 +++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch

diff --git a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch
new file mode 100644
index 000000000000..3305653d025f
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch
@@ -0,0 +1,12 @@
+diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh
+--- rsync-3.2.7/configure.sh	2022-10-20 17:57:22
++++ rsync-3.2.7-fixed/configure.sh	2024-01-01 19:51:58
+@@ -7706,7 +7706,7 @@ else $as_nop
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-main()
++int main()
+ {
+    if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+      exit(1);
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 555fb68416b8..a3a4adf24687 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ];
 
+  patches = [
+    # https://github.com/WayneD/rsync/pull/558
+    ./configure.ac-fix-failing-IPv6-check.patch
+  ];
+
   buildInputs = [ libiconv zlib popt ]
     ++ lib.optional enableACLs acl
     ++ lib.optional enableZstd zstd

From e00e2a2a4ac99307403bad92f0209dde293dee87 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Mon, 24 Jun 2024 07:52:29 +0200
Subject: [PATCH 063/319] libva: 2.21.0 -> 2.22.0

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index aad42d7e51f8..c4decf850cf3 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libva" + lib.optionalString minimal "-minimal";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "libva";
     rev    = finalAttrs.version;
-    sha256 = "sha256-X9H5nxbYFSMfxZMxs3iWwCgdrJ2FTVWW7tlgQek3WIg=";
+    sha256 = "sha256-0eOYxyMt2M2lkhoWOhoUQgP/1LYY3QQqSF5TdRUuCbs=";
   };
 
   outputs = [ "dev" "out" ];

From 2d53d43c1cf3da318c15caa14290f6cb04352063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zaffarano?= <sebas@zaffarano.com.ar>
Date: Mon, 24 Jun 2024 09:47:10 +0200
Subject: [PATCH 064/319] =?UTF-8?q?bluez:=205.75=20=E2=86=92=205.76?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/bl/bluez/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 454d677d907f..09e36c8dd027 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bluez";
-  version = "5.75";
+  version = "5.76";
 
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mIyzxFUfbjpmdwilePXKn5P8iWUI+Y8IcJvk+KsDPC8=";
+    hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM=";
   };
 
   patches =

From 9088fd75ebd32b25a71e9508ce0427e186185e61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Jun 2024 13:17:02 +0000
Subject: [PATCH 065/319] cups: 2.4.8 -> 2.4.10

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

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 3fc4ab361e3e..194074ce9cb6 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cups";
-  version = "2.4.8";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    sha256 = "sha256-dcMmtLpzl178yaJQeMSwTNtO4zPKqtDQgj29UixkeaA=";
+    sha256 = "sha256-11dXwrwPeiiwLuTVLKnksaoboq/+FrmFhU9TNpQOWtc=";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];

From 26b7b2fe4d95856c1d44751f0035292b5d98362c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 24 Jun 2024 18:56:11 +0300
Subject: [PATCH 066/319] polkit: Apply unreleased patch to fix pkexec without
 a graphical agent

Merged upstream PR https://www.github.com/polkit-org/polkit/pull/423
---
 pkgs/development/libraries/polkit/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 5b41fbdf6dfd..dd3c6aaea354 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -19,6 +19,7 @@
 , docbook_xml_dtd_412
 , gtk-doc
 , coreutils
+, fetchpatch
 , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal
 , systemdMinimal
 , elogind
@@ -55,6 +56,13 @@ stdenv.mkDerivation rec {
     ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
 
     ./elogind.patch
+
+    # FIXME: remove in the next release
+    # https://github.com/NixOS/nixpkgs/issues/18012
+    (fetchpatch {
+      url = "https://github.com/polkit-org/polkit/commit/f93c7466039ea3403e0576928aeb620b806d0cce.patch";
+      sha256 = "sha256-cF0nNovYmyr+XixpBgQFF0A+oJeSPGZgTkgDQkQuof8=";
+    })
   ];
 
   depsBuildBuild = [

From 7a36582458547076a4aea2b1e5c66b0aa77c81d7 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sun, 23 Jun 2024 19:31:31 +0200
Subject: [PATCH 067/319] haskellPackages.safe-exceptions: fix strictDeps build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e1efb46422a3..696f32f63587 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -3135,4 +3135,9 @@ self: super: {
     hash = "sha256-tFOWpjGmZANC7H82QapZ36raaNWuZ6F3BgjxnfTXpMs=";
   }) super.proto3-wire;
 
+  safe-exceptions = overrideCabal (drv: {
+    # Fix strictDeps build error "could not execute: hspec-discover"
+    testToolDepends = drv.testToolDepends or [] ++ [ self.hspec-discover ];
+  }) super.safe-exceptions;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 4a86b9e517b7b9c62b63254530cc8d72017ca454 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 24 Jun 2024 22:00:00 +0100
Subject: [PATCH 068/319] msgpack-c: 6.0.1 -> 6.0.2

Changes: https://github.com/msgpack/msgpack-c/releases/tag/c-6.0.2
---
 pkgs/development/libraries/msgpack-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix
index 63a712b0881e..3d8cae18ace0 100644
--- a/pkgs/development/libraries/msgpack-c/default.nix
+++ b/pkgs/development/libraries/msgpack-c/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "msgpack-c";
-  version = "6.0.1";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-c";
     rev = "refs/tags/c-${finalAttrs.version}";
-    hash = "sha256-BXnK7xNRdZvbSz7tERf/PDJkmxbqAC6trH+h36O/v6k=";
+    hash = "sha256-Tjgn9ayyPK1mKA4OBr7/VogSzJwh5RZR5BrMNadfqak=";
   };
 
   strictDeps = true;

From aa9f33fc9a1df5eb7a9c02b029389e0be07b0dea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Jun 2024 03:23:08 +0000
Subject: [PATCH 069/319] kdePackages.qca: 2.3.8 -> 2.3.9

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

diff --git a/pkgs/development/libraries/qca/default.nix b/pkgs/development/libraries/qca/default.nix
index 66cdfe28eb31..a8651c9c2a5f 100644
--- a/pkgs/development/libraries/qca/default.nix
+++ b/pkgs/development/libraries/qca/default.nix
@@ -4,11 +4,11 @@ let
   isQt6 = lib.versions.major qtbase.version == "6";
 in stdenv.mkDerivation rec {
   pname = "qca";
-  version = "2.3.8";
+  version = "2.3.9";
 
   src = fetchurl {
     url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz";
-    sha256 = "sha256-SHWcqGoCAkYdkIumYTQ4DMO7fSD+08AxufwCiXlqgmQ=";
+    sha256 = "sha256-xVXVKYzde2uv4rH5YQbzDPpUOiPUWdUMipHqwzxHbk4=";
   };
 
   buildInputs = [ openssl qtbase qt5compat ];

From 65da162fa7e8ebf9f31bf82341210acacefd2e22 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 18 May 2024 21:42:08 -0400
Subject: [PATCH 070/319] meson: use _accumFlagsArray

---
 pkgs/by-name/me/meson/setup-hook.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh
index 3f3c7ac59fde..826664545227 100644
--- a/pkgs/by-name/me/meson/setup-hook.sh
+++ b/pkgs/by-name/me/meson/setup-hook.sh
@@ -25,10 +25,7 @@ mesonConfigurePhase() {
         "--buildtype=${mesonBuildType:-plain}"
     )
 
-    flagsArray+=(
-        $mesonFlags
-        "${mesonFlagsArray[@]}"
-    )
+    _accumFlagsArray mesonFlags mesonFlagsArray
 
     echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}"
 

From 92df0c6308d257226a014abdcd4643e691d34030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Jun 2024 01:02:15 +0000
Subject: [PATCH 071/319] glslang: 14.2.0 -> 14.3.0

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

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 91dfb296318c..5fe11e35a434 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "14.2.0";
+  version = "14.3.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc=";
+    hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA=";
   };
 
   # These get set at all-packages, keep onto them for child drvs

From 8a826cb8f8de93b4b494e12808e2b87fcc7fe611 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 12 Jun 2024 08:29:46 +0900
Subject: [PATCH 072/319] pahole: 1.26 -> 1.27

---
 pkgs/by-name/pa/pahole/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
index 275044ee40c0..bc4647eb833d 100644
--- a/pkgs/by-name/pa/pahole/package.nix
+++ b/pkgs/by-name/pa/pahole/package.nix
@@ -13,10 +13,10 @@
 
 stdenv.mkDerivation rec {
   pname = "pahole";
-  version = "1.26";
+  version = "1.27";
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz";
-    hash = "sha256-Lf9Z4vHRFplMrUf4VhJ7EDPn+S4RaS1Emm0wyEcG2HU=";
+    hash = "sha256-BwA17lc2yegmOzLfoIu8OmG/PVdc+4sOGzB8Jc4ZjGM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From d354c891fbb0587a6a05fe3b67a902cfb3d8543c Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 12 Jun 2024 21:52:15 +0900
Subject: [PATCH 073/319] pahole: reproducibility: use --reproducible_build
 instead of -j1

New version brought in the --reproducible_build option, which is more
efficient than forcing a single thread, and produces the same output
(tested on linux kernel's vmlinux BTF extraction)
---
 pkgs/by-name/pa/pahole/package.nix            |  1 +
 .../pa/pahole/threading-reproducibility.patch | 27 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
index bc4647eb833d..0f7422587d43 100644
--- a/pkgs/by-name/pa/pahole/package.nix
+++ b/pkgs/by-name/pa/pahole/package.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     musl-obstack
   ];
 
+  # https://github.com/acmel/dwarves/pull/51
   patches = [ ./threading-reproducibility.patch ];
 
   # Put libraries in "lib" subdirectory, not top level of $out
diff --git a/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch
index 15893ce2d035..3c76d9c8521e 100644
--- a/pkgs/by-name/pa/pahole/threading-reproducibility.patch
+++ b/pkgs/by-name/pa/pahole/threading-reproducibility.patch
@@ -1,18 +1,15 @@
 diff --git a/pahole.c b/pahole.c
-index 6fc4ed6..a4e306f 100644
+index 954498d2ad4f..2b010658330c 100644
 --- a/pahole.c
 +++ b/pahole.c
-@@ -1687,8 +1687,11 @@ static error_t pahole__options_parser(int key, char *arg,
- 		  class_name = arg;			break;
- 	case 'j':
- #if _ELFUTILS_PREREQ(0, 178)
--		  conf_load.nr_jobs = arg ? atoi(arg) :
--					    sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
-+		  // Force single thread if reproducibility is desirable.
-+		  if (!getenv("SOURCE_DATE_EPOCH")) {
-+			  conf_load.nr_jobs = arg ? atoi(arg) :
-+						    sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
-+		  }
- #else
- 		  fputs("pahole: Multithreading requires elfutils >= 0.178. Continuing with a single thread...\n", stderr);
- #endif
+@@ -3705,6 +3705,10 @@ int main(int argc, char *argv[])
+ 		goto out;
+ 	}
+ 
++	/* This being set means whoever called us tries to do a reproducible build */
++	if (getenv("SOURCE_DATE_EPOCH"))
++		conf_load.reproducible_build = true;
++
+ 	if (languages.str && parse_languages())
+ 		return rc;
+ 

From df03fbf358920369685d8b88d68da366af78cb03 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 26 Jun 2024 12:38:38 +0900
Subject: [PATCH 074/319] pahole: fix issue with LLVM compiled kernels

---
 pkgs/by-name/pa/pahole/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix
index 0f7422587d43..14a31958c0e2 100644
--- a/pkgs/by-name/pa/pahole/package.nix
+++ b/pkgs/by-name/pa/pahole/package.nix
@@ -9,6 +9,7 @@
 , argp-standalone
 , musl-obstack
 , nixosTests
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -26,8 +27,16 @@ stdenv.mkDerivation rec {
     musl-obstack
   ];
 
-  # https://github.com/acmel/dwarves/pull/51
-  patches = [ ./threading-reproducibility.patch ];
+  patches = [
+    # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org
+    ./threading-reproducibility.patch
+    # https://github.com/acmel/dwarves/issues/53
+    (fetchpatch {
+      name = "fix-clang-btf-generation-bug.patch";
+      url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch";
+      hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE=";
+    })
+  ];
 
   # Put libraries in "lib" subdirectory, not top level of $out
   cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];

From dbd9745e11c65cb89fa81b0181b322cd5683f4cb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Jun 2024 10:25:21 +0200
Subject: [PATCH 075/319] openjdk: remove gnome_vfs & GConf

Those libraries have been deprecated for 10+ years and require daemons
that no-one has running these days.

Keep the `enableGnome2` argument for BC.
---
 pkgs/development/compilers/openjdk/11.nix | 6 +++---
 pkgs/development/compilers/openjdk/12.nix | 6 +++---
 pkgs/development/compilers/openjdk/13.nix | 6 +++---
 pkgs/development/compilers/openjdk/14.nix | 6 +++---
 pkgs/development/compilers/openjdk/15.nix | 6 +++---
 pkgs/development/compilers/openjdk/16.nix | 6 +++---
 pkgs/development/compilers/openjdk/17.nix | 6 +++---
 pkgs/development/compilers/openjdk/18.nix | 6 +++---
 pkgs/development/compilers/openjdk/19.nix | 6 +++---
 pkgs/development/compilers/openjdk/20.nix | 6 +++---
 pkgs/development/compilers/openjdk/21.nix | 6 +++---
 pkgs/development/compilers/openjdk/22.nix | 6 ------
 pkgs/development/compilers/openjdk/8.nix  | 6 +++---
 pkgs/top-level/java-packages.nix          | 8 ++------
 14 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 04df2d28a45c..32251fbd6d32 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -34,7 +34,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -88,7 +88,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index ab0696e172c0..82f6c219d75a 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -31,7 +31,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -84,7 +84,7 @@ let
     NIX_LDFLAGS = lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ];
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index 5d5d9f774771..947e3df4606f 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -31,7 +31,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -89,7 +89,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index 348fd3996c9f..2588108a6af7 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -31,7 +31,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -84,7 +84,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
index 2447b0783ca4..d816e2de0913 100644
--- a/pkgs/development/compilers/openjdk/15.nix
+++ b/pkgs/development/compilers/openjdk/15.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -34,7 +34,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -86,7 +86,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index 12ba5c9c16db..32486cef407d 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -36,7 +36,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -91,7 +91,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 1c9aee9af5e9..69ff1b316cd6 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -35,7 +35,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -108,7 +108,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix
index 5ce4ff8f5467..0aad5571d7f7 100644
--- a/pkgs/development/compilers/openjdk/18.nix
+++ b/pkgs/development/compilers/openjdk/18.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -35,7 +35,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -99,7 +99,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix
index 187d724b57b5..459d15d48fe7 100644
--- a/pkgs/development/compilers/openjdk/19.nix
+++ b/pkgs/development/compilers/openjdk/19.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -40,7 +40,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -110,7 +110,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix
index bdb7d057f263..8519b3ffb394 100644
--- a/pkgs/development/compilers/openjdk/20.nix
+++ b/pkgs/development/compilers/openjdk/20.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -38,7 +38,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -108,7 +108,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix
index 623ac281acf7..9db97ca5154f 100644
--- a/pkgs/development/compilers/openjdk/21.nix
+++ b/pkgs/development/compilers/openjdk/21.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk3, glib
 }:
 
 let
@@ -38,7 +38,7 @@ let
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+      gtk3 glib
     ];
 
     patches = [
@@ -102,7 +102,7 @@ let
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix
index 97d1a3b3b44d..bc4a26ca1816 100644
--- a/pkgs/development/compilers/openjdk/22.nix
+++ b/pkgs/development/compilers/openjdk/22.nix
@@ -40,9 +40,7 @@
 , openjfx
 , enableGnome2 ? true
 , gtk3
-, gnome_vfs
 , glib
-, GConf
 , writeShellScript
 }:
 
@@ -103,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     openjdk-bootstrap
   ] ++ lib.optionals (!headless && enableGnome2) [
     gtk3
-    gnome_vfs
-    GConf
     glib
   ];
 
@@ -176,8 +172,6 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals (!headless && enableGnome2) [
     "-lgtk-3"
     "-lgio-2.0"
-    "-lgnomevfs-2"
-    "-lgconf-2"
   ]);
 
   # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 70561d83f308..99815a92fbab 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -5,7 +5,7 @@
 , openjdk8-bootstrap
 , setJavaClassPath
 , headless ? false
-, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
+, enableGnome2 ? true, gtk2, glib
 }:
 
 let
@@ -44,7 +44,7 @@ let
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk2 gnome_vfs GConf glib
+      gtk2 glib
     ];
 
     patches = [
@@ -97,7 +97,7 @@ let
     NIX_LDFLAGS= toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
     ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+      "-lgtk-x11-2.0" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 2d59c358863b..51042ed4a47e 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -16,11 +16,7 @@ in {
 
   compiler = let
 
-    gnomeArgs = {
-      inherit (gnome2) GConf gnome_vfs;
-    };
-
-    bootstrapArgs = gnomeArgs // {
+    bootstrapArgs = {
       openjfx = openjfx11; /* need this despite next line :-( */
       enableJavaFX = false;
       headless = true;
@@ -62,7 +58,7 @@ in {
       in openjdk // { headless = openjdk; };
 
     mkOpenjdkLinuxOnly = path-linux: args: let
-      openjdk = callPackage path-linux  (gnomeArgs // args);
+      openjdk = callPackage path-linux (args);
     in assert stdenv.isLinux; openjdk // {
       headless = openjdk.override { headless = true; };
     };

From 92bc04eae7292d566b53453b00cb81de7e7c784a Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 26 Jun 2024 13:45:32 +0200
Subject: [PATCH 076/319] nodejs_20: 20.14.0 -> 20.15.0 (#321292)

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

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 1fb2d61fba21..2bc23d9c1fd3 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -8,8 +8,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.14.0";
-  sha256 = "sha256-CGVQKPDYQ26IFj+RhgRNY10/Nqhe5Sjza9BbbF5Gwbs=";
+  version = "20.15.0";
+  sha256 = "sha256-D0p6BRw12V65BejLKqQ8XUArExIDkI/mM+s8+gUO+Qc=";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch

From 3d4e7b461c0420b02ac68bdceb59b77a7953d92e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 26 Jun 2024 14:03:57 +0200
Subject: [PATCH 077/319] audit: apply patches unconditionally

---
 pkgs/os-specific/linux/audit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 846d21c56d83..7b243fe799e9 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-v0ItQSard6kqTDrDneVHPyeNw941ck0lGKSMe+FdVNg=";
   };
 
-  patches = lib.optionals (!stdenv.hostPlatform.isGnu) [
+  patches = [
     (fetchpatch {
       name = "musl.patch";
       url = "https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7.patch";

From b87367d6cea7958c14ec4e959af5d17629806503 Mon Sep 17 00:00:00 2001
From: ChaosAttractor <lostattractor@gmail.com>
Date: Sat, 22 Jun 2024 20:06:17 +0800
Subject: [PATCH 078/319] iproute2: add libbpf support

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++
 pkgs/os-specific/linux/iproute/default.nix        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 436ec7b18825..78315e969b94 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -157,3 +157,5 @@
   should be changed to using *runner authentication tokens* by configuring
   {option}`services.gitlab-runner.services.<name>.authenticationTokenConfigFile` instead of the former
   {option}`services.gitlab-runner.services.<name>.registrationConfigFile` option.
+
+- `iproute2` now has libbpf support.
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 15b8987b8cc0..0c00eea0e275 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl
 , buildPackages, bison, flex, pkg-config
-, db, iptables, elfutils, libmnl
+, db, iptables, elfutils, libmnl ,libbpf
 , gitUpdater
 }:
 
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
   nativeBuildInputs = [ bison flex pkg-config ];
-  buildInputs = [ db iptables libmnl ]
+  buildInputs = [ db iptables libmnl libbpf ]
     # needed to uploaded bpf programs
     ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ elfutils ];
 

From 35420c7d2478d02a43d5440ea1fa744c0b76d62c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Jun 2024 16:39:04 +0000
Subject: [PATCH 079/319] libsepol: 3.6 -> 3.7

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

diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 9c7f1abb3a4e..c1224a9dd57c 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libsepol";
-  version = "3.6";
+  version = "3.7";
   se_url = "https://github.com/SELinuxProject/selinux/releases/download";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
     url = "${se_url}/${version}/libsepol-${version}.tar.gz";
-    sha256 = "sha256-ydxYXqlJA9eE1ZfIYc1dzmRZFo+V4isxoOqxzdgAl1o=";
+    sha256 = "sha256-zXQeJSROfvbNk01jNhQTGiZsPq6rM9i/pF6Kk7RcyQE=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''

From 1e217f05a3b6b27d2f3e94ed8abd7d989753b6d5 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 26 Jun 2024 21:46:40 +0100
Subject: [PATCH 080/319] libdrm: 2.4.121 -> 2.4.122

Changes: https://lists.freedesktop.org/archives/dri-devel/2022-July/362994.html
---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 31e36be121b5..f4d54722327d 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.121";
+  version = "2.4.122";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-kJCEpQXXY4iH9ZC3B5Gzu9kGnHEMlI9dHxzm0IDN/Ks=";
+    hash = "sha256-2fUHm3d9/8qTAMzFaxCpNYjN+8nd4vrhEZQN+2KS8lE=";
   };
 
   outputs = [ "out" "dev" "bin" ];

From 0a4b34b2096276eed790b6d38656f328e0149e38 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 27 Jun 2024 01:04:03 +0200
Subject: [PATCH 081/319] kmod: backport patch for musl 1.2.5 (#322720)

This fixes a segfault that will break kernel builds when we update to
musl 1.2.5.
---
 pkgs/os-specific/linux/kmod/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 3f971e7a6edb..1ea3a90005b9 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, autoconf, automake, docbook_xml_dtd_42
+{ stdenv, lib, fetchzip, fetchpatch, autoconf, automake, docbook_xml_dtd_42
 , docbook_xml_dtd_43, docbook_xsl, gtk-doc, libtool, pkg-config
 , libxslt, xz, zstd, elf-header
 , withDevdoc ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -48,8 +48,14 @@ in stdenv.mkDerivation rec {
     (lib.enableFeature withDevdoc "gtk-doc")
   ] ++ lib.optional withStatic "--enable-static";
 
-  patches = [ ./module-dir.patch ]
-    ++ lib.optional withStatic ./enable-static.patch;
+  patches = [
+    ./module-dir.patch
+    (fetchpatch {
+      name = "musl.patch";
+      url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/patch/?id=11eb9bc67c319900ab00523997323a97d2d08ad2";
+      hash = "sha256-CYG615elMWces6QGQRg2H/NL7W4XsG9Zvz5H+xsdFFo=";
+    })
+  ] ++ lib.optional withStatic ./enable-static.patch;
 
   postInstall = ''
     for prog in rmmod insmod lsmod modinfo modprobe depmod; do

From 6ea4bc06ebfb94fa693f2afe1e4aaa28bd1d79f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Wed, 26 Jun 2024 20:20:05 -0400
Subject: [PATCH 082/319] libcanberra: enable systemd support

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

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 6bfb780d31a3..0a9aabf73123 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool
 , gtk2-x11, gtk3-x11 , gtkSupport ? null
-, libpulseaudio, gst_all_1, libvorbis, libcap
+, libpulseaudio, gst_all_1, libvorbis, libcap, systemd
 , Carbon, CoreServices, AppKit
 , withAlsa ? stdenv.isLinux, alsa-lib }:
 
@@ -24,10 +24,11 @@ stdenv.mkDerivation rec {
     ++ lib.optional (gtkSupport == "gtk2") gtk2-x11
     ++ lib.optional (gtkSupport == "gtk3") gtk3-x11
     ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ]
-    ++ lib.optional stdenv.isLinux libcap
+    ++ lib.optionals stdenv.isLinux [ libcap systemd ]
     ++ lib.optional withAlsa alsa-lib;
 
-  configureFlags = [ "--disable-oss" ];
+  configureFlags = [ "--disable-oss" ]
+    ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system";
 
   patches = [
     (fetchpatch {

From 0774766ffe9cb1304d69cbb4f4b8fb261900b258 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 27 Jun 2024 09:31:04 +0200
Subject: [PATCH 083/319] openjdk: rename enableGnome2 to enableGtk

GNOME 2 dependencies were removed in the previous commit.

gtk3 and glib are used to provide GTK look and feel.
glib is also used for proxy settings but it probably does not make much sense
to have a separate option, since disjoint union with GTK-based environments is small.
---
 pkgs/development/compilers/openjdk/11.nix | 8 ++++----
 pkgs/development/compilers/openjdk/12.nix | 8 ++++----
 pkgs/development/compilers/openjdk/13.nix | 8 ++++----
 pkgs/development/compilers/openjdk/14.nix | 8 ++++----
 pkgs/development/compilers/openjdk/15.nix | 8 ++++----
 pkgs/development/compilers/openjdk/16.nix | 8 ++++----
 pkgs/development/compilers/openjdk/17.nix | 8 ++++----
 pkgs/development/compilers/openjdk/18.nix | 8 ++++----
 pkgs/development/compilers/openjdk/19.nix | 8 ++++----
 pkgs/development/compilers/openjdk/20.nix | 8 ++++----
 pkgs/development/compilers/openjdk/21.nix | 8 ++++----
 pkgs/development/compilers/openjdk/22.nix | 8 ++++----
 pkgs/development/compilers/openjdk/8.nix  | 8 ++++----
 13 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 32251fbd6d32..d4fde704985b 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -33,7 +33,7 @@ let
       cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -51,7 +51,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk10.patch
     ];
 
@@ -87,7 +87,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 82f6c219d75a..3f7213ea8ff6 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -30,7 +30,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -52,7 +52,7 @@ let
         url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
         sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk10.patch
     ];
 
@@ -83,7 +83,7 @@ let
 
     NIX_LDFLAGS = lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ];
 
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index 947e3df4606f..292470256d53 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -30,7 +30,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -52,7 +52,7 @@ let
         url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
         sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -88,7 +88,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index 2588108a6af7..5d540b6fe84f 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -30,7 +30,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -47,7 +47,7 @@ let
         url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
         sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -83,7 +83,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
index d816e2de0913..4fc475edba64 100644
--- a/pkgs/development/compilers/openjdk/15.nix
+++ b/pkgs/development/compilers/openjdk/15.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -33,7 +33,7 @@ let
       cpio perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -50,7 +50,7 @@ let
         url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
         sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -85,7 +85,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index 32486cef407d..357cbb849aba 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -35,7 +35,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -53,7 +53,7 @@ let
         sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
       })
       ./fix-glibc-2.34.patch
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -90,7 +90,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 69ff1b316cd6..09f3518880ef 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -34,7 +34,7 @@ let
       cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -69,7 +69,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -107,7 +107,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix
index 0aad5571d7f7..e798317f8aa5 100644
--- a/pkgs/development/compilers/openjdk/18.nix
+++ b/pkgs/development/compilers/openjdk/18.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -34,7 +34,7 @@ let
       cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -60,7 +60,7 @@ let
         url = "https://git.alpinelinux.org/aports/plain/testing/openjdk18/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f";
         hash = "sha256-nvO8RcmKwMcPdzq28mZ4If1XJ6FQ76CYWqRIozPCk5U=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -98,7 +98,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix
index 459d15d48fe7..dd01d19bcfbd 100644
--- a/pkgs/development/compilers/openjdk/19.nix
+++ b/pkgs/development/compilers/openjdk/19.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -39,7 +39,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -73,7 +73,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -109,7 +109,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix
index 8519b3ffb394..9726be71293f 100644
--- a/pkgs/development/compilers/openjdk/20.nix
+++ b/pkgs/development/compilers/openjdk/20.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -37,7 +37,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -71,7 +71,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -107,7 +107,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix
index 9db97ca5154f..3e51cedcedfd 100644
--- a/pkgs/development/compilers/openjdk/21.nix
+++ b/pkgs/development/compilers/openjdk/21.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, glib
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -37,7 +37,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk3 glib
     ];
 
@@ -64,7 +64,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -101,7 +101,7 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-3" "-lgio-2.0"
     ]);
 
diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix
index bc4a26ca1816..9d682c30be43 100644
--- a/pkgs/development/compilers/openjdk/22.nix
+++ b/pkgs/development/compilers/openjdk/22.nix
@@ -38,7 +38,7 @@
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false
 , openjfx
-, enableGnome2 ? true
+, enableGtk ? true
 , gtk3
 , glib
 , writeShellScript
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     fontconfig
     openjdk-bootstrap
-  ] ++ lib.optionals (!headless && enableGnome2) [
+  ] ++ lib.optionals (!headless && enableGtk) [
     gtk3
     glib
   ];
@@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
       hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
     })
-  ] ++ lib.optionals (!headless && enableGnome2) [
+  ] ++ lib.optionals (!headless && enableGtk) [
     ./swing-use-gtk-jdk13.patch
   ];
 
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-lXinerama"
     "-lXrandr"
     "-lmagic"
-  ] ++ lib.optionals (!headless && enableGnome2) [
+  ] ++ lib.optionals (!headless && enableGtk) [
     "-lgtk-3"
     "-lgio-2.0"
   ]);
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 99815a92fbab..8a97c7277f60 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -5,7 +5,7 @@
 , openjdk8-bootstrap
 , setJavaClassPath
 , headless ? false
-, enableGnome2 ? true, gtk2, glib
+, enableGtk ? true, gtk2, glib
 }:
 
 let
@@ -43,7 +43,7 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       gtk2 glib
     ];
 
@@ -52,7 +52,7 @@ let
       ./read-truststore-from-env-jdk8.patch
       ./currency-date-range-jdk8.patch
       ./fix-library-path-jdk8.patch
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk8.patch
     ];
 
@@ -96,7 +96,7 @@ let
 
     NIX_LDFLAGS= toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       "-lgtk-x11-2.0" "-lgio-2.0"
     ]);
 

From b68dd007fa2708e505e142751e2c8c1c8c50018d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 27 Jun 2024 01:11:16 +0200
Subject: [PATCH 084/319] python312Packages.brotli: fix src FOD hash

Fixes the hash, because we were using the wrong fetcher in update-python-
libraries.
---
 pkgs/development/python-modules/brotli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index afe4e9e3fd70..78840a245cea 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "google";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc=";
+    hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM=";
     # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
     forceFetchGit = true;
   };

From 48f68c20546949d31d56e3d68b648636f4f5094c Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Thu, 27 Jun 2024 11:16:35 +0200
Subject: [PATCH 085/319] python3Packages.asgiref: 3.7.2 -> 3.8.1

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

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 10cfbf571b30..f83e311d7c4a 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.7.2";
+  version = "3.8.1";
   pname = "asgiref";
   format = "setuptools";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "asgiref";
     rev = "refs/tags/${version}";
-    hash = "sha256-VW1PBh6+nLMD7qxmL83ymuxCPYKVY3qGKsB7ZiMqMu8=";
+    hash = "sha256-xepMbxglBpHL7mnJYlnvNUgixrFwf/Tc6b1zL4Wy+to=";
   };
 
   propagatedBuildInputs = [ typing-extensions ];

From cd0000cc68935ae1dc6b0a0260d7b013989c5fd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Jun 2024 14:08:49 +0000
Subject: [PATCH 086/319] libjxl: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix
index 1b0888348c59..4ae2657de914 100644
--- a/pkgs/development/libraries/libjxl/default.nix
+++ b/pkgs/development/libraries/libjxl/default.nix
@@ -27,7 +27,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libjxl";
-  version = "0.10.2";
+  version = "0.10.3";
 
   outputs = [ "out" "dev" ];
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     owner = "libjxl";
     repo = "libjxl";
     rev = "v${version}";
-    hash = "sha256-Ip/5fbzt6OfIrHJajnxEe14ppvX1hJ1FSJUBEE/h5YQ=";
+    hash = "sha256-zk/fI1C26K5WC9QBfzS6MqPT9PiR4wmWURjOOIiNsg4=";
     # There are various submodules in `third_party/`.
     fetchSubmodules = true;
   };

From 8a19e84bc41970f0576403c2f29ea31df07c5b91 Mon Sep 17 00:00:00 2001
From: Michael Paepcke <git@paepcke.de>
Date: Thu, 27 Jun 2024 16:54:29 +0000
Subject: [PATCH 087/319] linux: enable CONFIG_BT_HCIUART_BCM

Add linux kernel support for Broadcom Bluetooth HCI_SERIAL Interface.  This will unlock on-board Bluetooth for some 2016-2019 Apple Intel Hardware Series (iMac, MacBookAir, MacBookPro) - tested on MacBookPro14,1
---
 pkgs/os-specific/linux/kernel/common-config.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 551d4cffbb92..140d2b0f5b58 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1011,12 +1011,15 @@ let
       SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices
 
       BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
-      BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support
+
+      BT_HCIUART        = module; # required for BT devices with serial port interface (QCA6390)
+      BT_HCIUART_BCM    = option yes; # Broadcom Bluetooth support
+      BT_HCIUART_BCSP   = option yes; # CSR BlueCore support
+      BT_HCIUART_H4     = option yes; # UART (H4) protocol support
+      BT_HCIUART_LL     = option yes; # Texas Instruments BRF
+      BT_HCIUART_QCA    = yes; # Qualcomm Atheros support
       BT_HCIUART_SERDEV = yes; # required by BT_HCIUART_QCA
-      BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390)
-      BT_HCIUART_BCSP = option yes;
-      BT_HCIUART_H4   = option yes; # UART (H4) protocol support
-      BT_HCIUART_LL   = option yes;
+
       BT_RFCOMM_TTY   = option yes; # RFCOMM TTY support
       BT_QCA = module; # enables QCA6390 bluetooth
 

From 14d17610a912a810741c58ae2498d540179f5215 Mon Sep 17 00:00:00 2001
From: Michael Paepcke <git@paepcke.de>
Date: Thu, 27 Jun 2024 17:08:50 +0000
Subject: [PATCH 088/319] linux: enable CONFIG_SND_HDA_CODEC_CS8409

Add linux kernel support for Cirrus Logic CS8409 as module.

This will for example unlock on-board Sound for some 2016-2019 Apple Intel Hardware Series (iMac, MacBookAir, MacBookPro) - tested on MacBookPro14,1
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 551d4cffbb92..e15ff79536a4 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -511,6 +511,7 @@ let
       # Support configuring jack functions via fw mechanism at boot
       SND_HDA_PATCH_LOADER = yes;
       SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
+      SND_HDA_CODEC_CS8409 = module; # Cirrus Logic HDA Bridge CS8409
       SND_OSSEMUL         = yes;
       SND_USB_CAIAQ_INPUT = yes;
       SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;

From a63b515bdf447c4290b0274f7da575e35c622d26 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 27 Jun 2024 22:03:44 +0100
Subject: [PATCH 089/319] libinput: 1.26.0 -> 1.26.1

Changes: https://lists.freedesktop.org/archives/wayland-devel/2024-June/043682.html
---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 4f7e652e9bb8..1628cb679d22 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -45,7 +45,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.26.0";
+  version = "1.26.1";
 
   outputs = [ "bin" "out" "dev" ];
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     owner = "libinput";
     repo = "libinput";
     rev = version;
-    hash = "sha256-mlxw4OUjaAdgRLFfPKMZDMOWosW9yKAkzDccwuLGCwQ=";
+    hash = "sha256-3iWKqg9HSicocDAyp1Lk87nBbj+Slg1/e1VKEOIQkyQ=";
   };
 
   patches = [

From ef9be5ddebbc7aac8510d4d3f3a16810f6b944e7 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 27 Jun 2024 22:13:47 +0100
Subject: [PATCH 090/319] krb5: 1.21.2 -> 1.21.3

Changes: https://github.com/krb5/krb5/compare/krb5-1.21.2-final...krb5-1.21.3-final
---
 pkgs/development/libraries/kerberos/krb5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 8dd68af4fd1d..7a51d454cf14 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -31,11 +31,11 @@ assert withLdap -> !libOnly;
 
 stdenv.mkDerivation rec {
   pname = "${type}krb5";
-  version = "1.21.2";
+  version = "1.21.3";
 
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz";
-    hash = "sha256-lWCUGp2EPAJDpxsXp6xv4xx867W845g9t55Srn6FBJE=";
+    hash = "sha256-t6TNXq1n+wi5gLIavRUP9yF+heoyDJ7QxtrdMEhArTU=";
   };
 
   outputs = [ "out" "dev" ];

From f814e5cb8f08ef2687595ba03a0d9c8511a3ddfe Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Fri, 28 Jun 2024 08:01:31 +0200
Subject: [PATCH 091/319] Revert "trivial: make pkgs.writeText always fixed
 output"

This reverts commit 9f4b1064c6c9464194eb47cca6f2f42bdbd5c6da.

It caused problems: https://github.com/NixOS/nixpkgs/pull/318872#issuecomment-2196168990

FODs are not allowed to have references, but writeText is often used to create a file with references.

Leading to this error:

error: fixed output derivation 'packages.json' is not allowed to refer to other store paths.
---
 pkgs/build-support/trivial-builders/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 2cc4a4e48ff9..ac3898117e8c 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -133,14 +133,7 @@ rec {
       pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.'';
     lib.warnIf (! lib.isString text) ''
       pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first.''
-    writeTextFile {
-      inherit name text;
-      derivationArgs = rec {
-        outputHashAlgo = "sha256";
-        outputHashMode = "flat";
-        outputHash = builtins.hashString outputHashAlgo (builtins.toString text);
-      };
-    };
+    writeTextFile { inherit name text; };
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing

From a54099c1b85e14bf57e13edb55dfe4879b8efb5d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Fri, 28 Jun 2024 11:52:39 +0200
Subject: [PATCH 092/319] nodejs_18: 18.20.2 -> 18.20.3 (#316262)

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

diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 7f80e2070f38..429e50a02bbf 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -19,8 +19,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "18.20.2";
-  sha256 = "sha256-iq6nycfpJ/sJ2RSY2jEbbk0YIzOQ4jxyOlO4kfrUxz8=";
+  version = "18.20.3";
+  sha256 = "sha256-SxRPn9auSx1itzLFsxYOe56EvkrwrgYse0hOiepBro0=";
   patches = [
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch

From 98e868a0949afab2d375a292910bfe60b0242955 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Jun 2024 20:33:46 +0000
Subject: [PATCH 093/319] s2n-tls: 1.4.16 -> 1.4.17

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

diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix
index d4a440e587c1..84785959acad 100644
--- a/pkgs/development/libraries/s2n-tls/default.nix
+++ b/pkgs/development/libraries/s2n-tls/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.4.16";
+  version = "1.4.17";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-HkpOd05/5YIDsBm4L3hLuI0obm7uAwsV1dC2/e2f5aw=";
+    hash = "sha256-Go6p+6VidsoN7IMfBp7BMGnIcttaEA0q3CRAKDO5b+c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3beb1da1931e2f613c1f1e13cfa4d6285751027b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 29 Jun 2024 03:47:59 +0200
Subject: [PATCH 094/319] nss: 3.90.2 -> 3.101.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_101.rst
https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_101_1.rst
---
 pkgs/development/libraries/nss/esr.nix        |  4 +-
 pkgs/development/libraries/nss/generic.nix    |  4 --
 .../libraries/nss/remove-c25519-support.patch | 69 -------------------
 3 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/development/libraries/nss/remove-c25519-support.patch

diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index 95c9aa0e1997..2473ee1dd4d8 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "3.90.2";
-  hash = "sha256-4r/LhKilkSeEhw/rl2IRAn5xMJ74W5ACg7fX0e4GQxA=";
+  version = "3.101.1";
+  hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
 }
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index b0a633869abc..35e609521f0d 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -46,10 +46,6 @@ stdenv.mkDerivation rec {
     # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
     ./85_security_load_3.85+.patch
     ./fix-cross-compilation.patch
-  ] ++ lib.optionals (lib.versionOlder version "3.91") [
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925
-    # https://phabricator.services.mozilla.com/D180068
-    ./remove-c25519-support.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/nss/remove-c25519-support.patch b/pkgs/development/libraries/nss/remove-c25519-support.patch
deleted file mode 100644
index d5dba016278f..000000000000
--- a/pkgs/development/libraries/nss/remove-c25519-support.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 74e8e65..aa9dd95 100644
---- nss/lib/freebl/Makefile
-+++ nss/lib/freebl/Makefile
-@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-     else ifeq (1,$(CC_IS_GCC))
--        SUPPORTS_VALE_CURVE25519 = 1
-         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-@@ -593,11 +592,6 @@ ifndef HAVE_INT128_SUPPORT
-     DEFINES += -DKRML_VERIFIED_UINT128
- endif
- 
--ifdef SUPPORTS_VALE_CURVE25519
--    VERIFIED_SRCS += Hacl_Curve25519_64.c
--    DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
--endif
--
- ifndef NSS_DISABLE_CHACHAPOLY
-     ifeq ($(CPU_ARCH),x86_64)
-         ifndef NSS_DISABLE_AVX2
-diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp
-index 65f9a80..23940ef 100644
---- nss/lib/freebl/freebl.gyp
-+++ nss/lib/freebl/freebl.gyp
-@@ -866,12 +866,6 @@
-           }],
-         ],
-       }],
--      [ 'supports_vale_curve25519==1', {
--        'defines': [
--          # The Makefile does version-tests on GCC, but we're not doing that here.
--          'HACL_CAN_COMPILE_INLINE_ASM',
--        ],
--      }],
-       [ 'OS=="linux" or OS=="android"', {
-         'conditions': [
-           [ 'target_arch=="x64"', {
-@@ -934,11 +928,6 @@
-   'variables': {
-     'module': 'nss',
-     'conditions': [
--      [ 'target_arch=="x64" and cc_is_gcc==1', {
--        'supports_vale_curve25519%': 1,
--      }, {
--        'supports_vale_curve25519%': 0,
--      }],
-       [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
-         'have_int128_support%': 1,
-       }, {
-diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi
-index d198c44..34b6b3c 100644
---- nss/lib/freebl/freebl_base.gypi
-+++ nss/lib/freebl/freebl_base.gypi
-@@ -151,11 +151,6 @@
-         'ecl/curve25519_32.c',
-       ],
-     }],
--    ['supports_vale_curve25519==1', {
--      'sources': [
--        'verified/Hacl_Curve25519_64.c',
--      ],
--    }],
-     ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
-       'sources': [
-         # Gyp does not support per-file cflags, so working around like this.

From b528eac1873635d7c6cdf2dcc6a86bae694de3b5 Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Wed, 19 Jun 2024 05:37:06 +0000
Subject: [PATCH 095/319] watchman: fix build with rustc >= 1.79

---
 pkgs/development/tools/watchman/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 213aa3f8798e..b60872dce673 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -9,6 +9,7 @@
 , fb303
 , fbthrift
 , fetchFromGitHub
+, fetchpatch
 , fizz
 , fmt_8
 , folly
@@ -91,6 +92,14 @@ stdenv.mkDerivation rec {
     lockFile = ./Cargo.lock;
   };
 
+  patches = [
+    # fix build with rustc >=1.79
+    (fetchpatch {
+      url = "https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883.patch";
+      hash = "sha256-lpGr5H28gfVXkWNdfDo4SCbF/p5jB4SNlHj6km/rfw4=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs .
     cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock

From c5e1c7505cfeebc3261e3118b46f1ce0287fbe54 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 18 May 2024 21:56:23 +0100
Subject: [PATCH 096/319] svt-av1: 2.0.0 -> 2.1.2

Changes:
- https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases/v2.1.0
- https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases/v2.1.1
- https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases/v2.1.2
---
 pkgs/tools/video/svt-av1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix
index d84200c3847c..4ffa2892195c 100644
--- a/pkgs/tools/video/svt-av1/default.nix
+++ b/pkgs/tools/video/svt-av1/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "svt-av1";
-  version = "2.0.0";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     owner = "AOMediaCodec";
     repo = "SVT-AV1";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yfKnkO8GPmMpTWTVYDliERouSFgQPe3CfJmVussxfHY=";
+    hash = "sha256-jrfnUcDTbrf3wWs0D57ueeLmndhpOQChM7gBB14MzcQ=";
   };
 
   nativeBuildInputs = [

From e2cb76e4ce18ad1992d21959ce9b63dbce825d8f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 29 Jun 2024 20:26:32 +1000
Subject: [PATCH 097/319] go: drop gccgo bootstrap, drop autoPatchelfHook from
 bootstrap (#322825)

bootstrap binaries are static since 1.21

Co-authored-by: Ivan Trubach <mr.trubach@icloud.com>
---
 pkgs/development/compilers/go/1.21.nix   | 5 ++---
 pkgs/development/compilers/go/1.22.nix   | 5 ++---
 pkgs/development/compilers/go/1.23.nix   | 5 ++---
 pkgs/development/compilers/go/binary.nix | 4 +---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix
index 312106f6388c..c751b8f9dc59 100644
--- a/pkgs/development/compilers/go/1.21.nix
+++ b/pkgs/development/compilers/go/1.21.nix
@@ -17,8 +17,7 @@
 }:
 
 let
-  useGccGoBootstrap = stdenv.buildPlatform.isMusl;
-  goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
+  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
 
   skopeoTest = skopeo.override { buildGoModule = buildGo121Module; };
 
@@ -115,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
   GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
 
-  GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix
index 17681b24a31f..821cd534e83f 100644
--- a/pkgs/development/compilers/go/1.22.nix
+++ b/pkgs/development/compilers/go/1.22.nix
@@ -17,8 +17,7 @@
 }:
 
 let
-  useGccGoBootstrap = stdenv.buildPlatform.isMusl;
-  goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
+  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
 
   skopeoTest = skopeo.override { buildGoModule = buildGo122Module; };
 
@@ -117,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Wasi does not support CGO
   CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
 
-  GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix
index 5660710f049f..4ecda08412ce 100644
--- a/pkgs/development/compilers/go/1.23.nix
+++ b/pkgs/development/compilers/go/1.23.nix
@@ -17,8 +17,7 @@
 }:
 
 let
-  useGccGoBootstrap = stdenv.buildPlatform.isMusl;
-  goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
+  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
 
   skopeoTest = skopeo.override { buildGoModule = buildGo123Module; };
 
@@ -117,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Wasi does not support CGO
   CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
 
-  GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix
index 3b4e8010d27e..cd2e429e704a 100644
--- a/pkgs/development/compilers/go/binary.nix
+++ b/pkgs/development/compilers/go/binary.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, version, hashes, autoPatchelfHook }:
+{ lib, stdenv, fetchurl, version, hashes }:
 let
   toGoKernel = platform:
     if platform.isDarwin then "darwin"
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}");
   };
 
-  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
-
   # We must preserve the signature on Darwin
   dontStrip = stdenv.hostPlatform.isDarwin;
 

From 4f8de0d5512a4a25448bf2c6588fc401139ff5c7 Mon Sep 17 00:00:00 2001
From: siddharth-narayan <siddharth.060605@gmail.com>
Date: Fri, 28 Jun 2024 22:03:13 -0400
Subject: [PATCH 098/319] cmake: Add -type f filter to find command

This commit adds the -type f filter to the find command. Previously, -type f
only applied to the first file name: *.cmake. The -o command means that -type f
has to be added back for the other file names.
---
 pkgs/by-name/cm/cmake/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index b28ed42b6896..b9abeea23222 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -5,7 +5,7 @@ addCMakeParams() {
 fixCmakeFiles() {
     # Replace occurences of /usr and /opt by /var/empty.
     echo "fixing cmake files..."
-    find "$1" \( -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print |
+    find "$1" \( -type f -name "*.cmake" -o -type f -name "*.cmake.in" -o -type f -name CMakeLists.txt \) -print |
         while read fn; do
             sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp"
             mv "$fn.tmp" "$fn"

From f2f7ea87e8e97e20ea21b8125eda3d6845ebcdcb Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Tue, 4 Jun 2024 07:13:46 +0300
Subject: [PATCH 099/319] nodejs: fix impure configure phase

When running configurePhase from impure build environment (i.e. nix
develop), default ./configure script was selecting wrong, impure Python
installation.
https://github.com/nodejs/node/blob/d57af10d1be390f4e33e6efe596133de9da36c86/configure#L7-L15
---
 pkgs/development/web/nodejs/nodejs.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 106eaabd1e62..8abca9d24ca4 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -60,8 +60,6 @@ let
       NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300";
     };
 
-    CC_host = "cc";
-    CXX_host = "c++";
     depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ];
 
     # NB: technically, we do not need bash in build inputs since all scripts are
@@ -106,6 +104,11 @@ let
 
     dontDisableStatic = true;
 
+    configureScript = writeScript "nodejs-configure" ''
+      export CC_host="$CC_FOR_BUILD" CXX_host="$CXX_FOR_BUILD"
+      exec ${python.executable} configure.py "$@"
+    '';
+
     enableParallelBuilding = true;
 
     # Don't allow enabling content addressed conversion as `nodejs`

From 484dd2f92f13113c2c5367952d19c7733c60d7d8 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 18 Dec 2023 19:30:29 +0100
Subject: [PATCH 100/319] addOpenGLRunpath: deprecate

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../add-opengl-runpath/default.nix            | 12 --------
 .../add-opengl-runpath/setup-hook.sh          | 29 -------------------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  4 ---
 4 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/build-support/add-opengl-runpath/default.nix
 delete mode 100644 pkgs/build-support/add-opengl-runpath/setup-hook.sh

diff --git a/pkgs/build-support/add-opengl-runpath/default.nix b/pkgs/build-support/add-opengl-runpath/default.nix
deleted file mode 100644
index 5cab0937e074..000000000000
--- a/pkgs/build-support/add-opengl-runpath/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ lib, stdenv }:
-
-stdenv.mkDerivation {
-  name = "add-opengl-runpath";
-
-  driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
-
-  buildCommand = ''
-    mkdir -p $out/nix-support
-    substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
-  '';
-}
diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh
deleted file mode 100644
index e556e7ead2a7..000000000000
--- a/pkgs/build-support/add-opengl-runpath/setup-hook.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
-# This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid
-# executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run
-# in postFixup because RUNPATH stripping in fixup would undo it. Note that patchelf
-# actually sets RUNPATH not RPATH, which applies only to dependencies of the binary
-# it set on (including for dlopen), so the RUNPATH must indeed be set on these
-# libraries and would not work if set only on executables.
-addOpenGLRunpath() {
-    local forceRpath=
-
-    while [ $# -gt 0 ]; do
-        case "$1" in
-            --) shift; break;;
-            --force-rpath) shift; forceRpath=1;;
-            --*)
-                echo "addOpenGLRunpath: ERROR: Invalid command line" \
-                     "argument: $1" >&2
-                return 1;;
-            *) break;;
-        esac
-    done
-
-    for file in "$@"; do
-        if ! isELF "$file"; then continue; fi
-        local origRpath="$(patchelf --print-rpath "$file")"
-        patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file"
-    done
-}
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8a5e10e86faf..2cbf4cdae0d3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -69,6 +69,8 @@ mapAliases ({
   adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
   adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29
+  # Post 24.11 branch-off, this should throw an error
+  addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25
   aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03
   afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
   airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd60e1a1ab3c..49391a0f6d5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -226,10 +226,6 @@ with pkgs;
   # many more scenarios than just opengl now.
   addDriverRunpath = callPackage ../build-support/add-driver-runpath { };
 
-  # addOpenGLRunpath should be added to aliases.nix after the 24.05 branch-off.
-  # Post 24.11 branch-off, this should throw an error in aliases.nix.
-  addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
-
   quickgui = callPackage ../applications/virtualization/quickgui { };
 
   adcli = callPackage ../os-specific/linux/adcli { };

From 416ba8804bf31201778202a2bfc33c9cfaaf602b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 18 Dec 2023 19:34:35 +0100
Subject: [PATCH 101/319] treewide: use addDriverRunpath

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 nixos/modules/programs/nix-required-mounts.nix         |  4 ++--
 pkgs/applications/emulators/darling/default.nix        |  4 ++--
 pkgs/applications/graphics/seamly2d/default.nix        |  4 ++--
 pkgs/applications/misc/blender/default.nix             |  6 +++---
 pkgs/applications/misc/firestarter/default.nix         |  6 +++---
 pkgs/applications/misc/gpu-burn/default.nix            |  6 +++---
 .../networking/browsers/brave/make-brave.nix           |  4 ++--
 .../networking/instant-messengers/feishu/default.nix   |  4 ++--
 pkgs/applications/science/math/mathematica/generic.nix | 10 +++++-----
 pkgs/applications/video/davinci-resolve/default.nix    |  8 ++++----
 pkgs/applications/video/mpv/default.nix                |  8 ++++----
 pkgs/applications/video/obs-studio/default.nix         |  8 ++++----
 .../virtualization/libnvidia-container/default.nix     |  4 ++--
 pkgs/by-name/ce/cemu/package.nix                       |  4 ++--
 pkgs/by-name/go/google-chrome/package.nix              |  4 ++--
 pkgs/by-name/mo/modrinth-app/package.nix               |  4 ++--
 pkgs/by-name/ni/nix-required-mounts/package.nix        |  4 ++--
 pkgs/by-name/pr/prismlauncher/package.nix              |  4 ++--
 pkgs/by-name/te/tetrio-desktop/package.nix             |  4 ++--
 .../cuda-modules/cuda-library-samples/generic.nix      |  6 +++---
 pkgs/development/cuda-modules/cudatoolkit/default.nix  |  4 ++--
 pkgs/development/libraries/ffmpeg/generic.nix          | 10 +++++-----
 pkgs/development/libraries/gstreamer/bad/default.nix   |  4 ++--
 pkgs/development/libraries/level-zero/default.nix      |  6 +++---
 pkgs/development/libraries/libglvnd/default.nix        | 10 +++++-----
 pkgs/development/libraries/mdk-sdk/default.nix         |  4 ++--
 .../libraries/nvidia-vaapi-driver/default.nix          |  6 +++---
 pkgs/development/libraries/ocl-icd/default.nix         |  2 +-
 pkgs/development/libraries/openvino/default.nix        |  6 +++---
 .../libraries/science/chemistry/openmm/default.nix     |  6 +++---
 .../libraries/science/math/faiss/default.nix           |  8 ++++----
 .../libraries/science/math/libtorch/bin.nix            |  6 +++---
 pkgs/development/libraries/vulkan-loader/default.nix   |  4 ++--
 pkgs/development/libraries/webkitgtk/default.nix       |  4 ++--
 pkgs/development/python-modules/cupy/default.nix       |  6 +++---
 pkgs/development/python-modules/jaxlib/default.nix     |  2 +-
 .../development/python-modules/libgpuarray/default.nix |  6 +++---
 .../python-modules/nvidia-ml-py/default.nix            |  4 ++--
 pkgs/development/python-modules/openai-triton/bin.nix  |  4 ++--
 .../python-modules/paddlepaddle/default.nix            |  6 +++---
 pkgs/development/python-modules/pycuda/default.nix     |  6 +++---
 pkgs/development/python-modules/pynvml/default.nix     |  4 ++--
 pkgs/development/python-modules/tensorflow/bin.nix     |  6 +++---
 pkgs/development/python-modules/tensorflow/default.nix | 10 +++++-----
 pkgs/development/python-modules/torch/bin.nix          |  4 ++--
 pkgs/development/python-modules/torchaudio/bin.nix     |  4 ++--
 pkgs/development/python-modules/torchvision/bin.nix    |  4 ++--
 pkgs/development/tools/hover/default.nix               |  6 +++---
 pkgs/development/tools/renderdoc/default.nix           |  6 +++---
 pkgs/os-specific/linux/nvidia-x11/settings.nix         |  6 +++---
 pkgs/servers/hqplayerd/default.nix                     |  8 ++++----
 pkgs/tools/graphics/mangohud/default.nix               |  8 ++++----
 pkgs/tools/graphics/vulkan-helper/default.nix          |  6 +++---
 pkgs/tools/misc/geekbench/4.nix                        |  4 ++--
 pkgs/tools/misc/geekbench/5.nix                        |  4 ++--
 pkgs/tools/misc/geekbench/6.nix                        |  4 ++--
 pkgs/tools/security/hashcat/default.nix                |  6 +++---
 pkgs/tools/system/nvtop/build-nvtop.nix                |  6 +++---
 58 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix
index 5d25958a7698..5064d6aaf575 100644
--- a/nixos/modules/programs/nix-required-mounts.nix
+++ b/nixos/modules/programs/nix-required-mounts.nix
@@ -47,7 +47,7 @@ let
     );
 
   driverPaths = [
-    pkgs.addOpenGLRunpath.driverLink
+    pkgs.addDriverRunpath.driverLink
 
     # mesa:
     config.hardware.opengl.package
@@ -84,7 +84,7 @@ in
           {
             opengl.paths = config.hardware.opengl.extraPackages ++ [
               config.hardware.opengl.package
-              pkgs.addOpenGLRunpath.driverLink
+              pkgs.addDriverRunpath.driverLink
               "/dev/dri"
             ];
           }
diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix
index a5fe1021e917..3d396e07e359 100644
--- a/pkgs/applications/emulators/darling/default.nix
+++ b/pkgs/applications/emulators/darling/default.nix
@@ -38,7 +38,7 @@
 
 , xdg-user-dirs
 
-, addOpenGLRunpath
+, addDriverRunpath
 
 # Whether to pre-compile Python 2 bytecode for performance.
 , compilePy2Bytecode ? false
@@ -217,7 +217,7 @@ in stdenv.mkDerivation {
       exit 1
     fi
 
-    patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addOpenGLRunpath.driverLink}/lib" \
+    patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addDriverRunpath.driverLink}/lib" \
       $out/libexec/darling/usr/libexec/darling/mldr
   '';
 
diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix
index bd8316b953f0..5742d58d0af9 100644
--- a/pkgs/applications/graphics/seamly2d/default.nix
+++ b/pkgs/applications/graphics/seamly2d/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
-  addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
+  addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
   fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git
 }:
 let
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     xvfb-run
     fontconfig
     wrapQtAppsHook
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 0033d3e1bd2a..31eaef04912f 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -5,7 +5,7 @@
   OpenAL,
   OpenGL,
   SDL,
-  addOpenGLRunpath,
+  addDriverRunpath,
   alembic,
   blender,
   boost,
@@ -200,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: {
       python3Packages.wrapPython
     ]
     ++ lib.optionals cudaSupport [
-      addOpenGLRunpath
+      addDriverRunpath
       cudaPackages.cuda_nvcc
     ]
     ++ lib.optionals waylandSupport [ pkg-config ];
@@ -323,7 +323,7 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = lib.optionalString cudaSupport ''
     for program in $out/bin/blender $out/bin/.blender-wrapped; do
       isELF "$program" || continue
-      addOpenGLRunpath "$program"
+      addDriverRunpath "$program"
     done
   ''
   + lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix
index a8372b643bd3..8eb001e9c93b 100644
--- a/pkgs/applications/misc/firestarter/default.nix
+++ b/pkgs/applications/misc/firestarter/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchFromGitHub
 , fetchzip
-, addOpenGLRunpath
+, addDriverRunpath
 , cmake
 , glibc_multi
 , glibc
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     git
     pkg-config
   ] ++ lib.optionals withCuda [
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   buildInputs = [ hwloc ] ++ (if withCuda then
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = lib.optionalString withCuda ''
-    addOpenGLRunpath $out/bin/FIRESTARTER_CUDA
+    addDriverRunpath $out/bin/FIRESTARTER_CUDA
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix
index eaf0fc44d29d..97d6b674d5e5 100644
--- a/pkgs/applications/misc/gpu-burn/default.nix
+++ b/pkgs/applications/misc/gpu-burn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }:
+{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }:
 
 stdenv.mkDerivation {
   pname = "gpu-burn";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ cudatoolkit ];
 
-  nativeBuildInputs = [ addOpenGLRunpath ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   '';
 
   postFixup = ''
-    addOpenGLRunpath $out/bin/gpu_burn
+    addDriverRunpath $out/bin/gpu_burn
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix
index f0b9fb6cf0c6..e0590b193fda 100644
--- a/pkgs/applications/networking/browsers/brave/make-brave.nix
+++ b/pkgs/applications/networking/browsers/brave/make-brave.nix
@@ -62,7 +62,7 @@
 
 # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
 , vulkanSupport ? false
-, addOpenGLRunpath
+, addDriverRunpath
 , enableVulkan ? vulkanSupport
 }:
 
@@ -187,7 +187,7 @@ stdenv.mkDerivation {
       ''}
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
       ${optionalString vulkanSupport ''
-      --prefix XDG_DATA_DIRS  : "${addOpenGLRunpath.driverLink}/share"
+      --prefix XDG_DATA_DIRS  : "${addDriverRunpath.driverLink}/share"
       ''}
       --add-flags ${escapeShellArg commandLineArgs}
     )
diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix
index d43320558b2a..db708da35e45 100644
--- a/pkgs/applications/networking/instant-messengers/feishu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix
@@ -1,4 +1,4 @@
-{ addOpenGLRunpath
+{ addDriverRunpath
 , alsa-lib
 , at-spi2-atk
 , at-spi2-core
@@ -179,7 +179,7 @@ stdenv.mkDerivation {
       # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035)
       wrapProgram $executable \
         --prefix XDG_DATA_DIRS    :  "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix LD_LIBRARY_PATH  :  ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \
+        --prefix LD_LIBRARY_PATH  :  ${rpath}:$out/opt/bytedance/feishu:${addDriverRunpath.driverLink}/share \
         ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"}
     done
 
diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix
index 5a96bf1a2625..c1c10f8937ce 100644
--- a/pkgs/applications/science/math/mathematica/generic.nix
+++ b/pkgs/applications/science/math/mathematica/generic.nix
@@ -1,4 +1,4 @@
-{ addOpenGLRunpath
+{ addDriverRunpath
 , autoPatchelfHook
 , lib
 , makeWrapper
@@ -57,7 +57,7 @@ let cudaEnv = symlinkJoin {
       ];
       postBuild = ''
         if [ ! -e $out/lib/libcuda.so ]; then
-            ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib
+            ln -s ${addDriverRunpath.driverLink}/lib/libcuda.so $out/lib
         fi
         ln -s lib $out/lib64
       '';
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     makeWrapper
-  ] ++ lib.optional cudaSupport addOpenGLRunpath;
+  ] ++ lib.optional cudaSupport addDriverRunpath;
 
   buildInputs = [
     alsa-lib
@@ -136,8 +136,8 @@ in stdenv.mkDerivation {
     "--set QT_QPA_PLATFORM wayland;xcb"
   ] ++ lib.optionals cudaSupport [
     "--set CUDA_PATH ${cudaEnv}"
-    "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so"
-    "--set CUDA_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libcuda.so"
+    "--set NVIDIA_DRIVER_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libnvidia-tls.so"
+    "--set CUDA_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libcuda.so"
   ];
 
   unpackPhase = ''
diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix
index be18304386cb..574de6f427b1 100644
--- a/pkgs/applications/video/davinci-resolve/default.nix
+++ b/pkgs/applications/video/davinci-resolve/default.nix
@@ -5,7 +5,7 @@
 , runCommandLocal
 , unzip
 , appimage-run
-, addOpenGLRunpath
+, addDriverRunpath
 , dbus
 , libGLU
 , xorg
@@ -38,7 +38,7 @@ let
 
       nativeBuildInputs = [
         (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
-        addOpenGLRunpath
+        addDriverRunpath
         copyDesktopItems
         unzip
       ];
@@ -150,14 +150,14 @@ let
       postFixup = ''
         for program in $out/bin/*; do
           isELF "$program" || continue
-          addOpenGLRunpath "$program"
+          addDriverRunpath "$program"
         done
 
         for program in $out/libs/*; do
           isELF "$program" || continue
           if [[ "$program" != *"libcudnn_cnn_infer"* ]];then
             echo $program
-            addOpenGLRunpath "$program"
+            addDriverRunpath "$program"
           fi
         done
         ln -s $out/libs/libcrypto.so.1.1 $out/libs/libcrypt.so.1
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 0f9cec9c409b..9ccb79dcba2e 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   SDL2,
-  addOpenGLRunpath,
+  addDriverRunpath,
   alsa-lib,
   bash,
   buildPackages,
@@ -203,7 +203,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   nativeBuildInputs =
     [
-      addOpenGLRunpath
+      addDriverRunpath
       docutils # for rst2man
       meson
       ninja
@@ -329,9 +329,9 @@ stdenv'.mkDerivation (finalAttrs: {
     '';
 
   # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
-  # See the explanation in addOpenGLRunpath.
+  # See the explanation in addDriverRunpath.
   postFixup = lib.optionalString stdenv.isLinux ''
-    addOpenGLRunpath $out/bin/mpv
+    addDriverRunpath $out/bin/mpv
     patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh
   '';
 
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 418d9adf8263..f7f1c322d252 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -3,7 +3,7 @@
 , stdenv
 , fetchFromGitHub
 , fetchpatch
-, addOpenGLRunpath
+, addDriverRunpath
 , cmake
 , fdk_aac
 , ffmpeg
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     cmake
     pkg-config
     wrapGAppsHook3
@@ -181,8 +181,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = lib.optionalString stdenv.isLinux ''
-    addOpenGLRunpath $out/lib/lib*.so
-    addOpenGLRunpath $out/lib/obs-plugins/*.so
+    addDriverRunpath $out/lib/lib*.so
+    addDriverRunpath $out/lib/obs-plugins/*.so
 
     # Link libcef again after patchelfing other libs
     ln -s ${libcef}/lib/* $out/lib/obs-plugins/
diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix
index b462b24711de..28ea0a675b17 100644
--- a/pkgs/applications/virtualization/libnvidia-container/default.nix
+++ b/pkgs/applications/virtualization/libnvidia-container/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, addOpenGLRunpath
+, addDriverRunpath
 , fetchFromGitHub
 , pkg-config
 , elfutils
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     let
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
       libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
     in
     ''
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 3a009ea0cb3b..4ceffd77c664 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   SDL2,
-  addOpenGLRunpath,
+  addDriverRunpath,
   boost,
   cmake,
   cubeb,
@@ -66,7 +66,7 @@ in stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     SDL2
-    addOpenGLRunpath
+    addDriverRunpath
     wrapGAppsHook3
     cmake
     glslang
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 15b444728b26..6678821c3c1f 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -38,7 +38,7 @@
 , libvaSupport ? true, libva
 
 # For Vulkan support (--enable-features=Vulkan)
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 let
@@ -129,7 +129,7 @@ in stdenv.mkDerivation (finalAttrs: {
       --prefix LD_LIBRARY_PATH : "$rpath" \
       --prefix PATH            : "$binpath" \
       --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
-      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
       --set CHROME_WRAPPER  "google-chrome-$dist" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix
index 23fd1adf1959..12e13017ad33 100644
--- a/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/pkgs/by-name/mo/modrinth-app/package.nix
@@ -4,7 +4,7 @@
   symlinkJoin,
   modrinth-app-unwrapped,
   wrapGAppsHook3,
-  addOpenGLRunpath,
+  addDriverRunpath,
   flite,
   glib,
   glib-networking,
@@ -38,7 +38,7 @@ symlinkJoin rec {
   ];
 
   runtimeDependencies = lib.optionalString stdenv.isLinux (lib.makeLibraryPath [
-    addOpenGLRunpath.driverLink
+    addDriverRunpath.driverLink
     flite # narrator support
 
     udev # oshi
diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix
index 197e0812a8ec..2da30a868854 100644
--- a/pkgs/by-name/ni/nix-required-mounts/package.nix
+++ b/pkgs/by-name/ni/nix-required-mounts/package.nix
@@ -1,5 +1,5 @@
 {
-  addOpenGLRunpath,
+  addDriverRunpath,
   allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; },
   allowedPatterns ? rec {
     # This config is just an example.
@@ -12,7 +12,7 @@
     ];
     # It exposes these paths in the sandbox:
     nvidia-gpu.paths = [
-      addOpenGLRunpath.driverLink
+      addDriverRunpath.driverLink
       "/dev/dri"
       "/dev/nvidia*"
     ];
diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix
index c6ff6894389d..27b66966d42e 100644
--- a/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/pkgs/by-name/pr/prismlauncher/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   symlinkJoin,
   prismlauncher-unwrapped,
-  addOpenGLRunpath,
+  addDriverRunpath,
   flite,
   gamemode,
   glfw,
@@ -132,7 +132,7 @@ symlinkJoin {
     in
     [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
     ++ lib.optionals stdenv.isLinux [
-      "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
+      "--set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
       "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
     ];
 
diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix
index f07299b37cc3..56e2f60acc86 100644
--- a/pkgs/by-name/te/tetrio-desktop/package.nix
+++ b/pkgs/by-name/te/tetrio-desktop/package.nix
@@ -4,7 +4,7 @@
 , dpkg
 , makeWrapper
 , callPackage
-, addOpenGLRunpath
+, addDriverRunpath
 , electron
 , withTetrioPlus ? false
 , tetrio-plus ? null
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \
-      --prefix LD_LIBRARY_PATH : ${addOpenGLRunpath.driverLink}/lib \
+      --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       --add-flags $out/share/TETR.IO/app.asar
   '';
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index 64131ab59b82..f5d1c250cfca 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -3,7 +3,7 @@
   backendStdenv,
   fetchFromGitHub,
   cmake,
-  addOpenGLRunpath,
+  addDriverRunpath,
   cudatoolkit,
   cutensor,
 }:
@@ -20,12 +20,12 @@ let
     version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
     nativeBuildInputs = [
       cmake
-      addOpenGLRunpath
+      addDriverRunpath
     ];
     buildInputs = [ cudatoolkit ];
     postFixup = ''
       for exe in $out/bin/*; do
-        addOpenGLRunpath $exe
+        addDriverRunpath $exe
       done
     '';
     meta = {
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index d2f8e2ce3fdf..f7be0aa9f4fd 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -3,7 +3,7 @@
   runPatches ? [ ],
   autoPatchelfHook,
   autoAddDriverRunpath,
-  addOpenGLRunpath,
+  addDriverRunpath,
   alsa-lib,
   curlMinimal,
   expat,
@@ -74,7 +74,7 @@ backendStdenv.mkDerivation rec {
       perl
       makeWrapper
       rsync
-      addOpenGLRunpath
+      addDriverRunpath
       autoPatchelfHook
       autoAddDriverRunpath
       markForCudatoolkitRootHook
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 91d210d63978..3fb94f598698 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm
+{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, yasm
 
   # You can fetch any upstream version using this derivation by specifying version and hash
   # NOTICE: Always use this argument to override the version. Do not use overrideAttrs.
@@ -751,7 +751,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]
+  nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config texinfo yasm ]
   ++ optionals withCudaLLVM [ clang ];
 
   buildInputs = []
@@ -884,10 +884,10 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
-  # See the explanation in addOpenGLRunpath.
+  # See the explanation in addDriverRunpath.
   postFixup = optionalString (stdenv.isLinux && withLib) ''
-    addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so
-    addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so
+    addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so
+    addDriverRunpath ${placeholder "lib"}/lib/libavutil.so
   ''
   # https://trac.ffmpeg.org/ticket/10809
   + optionalString (versionAtLeast version "5.0" && withVulkan && !stdenv.hostPlatform.isMinGW) ''
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 91639c441b48..e5caebca83f3 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -81,7 +81,7 @@
 , mjpegtools
 , libGLU
 , libGL
-, addOpenGLRunpath
+, addDriverRunpath
 , gtk3
 , libintl
 , game-music-emu
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     # Add fallback paths for nvidia userspace libraries
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix
index db99f73cd796..17218c6e68ad 100644
--- a/pkgs/development/libraries/level-zero/default.nix
+++ b/pkgs/development/libraries/level-zero/default.nix
@@ -1,5 +1,5 @@
 { lib
-, addOpenGLRunpath
+, addDriverRunpath
 , cmake
 , fetchFromGitHub
 , intel-compute-runtime
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-vtijha0nXHEp5oLnmdtbD80Qa2dgMykZXhQ2yfbk+mY=";
   };
 
-  nativeBuildInputs = [ cmake addOpenGLRunpath ];
+  nativeBuildInputs = [ cmake addDriverRunpath ];
 
   postFixup = ''
-    addOpenGLRunpath $out/lib/libze_loader.so
+    addDriverRunpath $out/lib/libze_loader.so
   '';
 
   passthru.tests = {
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 9a9c3b861d6d..d3e85c012cf1 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitLab
 , fetchpatch
-, autoreconfHook, pkg-config, python3, addOpenGLRunpath
+, autoreconfHook, pkg-config, python3, addDriverRunpath
 , libX11, libXext, xorgproto
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];
+  nativeBuildInputs = [ autoreconfHook pkg-config python3 addDriverRunpath ];
   buildInputs = [ libX11 libXext xorgproto ];
 
   postPatch = lib.optionalString stdenv.isDarwin ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = toString ([
     "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
     # FHS paths are added so that non-NixOS applications can find vendor files.
-    "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
+    "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addDriverRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
 
     "-Wno-error=array-bounds"
   ] ++ lib.optionals stdenv.cc.isClang [
@@ -61,10 +61,10 @@ stdenv.mkDerivation rec {
   # Note that libEGL does not need it because it uses driver config files which should
   # contain absolute paths to libraries.
   postFixup = ''
-    addOpenGLRunpath $out/lib/libGLX.so
+    addDriverRunpath $out/lib/libGLX.so
   '';
 
-  passthru = { inherit (addOpenGLRunpath) driverLink; };
+  passthru = { inherit (addDriverRunpath) driverLink; };
 
   meta = with lib; {
     description = "GL Vendor-Neutral Dispatch library";
diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix
index 89038628f2f9..bcda5a993d78 100644
--- a/pkgs/development/libraries/mdk-sdk/default.nix
+++ b/pkgs/development/libraries/mdk-sdk/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, autoPatchelfHook
 , alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib
-, libva, libvdpau, addOpenGLRunpath
+, libva, libvdpau, addDriverRunpath
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   appendRunpaths = lib.makeLibraryPath [
-    libva libvdpau addOpenGLRunpath.driverLink
+    libva libvdpau addDriverRunpath.driverLink
   ];
 
   installPhase = ''
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index 92f447a32422..786a11f48204 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -9,7 +9,7 @@
 , gst_all_1
 , nv-codec-headers-11
 , libva
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   buildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ];
 
   postFixup = ''
-    addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so"
+    addDriverRunpath "$out/lib/dri/nvidia_drv_video.so"
   '';
 
   meta = with lib;{
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix
index 0930b8904bdf..f5cdc9f4841a 100644
--- a/pkgs/development/libraries/ocl-icd/default.nix
+++ b/pkgs/development/libraries/ocl-icd/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , ruby
 , opencl-headers
-, addOpenGLRunpath
+, addDriverRunpath
 , autoreconfHook
 , windows
 }:
diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix
index 14ad6c166e55..8ae90599585f 100644
--- a/pkgs/development/libraries/openvino/default.nix
+++ b/pkgs/development/libraries/openvino/default.nix
@@ -6,7 +6,7 @@
 
 # build
 , scons
-, addOpenGLRunpath
+, addDriverRunpath
 , autoPatchelfHook
 , cmake
 , git
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     autoPatchelfHook
     cmake
     git
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Link to OpenCL
     find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix
index 723ced8b2a59..445a45e72b55 100644
--- a/pkgs/development/libraries/science/chemistry/openmm/default.nix
+++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix
@@ -14,7 +14,7 @@
 , config
 , enableCuda ? config.cudaSupport
 , cudaPackages
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 stdenv.mkDerivation rec {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     python3Packages.build
     python3Packages.installer
     python3Packages.wheel
-  ] ++ lib.optional enableCuda addOpenGLRunpath;
+  ] ++ lib.optional enableCuda addDriverRunpath;
 
   buildInputs = [ fftwSinglePrec ]
     ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ]
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     for lib in $out/lib/plugins/*CUDA.so $out/lib/plugins/*Cuda*.so; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix
index 5af73735fdf6..7471ffe07db2 100644
--- a/pkgs/development/libraries/science/math/faiss/default.nix
+++ b/pkgs/development/libraries/science/math/faiss/default.nix
@@ -12,7 +12,7 @@
 , boost
 , blas
 , swig
-, addOpenGLRunpath
+, addDriverRunpath
 , optLevel ? let
     optLevels =
       lib.optionals stdenv.hostPlatform.avx2Support [ "avx2" ]
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
-    addOpenGLRunpath
+    addDriverRunpath
   ] ++ lib.optionals pythonSupport [
     pythonPackages.python
   ];
@@ -119,8 +119,8 @@ stdenv.mkDerivation {
   '';
 
   postFixup = lib.optionalString (pythonSupport && cudaSupport) ''
-    addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so
-    addOpenGLRunpath $demos/bin/*
+    addDriverRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so
+    addDriverRunpath $demos/bin/*
   '';
 
   # Need buildPythonPackage for this one
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index 5b08cfa7dcf0..e62e621a0043 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -5,7 +5,7 @@
 , libcxx
 , llvmPackages
 
-, addOpenGLRunpath
+, addDriverRunpath
 , patchelf
 , fixDarwinDylibNames
 
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs =
     if stdenv.isDarwin then [ fixDarwinDylibNames ]
-    else [ patchelf ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
+    else [ patchelf ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   dontBuild = true;
   dontConfigure = true;
@@ -64,7 +64,7 @@ in stdenv.mkDerivation {
       echo "setting rpath for $lib..."
       patchelf --set-rpath "${rpath}:$out/lib" "$lib"
       ${lib.optionalString cudaSupport ''
-        addOpenGLRunpath "$lib"
+        addDriverRunpath "$lib"
       ''}
     done
   '' + lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 023bba6ee8e8..97e513107825 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
-, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath
+, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath
 , testers }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
     ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
-    ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
+    ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
     ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 98c28ca67997..31bb96dd976c 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -62,7 +62,7 @@
 , substituteAll
 , glib
 , unifdef
-, addOpenGLRunpath
+, addDriverRunpath
 , enableGeoLocation ? true
 , enableExperimental ? false
 , withLibsecret ? true
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     (substituteAll {
       src = ./fix-bubblewrap-paths.patch;
       inherit (builtins) storeDir;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 7212e2d37902..45a192974c33 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -10,7 +10,7 @@
   mock,
   setuptools,
   cudaPackages,
-  addOpenGLRunpath,
+  addDriverRunpath,
   pythonOlder,
   symlinkJoin,
 }:
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     setuptools
     wheel
-    addOpenGLRunpath
+    addDriverRunpath
     cython
     cudaPackages.cuda_nvcc
   ];
@@ -96,7 +96,7 @@ buildPythonPackage rec {
 
   postFixup = ''
     find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
index b77a7de7b357..fbc780c4af27 100644
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@@ -4,7 +4,7 @@
   stdenv,
 
   # Build-time dependencies:
-  addOpenGLRunpath,
+  addDriverRunpath,
   autoAddDriverRunpath,
   bazel_6,
   binutils,
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 7645f8bc7427..751d9b2f706d 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  addOpenGLRunpath,
+  addDriverRunpath,
   buildPythonPackage,
   fetchFromGitHub,
   cmake,
@@ -68,7 +68,7 @@ buildPythonPackage rec {
       fixRunPath $out/lib/libgpuarray.so
     ''
     + lib.optionalString cudaSupport ''
-      addOpenGLRunpath $out/lib/libgpuarray.so
+      addDriverRunpath $out/lib/libgpuarray.so
     '';
 
   propagatedBuildInputs = [
@@ -80,7 +80,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cmake
     cython_0
-  ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
+  ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   buildInputs = [ nose ];
 
diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix
index 52e7c04ca060..b620f209337e 100644
--- a/pkgs/development/python-modules/nvidia-ml-py/default.nix
+++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix
@@ -3,7 +3,7 @@
   fetchPypi,
   buildPythonPackage,
   substituteAll,
-  addOpenGLRunpath,
+  addDriverRunpath,
 }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/openai-triton/bin.nix
index bdf722bbc0fc..bb6a7ce99c0f 100644
--- a/pkgs/development/python-modules/openai-triton/bin.nix
+++ b/pkgs/development/python-modules/openai-triton/bin.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  addOpenGLRunpath,
+  addDriverRunpath,
   cudaPackages,
   buildPythonPackage,
   fetchurl,
@@ -64,7 +64,7 @@ buildPythonPackage rec {
         old = [ "-lcuda" ];
         new = [
           "-lcuda"
-          "-L${addOpenGLRunpath.driverLink}"
+          "-L${addDriverRunpath.driverLink}"
           "-L${cudaPackages.cuda_cudart}/lib/stubs/"
         ];
 
diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix
index b263cdc8e1b9..238880794042 100644
--- a/pkgs/development/python-modules/paddlepaddle/default.nix
+++ b/pkgs/development/python-modules/paddlepaddle/default.nix
@@ -12,7 +12,7 @@
   setuptools,
   cudaSupport ? config.cudaSupport or false,
   cudaPackages_11 ? { },
-  addOpenGLRunpath,
+  addDriverRunpath,
   # runtime dependencies
   httpx,
   numpy,
@@ -81,13 +81,13 @@ buildPythonPackage {
       p=$(patchelf --print-rpath $1)
       patchelf --set-rpath "$p:$libraryPath" $1
       ${lib.optionalString cudaSupport ''
-        addOpenGLRunpath $1
+        addDriverRunpath $1
       ''}
     }
     fixRunPath $out/${python.sitePackages}/paddle/fluid/libpaddle.so
   '';
 
-  nativeBuildInputs = [ addOpenGLRunpath ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   propagatedBuildInputs = [
     setuptools
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 145bdcaad36b..90d71bf7e47c 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -1,6 +1,6 @@
 {
   buildPythonPackage,
-  addOpenGLRunpath,
+  addDriverRunpath,
   fetchPypi,
   fetchFromGitHub,
   mako,
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   postFixup = ''
     find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting opengl runpath for $lib..."
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  nativeBuildInputs = [ addOpenGLRunpath ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   propagatedBuildInputs = [
     numpy
diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix
index 762771c66a2b..936a4f5ce847 100644
--- a/pkgs/development/python-modules/pynvml/default.nix
+++ b/pkgs/development/python-modules/pynvml/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   substituteAll,
   pythonOlder,
-  addOpenGLRunpath,
+  addDriverRunpath,
   setuptools,
   pytestCheckHook,
   versioneer,
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 0f54cade00cd..d184fd2cb79f 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -31,7 +31,7 @@
   python,
   keras-applications,
   keras-preprocessing,
-  addOpenGLRunpath,
+  addDriverRunpath,
   astunparse,
   flatbuffers,
   h5py,
@@ -91,7 +91,7 @@ buildPythonPackage {
     h5py
   ] ++ lib.optional (!isPy3k) mock;
 
-  build-system = [ wheel ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
+  build-system = [ wheel ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   preConfigure = ''
     unset SOURCE_DATE_EPOCH
@@ -189,7 +189,7 @@ buildPythonPackage {
         chmod a+rx "$lib"
         patchelf --set-rpath "$rrPath" "$lib"
         ${lib.optionalString cudaSupport ''
-          addOpenGLRunpath "$lib"
+          addDriverRunpath "$lib"
         ''}
       done
     '';
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index d311edc188ad..f98b9999da99 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -5,7 +5,7 @@
   lib,
   fetchFromGitHub,
   symlinkJoin,
-  addOpenGLRunpath,
+  addDriverRunpath,
   fetchpatch,
   fetchzip,
   linkFarm,
@@ -291,7 +291,7 @@ let
       perl
       protobuf-core
       protobuf-extra
-    ] ++ lib.optional cudaSupport addOpenGLRunpath;
+    ] ++ lib.optional cudaSupport addDriverRunpath;
 
     buildInputs =
       [
@@ -564,7 +564,7 @@ let
 
       postFixup = lib.optionalString cudaSupport ''
         find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-          addOpenGLRunpath "$lib"
+          addDriverRunpath "$lib"
         done
       '';
 
@@ -647,11 +647,11 @@ buildPythonPackage {
     wrapt
   ] ++ lib.optionals withTensorboard [ tensorboard ];
 
-  nativeBuildInputs = lib.optionals cudaSupport [ addOpenGLRunpath ];
+  nativeBuildInputs = lib.optionals cudaSupport [ addDriverRunpath ];
 
   postFixup = lib.optionalString cudaSupport ''
     find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
 
       patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib"
     done
diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index e2899c081e08..118fa6c824a4 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -7,7 +7,7 @@
   python,
   pythonAtLeast,
   pythonOlder,
-  addOpenGLRunpath,
+  addDriverRunpath,
   callPackage,
   cudaPackages,
   future,
@@ -44,7 +44,7 @@ buildPythonPackage {
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
-    addOpenGLRunpath
+    addDriverRunpath
     autoPatchelfHook
     autoAddDriverRunpath
   ];
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index be9710041f9c..903e1641056b 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  addOpenGLRunpath,
+  addDriverRunpath,
   autoPatchelfHook,
   buildPythonPackage,
   cudaPackages,
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     autoPatchelfHook
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   dependencies = [ torch-bin ];
diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index fc731fae2e07..d796159cbb9f 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  addOpenGLRunpath,
+  addDriverRunpath,
   autoPatchelfHook,
   buildPythonPackage,
   cudaPackages,
@@ -41,7 +41,7 @@ buildPythonPackage {
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     autoPatchelfHook
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   dependencies = [
diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix
index 86630d33cea3..5a2ea9772b40 100644
--- a/pkgs/development/tools/hover/default.nix
+++ b/pkgs/development/tools/hover/default.nix
@@ -9,7 +9,7 @@
 , writeScript
 , xorg
 , libglvnd
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , gcc
 , go
@@ -55,7 +55,7 @@ let
       sha256 = "sha256-ch59Wx4g72u7x99807ppURI4I+5aJ/W8Zr35q8X68v4=";
     };
 
-    nativeBuildInputs = [ addOpenGLRunpath makeWrapper ];
+    nativeBuildInputs = [ addDriverRunpath makeWrapper ];
 
     buildInputs = libs;
 
@@ -79,7 +79,7 @@ let
     '';
 
     postFixup = ''
-      addOpenGLRunpath $out/bin/hover
+      addDriverRunpath $out/bin/hover
     '';
   };
 
diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix
index 843e4fe2c675..751eb5185319 100644
--- a/pkgs/development/tools/renderdoc/default.nix
+++ b/pkgs/development/tools/renderdoc/default.nix
@@ -17,7 +17,7 @@
 , pcre
 , automake
 , autoconf
-, addOpenGLRunpath
+, addDriverRunpath
 , waylandSupport ? false
 , wayland
 }:
@@ -48,7 +48,7 @@ mkDerivation rec {
   ])
   ++ lib.optional waylandSupport wayland;
 
-  nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath ];
 
   postUnpack = ''
     cp -r ${custom_swig} swig
@@ -79,7 +79,7 @@ mkDerivation rec {
 
   # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh
   postFixup = ''
-    addOpenGLRunpath $out/lib/librenderdoc.so
+    addDriverRunpath $out/lib/librenderdoc.so
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index a26acd144125..fcb804cad6f1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -17,7 +17,7 @@ nvidia_x11: sha256:
 , libvdpau
 , librsvg
 , wrapGAppsHook3
-, addOpenGLRunpath
+, addDriverRunpath
 , withGtk2 ? false
 , withGtk3 ? true
 }:
@@ -114,7 +114,7 @@ stdenv.mkDerivation {
     fi
   '';
 
-  nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ]
+  nativeBuildInputs = [ pkg-config m4 addDriverRunpath ]
     ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
 
   buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 dbus ]
@@ -145,7 +145,7 @@ stdenv.mkDerivation {
     patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
       $out/bin/$binaryName
 
-    addOpenGLRunpath $out/bin/$binaryName
+    addDriverRunpath $out/bin/$binaryName
   '';
 
   passthru = {
diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix
index aa08f781121c..3cbec0b64818 100644
--- a/pkgs/servers/hqplayerd/default.nix
+++ b/pkgs/servers/hqplayerd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib
-, addOpenGLRunpath
+, addDriverRunpath
 , alsa-lib
 , autoPatchelfHook
 , cairo
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     ${rpmextract}/bin/rpmextract $src
   '';
 
-  nativeBuildInputs = [ addOpenGLRunpath autoPatchelfHook rpmextract ];
+  nativeBuildInputs = [ addDriverRunpath autoPatchelfHook rpmextract ];
 
   buildInputs = [
     alsa-lib
@@ -94,11 +94,11 @@ stdenv.mkDerivation rec {
       --replace "NetworkManager-wait-online.service" ""
   '';
 
-  # NB: addOpenGLRunpath needs to run _after_ autoPatchelfHook, which runs in
+  # NB: addDriverRunpath needs to run _after_ autoPatchelfHook, which runs in
   # postFixup, so we tack it on here.
   doInstallCheck = true;
   installCheckPhase = ''
-    addOpenGLRunpath $out/bin/hqplayerd
+    addDriverRunpath $out/bin/hqplayerd
     $out/bin/hqplayerd --version
   '';
 
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix
index 7ca9652baafc..3e0837323a34 100644
--- a/pkgs/tools/graphics/mangohud/default.nix
+++ b/pkgs/tools/graphics/mangohud/default.nix
@@ -13,7 +13,7 @@
 , dbus
 , hwdata
 , mangohud32
-, addOpenGLRunpath
+, addDriverRunpath
 , appstream
 , git
 , glslang
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     git
     glslang
     mako
@@ -232,10 +232,10 @@ stdenv.mkDerivation (finalAttrs: {
         --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}"
     '' + ''
       # Add OpenGL driver and libXNVCtrl paths to RUNPATH to support NVIDIA cards
-      addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so"
+      addDriverRunpath "$out/lib/mangohud/libMangoHud.so"
       patchelf --add-rpath ${libXNVCtrl}/lib "$out/lib/mangohud/libMangoHud.so"
     '' + lib.optionalString gamescopeSupport ''
-      addOpenGLRunpath "$out/bin/mangoapp"
+      addDriverRunpath "$out/bin/mangoapp"
     '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
       # libcmocka.so is only used for tests
       rm "$out/lib/libcmocka.so"
diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/tools/graphics/vulkan-helper/default.nix
index 22fb34c8f83f..0f7fd3fcc997 100644
--- a/pkgs/tools/graphics/vulkan-helper/default.nix
+++ b/pkgs/tools/graphics/vulkan-helper/default.nix
@@ -2,7 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , vulkan-loader
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM=";
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   postFixup = ''
     patchelf --add-rpath ${vulkan-loader}/lib $out/bin/vulkan-helper
-    addOpenGLRunpath $out/bin/vulkan-helper
+    addDriverRunpath $out/bin/vulkan-helper
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/tools/misc/geekbench/4.nix
index 789f92babf80..bd60ee701ae3 100644
--- a/pkgs/tools/misc/geekbench/4.nix
+++ b/pkgs/tools/misc/geekbench/4.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , autoPatchelfHook
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , ocl-icd
 , vulkan-loader
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     for f in geekbench4 geekbench_x86_64 ; do
       wrapProgram $out/bin/$f \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-          addOpenGLRunpath.driverLink
+          addDriverRunpath.driverLink
           ocl-icd
           vulkan-loader
        ]}"
diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/tools/misc/geekbench/5.nix
index 49efe2ea0bf9..0c23877ee847 100644
--- a/pkgs/tools/misc/geekbench/5.nix
+++ b/pkgs/tools/misc/geekbench/5.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , autoPatchelfHook
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , ocl-icd
 , vulkan-loader
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     for f in geekbench5 geekbench_${processor} ; do
       wrapProgram $out/bin/$f \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-          addOpenGLRunpath.driverLink
+          addDriverRunpath.driverLink
           ocl-icd
           vulkan-loader
        ]}"
diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix
index d7dd0ad7158b..2aca571e2cf9 100644
--- a/pkgs/tools/misc/geekbench/6.nix
+++ b/pkgs/tools/misc/geekbench/6.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , autoPatchelfHook
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , ocl-icd
 , vulkan-loader
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     for f in geekbench6 geekbench_${processor} ${geekbench_avx2} ; do
       wrapProgram $out/bin/$f \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-          addOpenGLRunpath.driverLink
+          addDriverRunpath.driverLink
           ocl-icd
           vulkan-loader
         ]}"
diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
index 56399e61639e..dc3a5390da3c 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, addOpenGLRunpath
+, addDriverRunpath
 , config
 , cudaPackages ? {}
 , cudaSupport ? config.cudaSupport
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
   ] ++ lib.optionals cudaSupport [
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   buildInputs = [ opencl-headers xxHash ]
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   '' + lib.optionalString cudaSupport ''
     for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do
       isELF "$program" || continue
-      addOpenGLRunpath "$program"
+      addDriverRunpath "$program"
     done
   '';
 
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index cfc13f14c471..0feada287d87 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -8,7 +8,7 @@
 , ncurses
 , testers
 , udev
-, addOpenGLRunpath
+, addDriverRunpath
 , amd ? false
 , intel ? false
 , msm ? false
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "PANTHOR_SUPPORT" panthor)
     (cmakeBool "ASCEND_SUPPORT" ascend)
   ];
-  nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath;
+  nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addDriverRunpath;
 
   buildInputs = with lib; [ ncurses udev ]
     ++ optional nvidia cudatoolkit
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = lib.optionalString needDrm "-isystem ${lib.getDev libdrm}/include/libdrm";
 
   # ordering of fixups is important
-  postFixup = (lib.optionalString needDrm drm-postFixup) + (lib.optionalString nvidia "addOpenGLRunpath $out/bin/nvtop");
+  postFixup = (lib.optionalString needDrm drm-postFixup) + (lib.optionalString nvidia "addDriverRunpath $out/bin/nvtop");
 
   doCheck = true;
 

From 14d51d6ebc4021939b57dd2554bd75e1cba2ad1f Mon Sep 17 00:00:00 2001
From: Michael Paepcke <git@paepcke.de>
Date: Sun, 30 Jun 2024 19:57:27 +0000
Subject: [PATCH 102/319] linux: enable CONFIG_SND_HDA_CODEC_CS8409: restrict
 kernel >=6.6

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index e15ff79536a4..1e2795ffb6b6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -511,7 +511,7 @@ let
       # Support configuring jack functions via fw mechanism at boot
       SND_HDA_PATCH_LOADER = yes;
       SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
-      SND_HDA_CODEC_CS8409 = module; # Cirrus Logic HDA Bridge CS8409
+      SND_HDA_CODEC_CS8409 = whenAtLeast "6.6" module; # Cirrus Logic HDA Bridge CS8409
       SND_OSSEMUL         = yes;
       SND_USB_CAIAQ_INPUT = yes;
       SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;

From 2fdd709e7a385179aceee46adca4e1d8a72b50e3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 29 Jun 2024 04:01:01 +0200
Subject: [PATCH 103/319] cacert: 3.101 -> 3.101.1

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_101_1.rst
---
 pkgs/data/misc/cacert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 7a332e808701..be45a9c46467 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -20,7 +20,7 @@ let
   blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist);
   extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings);
 
-  srcVersion = "3.101";
+  srcVersion = "3.101.1";
   version = if nssOverride != null then nssOverride.version else srcVersion;
   meta = with lib; {
     homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -37,7 +37,7 @@ let
       owner = "nss-dev";
       repo = "nss";
       rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM";
-      hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts=";
+      hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
     };
 
     dontBuild = true;

From 040c460262aa3165ab6e95cefbb320a05ef03622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 1 Jul 2024 09:26:16 +0200
Subject: [PATCH 104/319] Revert "rustc: avoid rebuild on linux right now"

This reverts commit 68538d36ced3a6c9bb536c7edf3e1217c41c8460.
---
 pkgs/development/compilers/rust/rustc.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a68e117658fa..487de452b01c 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -35,6 +35,12 @@ in stdenv.mkDerivation (finalAttrs: {
     passthru.isReleaseTarball = true;
   };
 
+  hardeningDisable = optionals stdenv.cc.isClang [
+    # remove once https://github.com/NixOS/nixpkgs/issues/318674 is
+    # addressed properly
+    "zerocallusedregs"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   # rustc complains about modified source files otherwise
@@ -303,10 +309,4 @@ in stdenv.mkDerivation (finalAttrs: {
       "i686-windows" "x86_64-windows"
     ];
   };
-} // lib.optionalAttrs stdenv.cc.isClang { # FIXME: move inside again when rebuilds are OK
-  hardeningDisable = optionals stdenv.cc.isClang [
-    # remove once https://github.com/NixOS/nixpkgs/issues/318674 is
-    # addressed properly
-    "zerocallusedregs"
-  ];
 })

From 04cc8a59346ae933215a5612bc2eb63b1e16da4f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 1 Jul 2024 18:21:42 +0100
Subject: [PATCH 105/319] re2: 2024-06-01 -> 2024-07-02

Changes: https://github.com/google/re2/compare/2024-06-01...2024-07-02
---
 pkgs/development/libraries/re2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 09d2f7539f15..fe5b5bfc93c3 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2024-06-01";
+  version = "2024-07-02";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-iQETsjdIFcYM5I/W8ytvV3z/4va6TaZ/+KkSjb8CtF0=";
+    hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
   };
 
   outputs = [

From a1614c9d561ec9ccf747c4d562c417cb485ee5aa Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 1 Jul 2024 17:38:34 +0300
Subject: [PATCH 106/319] scons: move to by-name, update to 4.7.0, drop all the
 old versions

This techinically removes the man pages, but that's probably fine?
---
 .../sc}/scons/env.patch                       |  0
 pkgs/by-name/sc/scons/no-man-pages.patch      | 14 +++++
 .../sc/scons/package.nix}                     | 33 +++++-----
 .../sc}/scons/setup-hook.sh                   |  0
 .../tools/build-managers/scons/4.1.0.nix      | 57 -----------------
 .../tools/build-managers/scons/4.5.2.nix      | 62 -------------------
 pkgs/top-level/all-packages.nix               |  5 --
 7 files changed, 29 insertions(+), 142 deletions(-)
 rename pkgs/{development/tools/build-managers => by-name/sc}/scons/env.patch (100%)
 create mode 100644 pkgs/by-name/sc/scons/no-man-pages.patch
 rename pkgs/{development/tools/build-managers/scons/3.1.2.nix => by-name/sc/scons/package.nix} (68%)
 rename pkgs/{development/tools/build-managers => by-name/sc}/scons/setup-hook.sh (100%)
 delete mode 100644 pkgs/development/tools/build-managers/scons/4.1.0.nix
 delete mode 100644 pkgs/development/tools/build-managers/scons/4.5.2.nix

diff --git a/pkgs/development/tools/build-managers/scons/env.patch b/pkgs/by-name/sc/scons/env.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/scons/env.patch
rename to pkgs/by-name/sc/scons/env.patch
diff --git a/pkgs/by-name/sc/scons/no-man-pages.patch b/pkgs/by-name/sc/scons/no-man-pages.patch
new file mode 100644
index 000000000000..4dd459b8261e
--- /dev/null
+++ b/pkgs/by-name/sc/scons/no-man-pages.patch
@@ -0,0 +1,14 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -67,11 +67,6 @@ console_scripts =
+ SCons.Tool.docbook = *.*
+ 
+ 
+-[options.data_files]
+-. = scons.1
+-    scons-time.1
+-    sconsign.1
+-
+ [sdist]
+     dist_dir=build/dist
+ 
diff --git a/pkgs/development/tools/build-managers/scons/3.1.2.nix b/pkgs/by-name/sc/scons/package.nix
similarity index 68%
rename from pkgs/development/tools/build-managers/scons/3.1.2.nix
rename to pkgs/by-name/sc/scons/package.nix
index a9d55f59ee0d..8ebc736097b0 100644
--- a/pkgs/development/tools/build-managers/scons/3.1.2.nix
+++ b/pkgs/by-name/sc/scons/package.nix
@@ -1,34 +1,32 @@
-{ lib, fetchFromGitHub, python3 }:
-
-let
+{ lib, fetchFromGitHub, python3Packages }:
+python3Packages.buildPythonApplication rec {
   pname = "scons";
-  version = "3.1.2";
+  version = "4.7.0";
+
   src = fetchFromGitHub {
     owner = "Scons";
     repo = "scons";
     rev = version;
-    hash = "sha256-C3U4N7+9vplzoJoevQe5Zeuz0TDmB6/miMwBJLzA3WA=";
+    hash = "sha256-7VzGuz9CAUF6MRCEpj5z1FkZD19/Ic+YBukYQocvkr0=";
   };
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
 
-  outputs = [ "out" "man" ];
+  pyproject = true;
 
-  preConfigure = ''
-    python bootstrap.py
-    cd build/scons
-  '';
+  patches = [
+    ./env.patch
+    ./no-man-pages.patch
+  ];
+
+  build-system = [
+    python3Packages.setuptools
+  ];
 
   setupHook = ./setup-hook.sh;
 
-  doCheck = true;
-
   passthru = {
     # expose the used python version so tools using this (and extensing scos
     # with other python modules) can use the exact same python version.
-    inherit python3;
-    python = python3;
+    inherit (python3Packages) python;
   };
 
   meta = {
@@ -45,4 +43,3 @@ python3.pkgs.buildPythonApplication {
     maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }
-# TODO: patch to get rid of distutils and other deprecations
diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/pkgs/by-name/sc/scons/setup-hook.sh
similarity index 100%
rename from pkgs/development/tools/build-managers/scons/setup-hook.sh
rename to pkgs/by-name/sc/scons/setup-hook.sh
diff --git a/pkgs/development/tools/build-managers/scons/4.1.0.nix b/pkgs/development/tools/build-managers/scons/4.1.0.nix
deleted file mode 100644
index 13357dfb99a9..000000000000
--- a/pkgs/development/tools/build-managers/scons/4.1.0.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, fetchFromGitHub, python3 }:
-
-let
-  pname = "scons";
-  version = "4.1.0";
-  src = fetchFromGitHub {
-    owner = "Scons";
-    repo = "scons";
-    rev = version;
-    hash = "sha256-ldus/9ghqAMB7A+NrHiCQm7saCdIpqzufGCLxWRhYKU=";
-  };
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
-
-  outputs = [ "out" "man" ];
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "build/dist" "dist"
-  '';
-
-  preConfigure = ''
-    python scripts/scons.py
-  '';
-
-  postInstall = ''
-    mkdir -pv "$man/share/man/man1"
-    mv -v "$out/"*.1 "$man/share/man/man1/"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  # The release tarballs don't contain any tests (runtest.py and test/*):
-  doCheck = false;
-
-  passthru = {
-    # expose the used python version so tools using this (and extensing scos
-    # with other python modules) can use the exact same python version.
-    inherit python3;
-    python = python3;
-  };
-
-  meta = {
-    description = "Improved, cross-platform substitute for Make";
-    longDescription = ''
-      SCons is an Open Source software construction tool. Think of SCons as an
-      improved, cross-platform substitute for the classic Make utility with
-      integrated functionality similar to autoconf/automake and compiler caches
-      such as ccache. In short, SCons is an easier, more reliable and faster way
-      to build software.
-    '';
-    homepage = "https://scons.org/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/pkgs/development/tools/build-managers/scons/4.5.2.nix b/pkgs/development/tools/build-managers/scons/4.5.2.nix
deleted file mode 100644
index 6b5720c86ee6..000000000000
--- a/pkgs/development/tools/build-managers/scons/4.5.2.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, fetchFromGitHub, python3 }:
-
-let
-  pname = "scons";
-  version = "4.5.2";
-  src = fetchFromGitHub {
-    owner = "Scons";
-    repo = "scons";
-    rev = version;
-    hash = "sha256-vxJsz24jDsPcttwPXq9+ztc/N7W4Gkydgykk/FLgZLo=";
-  };
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
-
-  outputs = [ "out" "man" ];
-
-  patches = [
-    ./env.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "build/dist" "dist" \
-      --replace "build/doc/man/" ""
-  '';
-
-  preConfigure = ''
-    python scripts/scons.py
-  '';
-
-  postInstall = ''
-    mkdir -p "$man/share/man/man1"
-    mv "$out/"*.1 "$man/share/man/man1/"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  # The release tarballs don't contain any tests (runtest.py and test/*):
-  doCheck = false;
-
-  passthru = {
-    # expose the used python version so tools using this (and extensing scos
-    # with other python modules) can use the exact same python version.
-    inherit python3;
-    python = python3;
-  };
-
-  meta = {
-    description = "Improved, cross-platform substitute for Make";
-    longDescription = ''
-      SCons is an Open Source software construction tool. Think of SCons as an
-      improved, cross-platform substitute for the classic Make utility with
-      integrated functionality similar to autoconf/automake and compiler caches
-      such as ccache. In short, SCons is an easier, more reliable and faster way
-      to build software.
-    '';
-    homepage = "https://scons.org/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aab4a83c80c..e7707873239b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19309,11 +19309,6 @@ with pkgs;
 
   sca2d = callPackage ../development/tools/sca2d {  };
 
-  scons = scons_4_5_2;
-  scons_3_1_2 = callPackage ../development/tools/build-managers/scons/3.1.2.nix { };
-  scons_4_1_0 = callPackage ../development/tools/build-managers/scons/4.1.0.nix { };
-  scons_4_5_2 = callPackage ../development/tools/build-managers/scons/4.5.2.nix { };
-
   mill = callPackage ../development/tools/build-managers/mill { };
 
   sbt = callPackage ../development/tools/build-managers/sbt { };

From ecfc551ff8782a494718639c8b807c439f951d30 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 2 Jul 2024 16:53:23 +0300
Subject: [PATCH 107/319] ffado: fix eval

---
 pkgs/os-specific/linux/ffado/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 47112a26c203..3c13b9604059 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -63,7 +63,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    (scons.override { python3 = python311; })
+    (scons.override { python3Packages = python311.pkgs; })
     pkg-config
     which
     python

From 1fd673ac02a3cc2e5c7a69de3be5769d4be80696 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 2 Jul 2024 17:23:30 +0300
Subject: [PATCH 108/319] openvino: fix eval

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

diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix
index 8ae90599585f..a1f30277151b 100644
--- a/pkgs/development/libraries/openvino/default.nix
+++ b/pkgs/development/libraries/openvino/default.nix
@@ -38,7 +38,7 @@ let
   stdenv = gcc12Stdenv;
 
   # prevent scons from leaking in the default python version
-  scons' = scons.override { python3 = python3Packages.python; };
+  scons' = scons.override { inherit python3Packages; };
 
   tbbbind_version = "2_5";
   tbbbind = fetchurl {

From 78d5ebed1acd3b7931cee7d0914ed225d8e22090 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 2 Jul 2024 21:51:13 +0100
Subject: [PATCH 109/319] zlib-ng: 2.1.7 -> 2.2.1

Changes:
- https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.0
- https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1
---
 pkgs/development/libraries/zlib-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix
index c6fa9cb2a2ac..6abb1b160cc6 100644
--- a/pkgs/development/libraries/zlib-ng/default.nix
+++ b/pkgs/development/libraries/zlib-ng/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zlib-ng";
-  version = "2.1.7";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "zlib-ng";
     rev = version;
-    hash = "sha256-fNebnLeME0HXUx8M7YfTT0aMJQggEmMs9EbJFWL1zC4=";
+    hash = "sha256-XTu4Wo9wQOvXrjDxo3KTpCiy0NsqVnYtCuYsCHP5LFc=";
   };
 
   outputs = [ "out" "dev" "bin" ];

From 55e502211ad3cd95903538b1bd6f2b9dc8587c2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Jul 2024 02:05:52 +0000
Subject: [PATCH 110/319] libplacebo: 6.338.2 -> 7.349.0

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

diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
index 5759d9bed505..0efcb6d460ec 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libplacebo";
-  version = "6.338.2";
+  version = "7.349.0";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-gE6yKnFvsOFh8bFYc7b+bS+zmdDU7jucr0HwhdDeFzU=";
+    hash = "sha256-mIjQvc7SRjE1Orb2BkHK+K1TcRQvzj2oUOCUT4DzIuA=";
   };
 
   nativeBuildInputs = [

From 37007db77c5d7517e19a4c2bf290eaf4cb50ac96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 3 Jul 2024 13:45:34 +0200
Subject: [PATCH 111/319] linux: move hexdump to nativeBuildInputs

Trying to build vmlinuz.efi natively on aarch64 fails to find hexdump.
This was introduced in #277975. Moving hexdump to nativeBuildInputs
fixes the build.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 5f20d14137c4..9c30f1fd70d0 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -121,7 +121,6 @@ let
         pahole
         perl
         elfutils
-        hexdump
         # module makefiles often run uname commands to find out the kernel version
         (buildPackages.deterministic-uname.override { inherit modDirVersion; })
       ]
@@ -158,6 +157,7 @@ let
         zstd
         python3Minimal
         kmod
+        hexdump
       ] ++ optional  needsUbootTools ubootTools
         ++ optionals (lib.versionAtLeast version "5.2")  [ cpio pahole zlib ]
         ++ optionals withRust [ rustc rust-bindgen ];

From 41ffc4bf9a7627b514336de05b723e62c0764bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 3 Jul 2024 06:14:31 -0700
Subject: [PATCH 112/319] python312Packages.pybind11: 2.12.0 -> 2.13.1

Diff: https://github.com/pybind/pybind11/compare/v2.12.0...v2.13.1

Changelog: https://github.com/pybind/pybind11/blob/v2.13.1/docs/changelog.rst
---
 .../python-modules/pybind11/default.nix        | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index b0b766160712..9ca1e3769566 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   ninja,
   setuptools,
@@ -51,29 +50,16 @@ let
 in
 buildPythonPackage rec {
   pname = "pybind11";
-  version = "2.12.0";
+  version = "2.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
     rev = "v${version}";
-    hash = "sha256-DVkI5NxM5uME9m3PFYVpJOOa2j+yjL6AJn76fCTv2nE=";
+    hash = "sha256-sQUq39CmgsDEMfluKMrrnC5fio//pgExcyqJAE00UjU=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # https://github.com/pybind/pybind11/pull/5127
-      url = "https://github.com/pybind/pybind11/commit/540bef2d2c9fb54fa7c1474ee1af959ce90f2b32.patch";
-      hash = "sha256-0ZWlH/5kQ3An/tu6ulOXO2k32asATrr1mlI4nGjIqaI=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "timeout=300" ""
-  '';
-
   build-system = [
     cmake
     ninja

From 1fe40c0034c4e76dc241f97c033bd28906112abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 3 Jul 2024 06:40:55 -0700
Subject: [PATCH 113/319] python312Packages.scipy: relax pybind11 constraint

Upstream states that "distro packages can ignore upper bounds added only
to prevent future breakage."
---
 pkgs/development/python-modules/scipy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 43e256b1fba6..c6daa99905d2 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -92,6 +92,7 @@ buildPythonPackage {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \
+      --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \
   '';
 
   nativeBuildInputs = [

From a9709c299b8a48839ad044cccaaf11f6caf614c3 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 2 Jul 2024 17:04:59 +0800
Subject: [PATCH 114/319] treewide: change cargoSha256 with SRI hash to
 cargoHash

---
 pkgs/applications/audio/librespot/default.nix                 | 2 +-
 pkgs/applications/audio/mmtc/default.nix                      | 2 +-
 pkgs/applications/display-managers/greetd/tuigreet.nix        | 2 +-
 pkgs/applications/editors/kibi/default.nix                    | 2 +-
 pkgs/applications/editors/vim/plugins/overrides.nix           | 2 +-
 pkgs/applications/graphics/epick/default.nix                  | 2 +-
 pkgs/applications/graphics/image-roll/default.nix             | 2 +-
 pkgs/applications/graphics/menyoki/default.nix                | 2 +-
 pkgs/applications/graphics/rx/default.nix                     | 2 +-
 pkgs/applications/misc/doctave/default.nix                    | 2 +-
 pkgs/applications/misc/eureka-ideas/default.nix               | 2 +-
 pkgs/applications/misc/inherd-quake/default.nix               | 2 +-
 pkgs/applications/misc/pastel/default.nix                     | 2 +-
 pkgs/applications/misc/pipr/default.nix                       | 2 +-
 pkgs/applications/misc/pomodoro/default.nix                   | 2 +-
 pkgs/applications/misc/pop-launcher/default.nix               | 2 +-
 pkgs/applications/misc/process-viewer/default.nix             | 2 +-
 pkgs/applications/misc/rusty-psn/default.nix                  | 2 +-
 pkgs/applications/misc/stork/default.nix                      | 2 +-
 pkgs/applications/misc/thokr/default.nix                      | 2 +-
 pkgs/applications/networking/browsers/asuka/default.nix       | 2 +-
 pkgs/applications/networking/browsers/castor/default.nix      | 2 +-
 pkgs/applications/networking/gopher/phetch/default.nix        | 2 +-
 pkgs/applications/networking/lls/default.nix                  | 2 +-
 pkgs/applications/networking/mujmap/default.nix               | 2 +-
 pkgs/applications/networking/ncgopher/default.nix             | 2 +-
 .../science/machine-learning/finalfrontier/default.nix        | 2 +-
 .../science/machine-learning/finalfusion-utils/default.nix    | 2 +-
 pkgs/applications/version-management/fornalder/default.nix    | 2 +-
 pkgs/applications/version-management/git-quickfix/default.nix | 2 +-
 .../applications/version-management/git-workspace/default.nix | 2 +-
 pkgs/applications/version-management/verco/default.nix        | 2 +-
 pkgs/applications/video/alass/default.nix                     | 2 +-
 pkgs/applications/video/sub-batch/default.nix                 | 2 +-
 .../virtualization/rust-hypervisor-firmware/default.nix       | 2 +-
 pkgs/applications/virtualization/stratovirt/default.nix       | 2 +-
 pkgs/applications/window-managers/dwm/dwm-status.nix          | 2 +-
 pkgs/applications/window-managers/i3/auto-layout.nix          | 2 +-
 pkgs/applications/window-managers/i3/wsr.nix                  | 2 +-
 .../build-support/rust/build-rust-package/sysroot/default.nix | 2 +-
 pkgs/by-name/ba/bankstown-lv2/package.nix                     | 2 +-
 pkgs/by-name/ba/batmon/package.nix                            | 2 +-
 pkgs/by-name/co/commitmsgfmt/package.nix                      | 2 +-
 pkgs/by-name/el/elf2nucleus/package.nix                       | 2 +-
 pkgs/by-name/gp/gpustat/package.nix                           | 2 +-
 pkgs/by-name/sw/swaycons/package.nix                          | 2 +-
 pkgs/by-name/sw/swayws/package.nix                            | 2 +-
 pkgs/by-name/tr/treefmt1/package.nix                          | 2 +-
 pkgs/by-name/tw/twiggy/package.nix                            | 2 +-
 pkgs/by-name/wa/wapm/package.nix                              | 2 +-
 pkgs/by-name/wl/wldash/package.nix                            | 2 +-
 pkgs/development/compilers/scryer-prolog/default.nix          | 2 +-
 pkgs/development/interpreters/yex-lang/default.nix            | 2 +-
 pkgs/development/tools/analysis/dotenv-linter/default.nix     | 2 +-
 pkgs/development/tools/build-managers/fac/default.nix         | 2 +-
 pkgs/development/tools/bunyan-rs/default.nix                  | 2 +-
 pkgs/development/tools/cbfmt/default.nix                      | 2 +-
 .../buildkite-test-collector-rust/default.nix                 | 2 +-
 pkgs/development/tools/database/indradb/default.nix           | 4 ++--
 pkgs/development/tools/dum/default.nix                        | 2 +-
 pkgs/development/tools/dump_syms/default.nix                  | 2 +-
 pkgs/development/tools/frece/default.nix                      | 2 +-
 pkgs/development/tools/graphql-client/default.nix             | 2 +-
 pkgs/development/tools/hors/default.nix                       | 2 +-
 pkgs/development/tools/htmlq/default.nix                      | 2 +-
 pkgs/development/tools/knightos/regenkfs/default.nix          | 2 +-
 pkgs/development/tools/knightos/remkrom/default.nix           | 2 +-
 pkgs/development/tools/krankerl/default.nix                   | 2 +-
 pkgs/development/tools/misc/dura/default.nix                  | 2 +-
 pkgs/development/tools/misc/highlight-assertions/default.nix  | 2 +-
 pkgs/development/tools/misc/pest-ide-tools/default.nix        | 2 +-
 pkgs/development/tools/misc/python-launcher/default.nix       | 2 +-
 pkgs/development/tools/misc/rtss/default.nix                  | 2 +-
 pkgs/development/tools/misc/tokei/default.nix                 | 2 +-
 pkgs/development/tools/misc/unused/default.nix                | 2 +-
 pkgs/development/tools/nufmt/default.nix                      | 2 +-
 pkgs/development/tools/pactorio/default.nix                   | 2 +-
 pkgs/development/tools/perseus-cli/default.nix                | 2 +-
 pkgs/development/tools/rebazel/default.nix                    | 2 +-
 pkgs/development/tools/remodel/default.nix                    | 2 +-
 pkgs/development/tools/rover/default.nix                      | 2 +-
 pkgs/development/tools/rq/default.nix                         | 2 +-
 pkgs/development/tools/rslint/default.nix                     | 2 +-
 pkgs/development/tools/rust/cargo-apk/default.nix             | 2 +-
 pkgs/development/tools/rust/cargo-binutils/default.nix        | 2 +-
 pkgs/development/tools/rust/cargo-bitbake/default.nix         | 2 +-
 pkgs/development/tools/rust/cargo-bolero/default.nix          | 2 +-
 pkgs/development/tools/rust/cargo-cache/default.nix           | 2 +-
 pkgs/development/tools/rust/cargo-criterion/default.nix       | 2 +-
 pkgs/development/tools/rust/cargo-cross/default.nix           | 2 +-
 pkgs/development/tools/rust/cargo-feature/default.nix         | 2 +-
 pkgs/development/tools/rust/cargo-flamegraph/default.nix      | 2 +-
 pkgs/development/tools/rust/cargo-guppy/default.nix           | 2 +-
 pkgs/development/tools/rust/cargo-hf2/default.nix             | 2 +-
 pkgs/development/tools/rust/cargo-limit/default.nix           | 2 +-
 pkgs/development/tools/rust/cargo-llvm-cov/default.nix        | 2 +-
 pkgs/development/tools/rust/cargo-msrv/default.nix            | 2 +-
 pkgs/development/tools/rust/cargo-play/default.nix            | 2 +-
 pkgs/development/tools/rust/cargo-readme/default.nix          | 2 +-
 pkgs/development/tools/rust/cargo-rr/default.nix              | 2 +-
 pkgs/development/tools/rust/cargo-sort/default.nix            | 2 +-
 pkgs/development/tools/rust/cargo-sweep/default.nix           | 2 +-
 pkgs/development/tools/rust/cargo-sync-readme/default.nix     | 2 +-
 pkgs/development/tools/rust/cargo-valgrind/default.nix        | 2 +-
 pkgs/development/tools/rust/cargo-vet/default.nix             | 2 +-
 pkgs/development/tools/rust/cargo-wipe/default.nix            | 2 +-
 pkgs/development/tools/rust/cauwugo/default.nix               | 2 +-
 pkgs/development/tools/rust/cbindgen/default.nix              | 2 +-
 pkgs/development/tools/rust/gitlab-clippy/default.nix         | 2 +-
 pkgs/development/tools/rust/ograc/default.nix                 | 2 +-
 pkgs/development/tools/rust/rhack/default.nix                 | 2 +-
 pkgs/development/tools/rust/roogle/default.nix                | 2 +-
 pkgs/development/tools/rust/rust-analyzer/default.nix         | 2 +-
 pkgs/development/tools/rust/rust-audit-info/default.nix       | 2 +-
 pkgs/development/tools/rust/rustfilt/default.nix              | 2 +-
 pkgs/development/tools/rust/rusty-man/default.nix             | 2 +-
 pkgs/development/tools/so/default.nix                         | 2 +-
 pkgs/development/tools/spr/default.nix                        | 2 +-
 pkgs/development/tools/swc/default.nix                        | 2 +-
 pkgs/development/tools/systemfd/default.nix                   | 2 +-
 pkgs/games/cl-wordle/default.nix                              | 2 +-
 pkgs/games/freenukum/default.nix                              | 2 +-
 pkgs/games/rpg-cli/default.nix                                | 2 +-
 pkgs/games/shticker-book-unwritten/unwrapped.nix              | 2 +-
 pkgs/games/steam-tui/default.nix                              | 2 +-
 pkgs/os-specific/linux/fanctl/default.nix                     | 2 +-
 pkgs/os-specific/linux/system76-power/default.nix             | 2 +-
 pkgs/os-specific/linux/system76-scheduler/default.nix         | 2 +-
 pkgs/servers/bindle/default.nix                               | 2 +-
 pkgs/servers/microserver/default.nix                          | 2 +-
 pkgs/servers/monitoring/kapacitor/default.nix                 | 2 +-
 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix     | 2 +-
 pkgs/servers/roapi/http.nix                                   | 2 +-
 pkgs/servers/scaphandre/default.nix                           | 2 +-
 pkgs/servers/tarssh/default.nix                               | 2 +-
 pkgs/servers/udpt/default.nix                                 | 2 +-
 pkgs/servers/unpfs/default.nix                                | 2 +-
 pkgs/tools/admin/colmena/default.nix                          | 2 +-
 pkgs/tools/archivers/gbl/default.nix                          | 2 +-
 pkgs/tools/audio/pw-volume/default.nix                        | 2 +-
 pkgs/tools/backup/bupstash/default.nix                        | 2 +-
 pkgs/tools/backup/rdedup/default.nix                          | 2 +-
 pkgs/tools/filesystems/supertag/default.nix                   | 2 +-
 pkgs/tools/graphics/dnglab/default.nix                        | 2 +-
 pkgs/tools/graphics/shotgun/default.nix                       | 2 +-
 pkgs/tools/graphics/svgcleaner/default.nix                    | 2 +-
 pkgs/tools/graphics/viu/default.nix                           | 2 +-
 pkgs/tools/graphics/vulkan-helper/default.nix                 | 2 +-
 pkgs/tools/graphics/xcolor/default.nix                        | 2 +-
 pkgs/tools/misc/aaa/default.nix                               | 2 +-
 pkgs/tools/misc/as-tree/default.nix                           | 2 +-
 pkgs/tools/misc/asciinema-scenario/default.nix                | 2 +-
 pkgs/tools/misc/bartib/default.nix                            | 2 +-
 pkgs/tools/misc/bottom-rs/default.nix                         | 2 +-
 pkgs/tools/misc/coinlive/default.nix                          | 2 +-
 pkgs/tools/misc/didyoumean/default.nix                        | 2 +-
 pkgs/tools/misc/dijo/default.nix                              | 2 +-
 pkgs/tools/misc/diskus/default.nix                            | 2 +-
 pkgs/tools/misc/eva/default.nix                               | 2 +-
 pkgs/tools/misc/fsrx/default.nix                              | 2 +-
 pkgs/tools/misc/g933-utils/default.nix                        | 2 +-
 pkgs/tools/misc/gh-cal/default.nix                            | 2 +-
 pkgs/tools/misc/handlr/default.nix                            | 2 +-
 pkgs/tools/misc/heatseeker/default.nix                        | 2 +-
 pkgs/tools/misc/hiksink/default.nix                           | 2 +-
 pkgs/tools/misc/ikill/default.nix                             | 2 +-
 pkgs/tools/misc/jsonwatch/default.nix                         | 2 +-
 pkgs/tools/misc/lazycli/default.nix                           | 2 +-
 pkgs/tools/misc/lemmy-help/default.nix                        | 2 +-
 pkgs/tools/misc/moon-phases/default.nix                       | 2 +-
 pkgs/tools/misc/natls/default.nix                             | 2 +-
 pkgs/tools/misc/nvfancontrol/default.nix                      | 2 +-
 pkgs/tools/misc/octofetch/default.nix                         | 2 +-
 pkgs/tools/misc/owofetch/default.nix                          | 2 +-
 pkgs/tools/misc/rates/default.nix                             | 2 +-
 pkgs/tools/misc/ristate/default.nix                           | 2 +-
 pkgs/tools/misc/sanctity/default.nix                          | 2 +-
 pkgs/tools/misc/sfz/default.nix                               | 2 +-
 pkgs/tools/misc/sheldon/default.nix                           | 2 +-
 pkgs/tools/misc/synth/default.nix                             | 2 +-
 pkgs/tools/misc/tealdeer/default.nix                          | 2 +-
 pkgs/tools/misc/thumbs/default.nix                            | 2 +-
 pkgs/tools/misc/tremor-rs/ls.nix                              | 2 +-
 pkgs/tools/misc/urlencode/default.nix                         | 2 +-
 pkgs/tools/misc/uwuify/default.nix                            | 2 +-
 pkgs/tools/misc/watchlog/default.nix                          | 2 +-
 pkgs/tools/misc/writedisk/default.nix                         | 2 +-
 pkgs/tools/networking/boringtun/default.nix                   | 2 +-
 pkgs/tools/networking/bukubrow/default.nix                    | 2 +-
 pkgs/tools/networking/rconc/default.nix                       | 2 +-
 pkgs/tools/networking/rustcat/default.nix                     | 2 +-
 pkgs/tools/networking/suckit/default.nix                      | 2 +-
 pkgs/tools/networking/tox-node/default.nix                    | 2 +-
 pkgs/tools/networking/transmission-rss/default.nix            | 2 +-
 pkgs/tools/networking/wg-netmanager/default.nix               | 2 +-
 pkgs/tools/nix/nix-query-tree-viewer/default.nix              | 2 +-
 pkgs/tools/nix/nixel/default.nix                              | 2 +-
 pkgs/tools/nix/nixpkgs-fmt/default.nix                        | 2 +-
 pkgs/tools/nix/npins/default.nix                              | 2 +-
 pkgs/tools/nix/rnix-hashes/default.nix                        | 2 +-
 pkgs/tools/nix/statix/default.nix                             | 2 +-
 pkgs/tools/package-management/nix-doc/default.nix             | 2 +-
 pkgs/tools/package-management/nix-du/default.nix              | 2 +-
 pkgs/tools/package-management/nix-template/default.nix        | 2 +-
 pkgs/tools/security/authoscope/default.nix                    | 2 +-
 pkgs/tools/security/keyscope/default.nix                      | 2 +-
 pkgs/tools/security/lethe/default.nix                         | 2 +-
 pkgs/tools/security/shisho/default.nix                        | 2 +-
 pkgs/tools/security/weggli/default.nix                        | 2 +-
 pkgs/tools/system/safe-rm/default.nix                         | 2 +-
 pkgs/tools/system/tre-command/default.nix                     | 2 +-
 pkgs/tools/text/anewer/default.nix                            | 2 +-
 pkgs/tools/text/choose/default.nix                            | 2 +-
 pkgs/tools/text/each/default.nix                              | 2 +-
 pkgs/tools/text/frawk/default.nix                             | 2 +-
 pkgs/tools/text/huniq/default.nix                             | 2 +-
 pkgs/tools/text/mdbook-footnote/default.nix                   | 2 +-
 pkgs/tools/text/mdbook-linkcheck/default.nix                  | 2 +-
 pkgs/tools/text/rnr/default.nix                               | 2 +-
 pkgs/tools/text/seehecht/default.nix                          | 2 +-
 pkgs/tools/text/tidy-viewer/default.nix                       | 2 +-
 pkgs/tools/text/tv/default.nix                                | 2 +-
 pkgs/tools/wayland/gnome-randr/default.nix                    | 2 +-
 pkgs/tools/wayland/wayout/default.nix                         | 2 +-
 224 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index dc60185fc0f7..46ece80638f6 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA=";
   };
 
-  cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
+  cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [
     rustPlatform.bindgenHook
diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix
index 8227d12bbcb5..384bd4492974 100644
--- a/pkgs/applications/audio/mmtc/default.nix
+++ b/pkgs/applications/audio/mmtc/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
   };
 
-  cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
+  cargoHash = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix
index e963a409ad61..11ca43c61436 100644
--- a/pkgs/applications/display-managers/greetd/tuigreet.nix
+++ b/pkgs/applications/display-managers/greetd/tuigreet.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
   };
 
-  cargoSha256 = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
+  cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
 
   meta = {
     description = "Graphical console greeter for greetd";
diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix
index 368249cc3fe8..33295cdc02e6 100644
--- a/pkgs/applications/editors/kibi/default.nix
+++ b/pkgs/applications/editors/kibi/default.nix
@@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
   pname = "kibi";
   version = "0.2.2";
 
-  cargoSha256 = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
+  cargoHash = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
 
   src = fetchFromGitHub {
     owner = "ilai-deutel";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 1389a0b5603e..7736ec5e94e1 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1816,7 +1816,7 @@
       vim-markdown-composer-bin = rustPlatform.buildRustPackage {
         pname = "vim-markdown-composer-bin";
         inherit (super.vim-markdown-composer) src version;
-        cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
+        cargoHash = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
         # tests require network access
         doCheck = false;
       };
diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix
index dee31abdd29d..45972aa169b6 100644
--- a/pkgs/applications/graphics/epick/default.nix
+++ b/pkgs/applications/graphics/epick/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU=";
   };
 
-  cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";
+  cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     pkg-config
diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix
index 2c142b7bbb80..2c1e86f22c7c 100644
--- a/pkgs/applications/graphics/image-roll/default.nix
+++ b/pkgs/applications/graphics/image-roll/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4=";
   };
 
-  cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
+  cargoHash = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
 
   nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ];
 
diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix
index 800ede30be42..8d965fe7b129 100644
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y=";
   };
 
-  cargoSha256 = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0=";
+  cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0=";
 
   nativeBuildInputs = [ installShellFiles ]
     ++ lib.optional stdenv.isLinux pkg-config;
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
index 77ed3f49117c..c2561ed82ae5 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
   };
 
-  cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
+  cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
 
   nativeBuildInputs = [ cmake pkg-config makeWrapper ];
 
diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix
index 487d8340265d..6b54636488e9 100644
--- a/pkgs/applications/misc/doctave/default.nix
+++ b/pkgs/applications/misc/doctave/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   # Cargo.lock is outdated
   cargoPatches = [ ./cargo-lock.patch ];
 
-  cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
+  cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     CoreServices
diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix
index 45e36010906b..f8f24fa63569 100644
--- a/pkgs/applications/misc/eureka-ideas/default.nix
+++ b/pkgs/applications/misc/eureka-ideas/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
   };
 
-  cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
+  cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix
index df47036b2d00..4f9c748730e5 100644
--- a/pkgs/applications/misc/inherd-quake/default.nix
+++ b/pkgs/applications/misc/inherd-quake/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q=";
   };
 
-  cargoSha256 = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w=";
+  cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 69e6a53758a4..f77bf332b57d 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc=";
   };
 
-  cargoSha256 = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
+  cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix
index f7aeb09b1f9b..466451443e47 100644
--- a/pkgs/applications/misc/pipr/default.nix
+++ b/pkgs/applications/misc/pipr/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
   };
 
-  cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
+  cargoHash = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
 
   nativeBuildInputs = [ makeWrapper ];
   postFixup = ''
diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix
index 35244bf041a7..77774b5343a5 100644
--- a/pkgs/applications/misc/pomodoro/default.nix
+++ b/pkgs/applications/misc/pomodoro/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ=";
   };
 
-  cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4=";
+  cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4=";
   buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix
index b8ba5133904b..b8e614485a29 100644
--- a/pkgs/applications/misc/pop-launcher/default.nix
+++ b/pkgs/applications/misc/pop-launcher/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
         --replace '/usr/bin/gnome-terminal' 'gnome-terminal'
   '';
 
-  cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
+  cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
 
   cargoBuildFlags = [ "--package" "pop-launcher-bin" ];
 
diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix
index 94327ef3e4db..f33e04f732df 100644
--- a/pkgs/applications/misc/process-viewer/default.nix
+++ b/pkgs/applications/misc/process-viewer/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws=";
   };
 
-  cargoSha256 = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc=";
+  cargoHash = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix
index d72905fe094f..3f45cb1e26c6 100644
--- a/pkgs/applications/misc/rusty-psn/default.nix
+++ b/pkgs/applications/misc/rusty-psn/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./fix-cargo-lock.patch ];
 
-  cargoSha256 = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU=";
+  cargoHash = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU=";
 
   # Tests require network access
   doCheck = false;
diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix
index ab851363d381..0de395549bdd 100644
--- a/pkgs/applications/misc/stork/default.nix
+++ b/pkgs/applications/misc/stork/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
   };
 
-  cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
+  cargoHash = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
 
   checkFlags = [
     # Fails for 1.6.0, but binary works fine
diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/applications/misc/thokr/default.nix
index 94363083ab9e..a0045ffb5152 100644
--- a/pkgs/applications/misc/thokr/default.nix
+++ b/pkgs/applications/misc/thokr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
   };
 
-  cargoSha256 = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
+  cargoHash = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
 
   meta = with lib; {
     description = "Typing tui with visualized results and historical logging";
diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix
index f36cf28b2d05..1451e4bbaabd 100644
--- a/pkgs/applications/networking/browsers/asuka/default.nix
+++ b/pkgs/applications/networking/browsers/asuka/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
   };
 
-  cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
+  cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix
index 78e2791c1bb4..b3f7abedba96 100644
--- a/pkgs/applications/networking/browsers/castor/default.nix
+++ b/pkgs/applications/networking/browsers/castor/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0=";
   };
 
-  cargoSha256 = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk=";
+  cargoHash = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix
index d8c30a9e6ab4..9f835c8535e2 100644
--- a/pkgs/applications/networking/gopher/phetch/default.nix
+++ b/pkgs/applications/networking/gopher/phetch/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ=";
   };
 
-  cargoSha256 = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
+  cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
 
   nativeBuildInputs = [ installShellFiles pkg-config scdoc which ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/applications/networking/lls/default.nix
index 3d4d70597e69..3662477fde16 100644
--- a/pkgs/applications/networking/lls/default.nix
+++ b/pkgs/applications/networking/lls/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw=";
   };
 
-  cargoSha256 = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
+  cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
 
   meta = with lib; {
     description = "Tool to list listening sockets";
diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix
index 60f49163be73..d89c17355046 100644
--- a/pkgs/applications/networking/mujmap/default.nix
+++ b/pkgs/applications/networking/mujmap/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
-  cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
+  cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
 
   buildInputs = [
     notmuch
diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix
index 6f7dcc512075..4d2f72c35439 100644
--- a/pkgs/applications/networking/ncgopher/default.nix
+++ b/pkgs/applications/networking/ncgopher/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
   };
 
-  cargoSha256 = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
+  cargoHash = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix
index 1a6e9351d3a7..eb70ea332b89 100644
--- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4=";
   };
 
-  cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";
+  cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index 0df8a0525be5..d88c73bdcb7a 100644
--- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
   };
 
-  cargoSha256 = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
+  cargoHash = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/applications/version-management/fornalder/default.nix
index 7d012c83606a..c7774a60cf2b 100644
--- a/pkgs/applications/version-management/fornalder/default.nix
+++ b/pkgs/applications/version-management/fornalder/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q=";
   };
 
-  cargoSha256 = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc=";
+  cargoHash = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix
index cfed9952f79e..9bc7e678d3ed 100644
--- a/pkgs/applications/version-management/git-quickfix/default.nix
+++ b/pkgs/applications/version-management/git-quickfix/default.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     libiconv
   ];
 
-  cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
+  cargoHash = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
 
   meta = with lib; {
     description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";
diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix
index fc16e778f28c..610647779269 100644
--- a/pkgs/applications/version-management/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-workspace/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw=";
   };
 
-  cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
+  cargoHash = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/applications/version-management/verco/default.nix
index ca41cdc00b7e..079b10d2f5dd 100644
--- a/pkgs/applications/version-management/verco/default.nix
+++ b/pkgs/applications/version-management/verco/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
   };
 
-  cargoSha256 = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
+  cargoHash = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
 
   meta = with lib; {
     description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/applications/video/alass/default.nix
index d6b6da1fd6b5..bbbbe91beb64 100644
--- a/pkgs/applications/video/alass/default.nix
+++ b/pkgs/applications/video/alass/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU=";
   };
 
-  cargoSha256 = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20=";
+  cargoHash = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix
index bc0d6bd3a6cb..713a0ad2753e 100644
--- a/pkgs/applications/video/sub-batch/default.nix
+++ b/pkgs/applications/video/sub-batch/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
   };
 
-  cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
+  cargoHash = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
index 8b408cc96ed4..193776fa5ec0 100644
--- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
+++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI=";
   };
 
-  cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
+  cargoHash = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
 
   # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
   # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249
diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix
index d9324d455c5c..ecc127a3a589 100644
--- a/pkgs/applications/virtualization/stratovirt/default.nix
+++ b/pkgs/applications/virtualization/stratovirt/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI=";
   };
 
-  cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
+  cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 1d5f84abe288..cb303ff268ae 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper pkg-config ];
   buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
 
-  cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
+  cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
 
   postInstall = lib.optionalString (bins != [])  ''
     wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"
diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix
index bfcb35a870c9..ef6c27de438e 100644
--- a/pkgs/applications/window-managers/i3/auto-layout.nix
+++ b/pkgs/applications/window-managers/i3/auto-layout.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
   };
 
-  cargoSha256 = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo=";
+  cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo=";
 
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;
diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix
index e64194ac3817..f282e38b6dca 100644
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU=";
   };
 
-  cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";
+  cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";
 
   nativeBuildInputs = [ python3 ];
   buildInputs = [ libxcb ];
diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
index bb95b7bdc35c..240866b56e0c 100644
--- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
@@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage {
 
   RUSTC_BOOTSTRAP = 1;
   __internal_dontAddSysroot = true;
-  cargoSha256 = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";
+  cargoHash = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix
index 2ee7b4486e01..7cbe4708ff38 100644
--- a/pkgs/by-name/ba/bankstown-lv2/package.nix
+++ b/pkgs/by-name/ba/bankstown-lv2/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
   };
 
-  cargoSha256 = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc=";
+  cargoHash = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc=";
 
   installPhase = ''
     export LIBDIR=$out/lib
diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix
index e41587b1f57b..5e5cf3f6501f 100644
--- a/pkgs/by-name/ba/batmon/package.nix
+++ b/pkgs/by-name/ba/batmon/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o=";
   };
 
-  cargoSha256 = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g=";
+  cargoHash = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g=";
 
   meta = with lib; {
     description = "Interactive batteries viewer";
diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix
index 508ce1f98312..e653fce2671a 100644
--- a/pkgs/by-name/co/commitmsgfmt/package.nix
+++ b/pkgs/by-name/co/commitmsgfmt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4=";
   };
-  cargoSha256 = "sha256-jTRB9ogFQGVC4C9xpGxsJYV3cnWydAJLMcjhzUPULTE=";
+  cargoHash = "sha256-jTRB9ogFQGVC4C9xpGxsJYV3cnWydAJLMcjhzUPULTE=";
 
   passthru.tests.version = testers.testVersion {
     package = commitmsgfmt;
diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix
index 08ec2e8f0a23..fad1d8719971 100644
--- a/pkgs/by-name/el/elf2nucleus/package.nix
+++ b/pkgs/by-name/el/elf2nucleus/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA=";
   };
 
-  cargoSha256 = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ=";
+  cargoHash = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix
index d98ff336ed39..428c2c583a0c 100644
--- a/pkgs/by-name/gp/gpustat/package.nix
+++ b/pkgs/by-name/gp/gpustat/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
   };
 
-  cargoSha256 = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU=";
+  cargoHash = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix
index b60b5a6115a2..c4f6e31a6a43 100644
--- a/pkgs/by-name/sw/swaycons/package.nix
+++ b/pkgs/by-name/sw/swaycons/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vyZcfBH2mry8Yd41QPX4+yLv0nS9J1yrgg7lpslJs7M=";
   };
 
-  cargoSha256 = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0=";
+  cargoHash = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0=";
 
   meta = with lib; {
     description = "Window Icons in Sway with Nerd Fonts!";
diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix
index 902db2f603d1..b0d7f69832fb 100644
--- a/pkgs/by-name/sw/swayws/package.nix
+++ b/pkgs/by-name/sw/swayws/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU=";
   };
 
-  cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo=";
+  cargoHash = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo=";
   # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1
   cargoPatches = [
     ./ws-update-Cargo-lock.patch
diff --git a/pkgs/by-name/tr/treefmt1/package.nix b/pkgs/by-name/tr/treefmt1/package.nix
index 48fc4b44962e..ab61a50bd955 100644
--- a/pkgs/by-name/tr/treefmt1/package.nix
+++ b/pkgs/by-name/tr/treefmt1/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-icAe54Mv1xpOjUPSk8QDZaMk2ueNvjER6UyJ9uyUL6s=";
   };
 
-  cargoSha256 = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc=";
+  cargoHash = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc=";
 
   meta = {
     description = "one CLI to format the code tree";
diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix
index 29e99a6841ed..92f04f17c1ba 100644
--- a/pkgs/by-name/tw/twiggy/package.nix
+++ b/pkgs/by-name/tw/twiggy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk=";
   };
 
-  cargoSha256 = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM=";
+  cargoHash = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM=";
 
   meta = with lib; {
     homepage = "https://rustwasm.github.io/twiggy/";
diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix
index f93867c59d82..afaaed863d67 100644
--- a/pkgs/by-name/wa/wapm/package.nix
+++ b/pkgs/by-name/wa/wapm/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs=";
   };
 
-  cargoSha256 = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8=";
+  cargoHash = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8=";
 
   nativeBuildInputs = [ perl ];
 
diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix
index ab45f201e8e6..ec6475ce83de 100644
--- a/pkgs/by-name/wl/wldash/package.nix
+++ b/pkgs/by-name/wl/wldash/package.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage {
     ./0002-Update-fontconfig.patch
   ];
 
-  cargoSha256 = "sha256-Y7nhj8VpO6sEzVkM3uPv8Tlk2jPn3c/uPJqFc/HjHI0=";
+  cargoHash = "sha256-Y7nhj8VpO6sEzVkM3uPv8Tlk2jPn3c/uPJqFc/HjHI0=";
 
   dontPatchELF = true;
 
diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix
index 49818fee3e10..7a63db530f96 100644
--- a/pkgs/development/compilers/scryer-prolog/default.nix
+++ b/pkgs/development/compilers/scryer-prolog/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
   };
 
-  cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo=";
+  cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix
index 772a2b5acf52..ba00c0ec0c7a 100644
--- a/pkgs/development/interpreters/yex-lang/default.nix
+++ b/pkgs/development/interpreters/yex-lang/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k=";
   };
 
-  cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI=";
+  cargoHash = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI=";
 
   meta = with lib; {
     homepage = "https://github.com/nonamescm/yex-lang";
diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix
index 75745be0148f..603cc1d1ccbb 100644
--- a/pkgs/development/tools/analysis/dotenv-linter/default.nix
+++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
   };
 
-  cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710=";
+  cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix
index c5253edb53e9..332d816b3860 100644
--- a/pkgs/development/tools/build-managers/fac/default.nix
+++ b/pkgs/development/tools/build-managers/fac/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
-  cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
+  cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
 
   # fac includes a unit test called ls_files_works which assumes it's
   # running in a git repo. Nix's sandbox runs cargo build outside git,
diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix
index 314af560ca87..35fc322b0567 100644
--- a/pkgs/development/tools/bunyan-rs/default.nix
+++ b/pkgs/development/tools/bunyan-rs/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA=";
   };
 
-  cargoSha256 = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac=";
+  cargoHash = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac=";
 
   meta = with lib; {
     description = "CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)";
diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/development/tools/cbfmt/default.nix
index 6b13d852b201..925c0ba210f0 100644
--- a/pkgs/development/tools/cbfmt/default.nix
+++ b/pkgs/development/tools/cbfmt/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE=";
   };
 
-  cargoSha256 = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo=";
+  cargoHash = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo=";
 
   passthru.tests.version = testers.testVersion {
     package = cbfmt;
diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index 709cd3e87fc7..28630e43b766 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     Security
   ];
 
-  cargoSha256 = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU=";
+  cargoHash = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix
index 0df697b8df9d..0db7ae07e659 100644
--- a/pkgs/development/tools/database/indradb/default.nix
+++ b/pkgs/development/tools/database/indradb/default.nix
@@ -27,7 +27,7 @@ in
     version = "unstable-2021-01-05";
     inherit src meta;
 
-    cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
+    cargoHash = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
 
     buildAndTestSubdir = "server";
 
@@ -45,7 +45,7 @@ in
     version = "unstable-2021-01-05";
     inherit src meta;
 
-    cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
+    cargoHash = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
 
     PROTOC = "${protobuf}/bin/protoc";
 
diff --git a/pkgs/development/tools/dum/default.nix b/pkgs/development/tools/dum/default.nix
index 6a68c502d968..201c81f3fd6c 100644
--- a/pkgs/development/tools/dum/default.nix
+++ b/pkgs/development/tools/dum/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rnm59zhpaa8nbbh6rh53svnlb484q1k6s4wc4w9516b18xhmkca";
   };
 
-  cargoSha256 = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto=";
+  cargoHash = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto=";
 
   meta = with lib; {
     description = "Npm scripts runner written in Rust";
diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix
index f29473ef85e7..631051ee3a2d 100644
--- a/pkgs/development/tools/dump_syms/default.nix
+++ b/pkgs/development/tools/dump_syms/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
     hash = "sha256-pZlWA7LZeMb+ZhnfQh9MzvDDlre1kkPc6aSVNZcVi/w=";
   };
 
-  cargoSha256 = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg=";
+  cargoHash = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/development/tools/frece/default.nix
index c8b6a3a85f9c..6e872aa2a6cc 100644
--- a/pkgs/development/tools/frece/default.nix
+++ b/pkgs/development/tools/frece/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
   };
 
-  cargoSha256 = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU=";
+  cargoHash = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU=";
 
   meta = with lib; {
     description = "Maintain a database sorted by frecency (frequency + recency)";
diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix
index 05b49c7a03ff..e0772ee6453b 100644
--- a/pkgs/development/tools/graphql-client/default.nix
+++ b/pkgs/development/tools/graphql-client/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4=";
   };
 
-  cargoSha256 = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s=";
+  cargoHash = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix
index 39710ad74acd..4ecea68c18ec 100644
--- a/pkgs/development/tools/hors/default.nix
+++ b/pkgs/development/tools/hors/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0";
   };
 
-  cargoSha256 = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o=";
+  cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix
index 6a5015c600fc..7e55740d03ba 100644
--- a/pkgs/development/tools/htmlq/default.nix
+++ b/pkgs/development/tools/htmlq/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0=";
   };
 
-  cargoSha256 = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY=";
+  cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/development/tools/knightos/regenkfs/default.nix
index c50b10527f52..b8d4ed3b1554 100644
--- a/pkgs/development/tools/knightos/regenkfs/default.nix
+++ b/pkgs/development/tools/knightos/regenkfs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y=";
   };
 
-  cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ=";
+  cargoHash = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ=";
 
   buildFeatures = [ "c-undef" ];
 
diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/development/tools/knightos/remkrom/default.nix
index bfc01c469b59..45384a5fc64a 100644
--- a/pkgs/development/tools/knightos/remkrom/default.nix
+++ b/pkgs/development/tools/knightos/remkrom/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI=";
   };
 
-  cargoSha256 = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM=";
+  cargoHash = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM=";
 
   meta = with lib; {
     description = "Reimplementation of mkrom in Rust";
diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix
index bad8a8471790..51d0e5e634b9 100644
--- a/pkgs/development/tools/krankerl/default.nix
+++ b/pkgs/development/tools/krankerl/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg=";
   };
 
-  cargoSha256 = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ=";
+  cargoHash = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix
index c2b4b4206dc2..34b5127e118e 100644
--- a/pkgs/development/tools/misc/dura/default.nix
+++ b/pkgs/development/tools/misc/dura/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM=";
   };
 
-  cargoSha256 = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48=";
+  cargoHash = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48=";
 
   cargoPatches = [
     ./Cargo.lock.patch
diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/development/tools/misc/highlight-assertions/default.nix
index 5dd965d6c096..b2f595cb01ba 100644
--- a/pkgs/development/tools/misc/highlight-assertions/default.nix
+++ b/pkgs/development/tools/misc/highlight-assertions/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg=";
   };
 
-  cargoSha256 = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo=";
+  cargoHash = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo=";
 
   # requires nightly features
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix
index d3a31c8118a6..a962444a6fa5 100644
--- a/pkgs/development/tools/misc/pest-ide-tools/default.nix
+++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix
@@ -11,7 +11,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "pest-ide-tools";
   version = "0.3.11";
-  cargoSha256 = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
+  cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
 
   src = fetchFromGitHub {
     owner = "pest-parser";
diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/development/tools/misc/python-launcher/default.nix
index a9531fbad6de..b5694a059596 100644
--- a/pkgs/development/tools/misc/python-launcher/default.nix
+++ b/pkgs/development/tools/misc/python-launcher/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1r2pmli4jsdjag9zsgd9q1qlj3hxxjj2bni6yybjh1a10fcqxzzv";
   };
 
-  cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4=";
+  cargoHash = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4=";
 
   nativeCheckInputs = [ python3 ];
 
diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/development/tools/misc/rtss/default.nix
index 4172919d42f2..5545d90281cd 100644
--- a/pkgs/development/tools/misc/rtss/default.nix
+++ b/pkgs/development/tools/misc/rtss/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM=";
   };
 
-  cargoSha256 = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc=";
+  cargoHash = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc=";
 
   meta = with lib; {
     description = "Annotate output with relative durations between lines";
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 2008d134b538..ff3ceafc7f5c 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI=";
   };
 
-  cargoSha256 = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8=";
+  cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     libiconv Security
diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix
index 56166b0c8599..9c7875146690 100644
--- a/pkgs/development/tools/misc/unused/default.nix
+++ b/pkgs/development/tools/misc/unused/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cargoSha256 = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs=";
+  cargoHash = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs=";
 
   meta = with lib; {
     description = "Tool to identify potentially unused code";
diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/development/tools/nufmt/default.nix
index d9f2732aedd7..4c9e6ff4af6a 100644
--- a/pkgs/development/tools/nufmt/default.nix
+++ b/pkgs/development/tools/nufmt/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     IOKit
   ]);
 
-  cargoSha256 = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc=";
+  cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc=";
 
   meta = with lib; {
     description = "Nushell formatter";
diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix
index 851c2c895444..e6254bdbbb6f 100644
--- a/pkgs/development/tools/pactorio/default.nix
+++ b/pkgs/development/tools/pactorio/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A=";
   };
 
-  cargoSha256 = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY=";
+  cargoHash = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY=";
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
 
diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix
index a72ceab056ef..f80287c05d0c 100644
--- a/pkgs/development/tools/perseus-cli/default.nix
+++ b/pkgs/development/tools/perseus-cli/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs=";
   };
 
-  cargoSha256 = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0=";
+  cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0=";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix
index 6cc64e116981..d5979ac53dbd 100644
--- a/pkgs/development/tools/rebazel/default.nix
+++ b/pkgs/development/tools/rebazel/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME=";
   };
 
-  cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
+  cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix
index c9374d3a8dec..2788f4fb11d8 100644
--- a/pkgs/development/tools/remodel/default.nix
+++ b/pkgs/development/tools/remodel/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI=";
   };
 
-  cargoSha256 = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg=";
+  cargoHash = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix
index 6e69aca6dd25..184cd6ccccba 100644
--- a/pkgs/development/tools/rover/default.nix
+++ b/pkgs/development/tools/rover/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-c1Tnb9ACyV6RZmYnLL+KnybGgy8kwGi0JyWYcoH1J6M=";
   };
 
-  cargoSha256 = "sha256-wTvQ4QBysppMgwv9pjQckVjMoBzLiDReOt6sJImqKFY=";
+  cargoHash = "sha256-wTvQ4QBysppMgwv9pjQckVjMoBzLiDReOt6sJImqKFY=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index f8ed521ad2cc..b5624092c852 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI=";
   };
 
-  cargoSha256 = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA=";
+  cargoHash = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA=";
 
   postPatch = ''
     # Remove #[deny(warnings)] which is equivalent to -Werror in C.
diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/development/tools/rslint/default.nix
index cac55f4bb351..28dfadd4cd75 100644
--- a/pkgs/development/tools/rslint/default.nix
+++ b/pkgs/development/tools/rslint/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc=";
   };
 
-  cargoSha256 = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY=";
+  cargoHash = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY=";
 
   cargoBuildFlags = [
     "-p" "rslint_cli"
diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/development/tools/rust/cargo-apk/default.nix
index 130894a72ade..d2ecaadfe83d 100644
--- a/pkgs/development/tools/rust/cargo-apk/default.nix
+++ b/pkgs/development/tools/rust/cargo-apk/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A=";
   };
 
-  cargoSha256 = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w=";
+  cargoHash = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w=";
 
   meta = with lib; {
     description = "Tool for creating Android packages";
diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix
index ddb5e3c199bf..1a033a3c07db 100644
--- a/pkgs/development/tools/rust/cargo-binutils/default.nix
+++ b/pkgs/development/tools/rust/cargo-binutils/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI=";
   };
 
-  cargoSha256 = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk=";
+  cargoHash = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk=";
 
   meta = with lib; {
     description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";
diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/development/tools/rust/cargo-bitbake/default.nix
index ed3f5a243cb3..91b491202220 100644
--- a/pkgs/development/tools/rust/cargo-bitbake/default.nix
+++ b/pkgs/development/tools/rust/cargo-bitbake/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
-  cargoSha256 = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg=";
+  cargoHash = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg=";
 
   meta = with lib; {
     description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust";
diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix
index 550ced495ef2..2c9121ecddff 100644
--- a/pkgs/development/tools/rust/cargo-bolero/default.nix
+++ b/pkgs/development/tools/rust/cargo-bolero/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk=";
   };
 
-  cargoSha256 = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M=";
+  cargoHash = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M=";
 
   buildInputs = [ libbfd libopcodes libunwind ];
 
diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix
index a1151c161ffd..8c8a4ea29a34 100644
--- a/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs=";
   };
 
-  cargoSha256 = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38=";
+  cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix
index 986892a68b4d..b139a4ce3a0c 100644
--- a/pkgs/development/tools/rust/cargo-criterion/default.nix
+++ b/pkgs/development/tools/rust/cargo-criterion/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
   };
 
-  cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08=";
+  cargoHash = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08=";
 
   meta = with lib; {
     description = "Cargo extension for running Criterion.rs benchmarks";
diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix
index d94c15890bb1..772461683bf3 100644
--- a/pkgs/development/tools/rust/cargo-cross/default.nix
+++ b/pkgs/development/tools/rust/cargo-cross/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38=";
   };
 
-  cargoSha256 = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c=";
+  cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c=";
 
   checkFlags = [
     "--skip=docker::shared::tests::directories::test_host"
diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix
index c09447ebbc04..1e713076e1f3 100644
--- a/pkgs/development/tools/rust/cargo-feature/default.nix
+++ b/pkgs/development/tools/rust/cargo-feature/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s=";
   };
 
-  cargoSha256 = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
+  cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 
diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
index 1e90dedcccde..4a6d9c3ff39d 100644
--- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VrC3c3a1G8mn9U6txeynsaWOL4HQQk2IOiQqS52iPGo=";
   };
 
-  cargoSha256 = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU=";
+  cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
   buildInputs = lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix
index b373b584d9da..13bb3eaff1cf 100644
--- a/pkgs/development/tools/rust/cargo-guppy/default.nix
+++ b/pkgs/development/tools/rust/cargo-guppy/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk=";
   };
 
-  cargoSha256 = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw=";
+  cargoHash = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix
index b49f7904812f..17f63ee90461 100644
--- a/pkgs/development/tools/rust/cargo-hf2/default.nix
+++ b/pkgs/development/tools/rust/cargo-hf2/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU=";
   };
 
-  cargoSha256 = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI=";
+  cargoHash = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix
index f52f76a3de5e..958bfeb447c3 100644
--- a/pkgs/development/tools/rust/cargo-limit/default.nix
+++ b/pkgs/development/tools/rust/cargo-limit/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
   };
 
-  cargoSha256 = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik=";
+  cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
index 5bced7f36e9c..437414ffaa34 100644
--- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
+++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage {
     cp ${cargoLock} source/Cargo.lock
   '';
 
-  cargoSha256 = "sha256-6VQEu38g5a8bfbs8P/nOa3Zg2bSYnEOClzoMF95LAHI=";
+  cargoHash = "sha256-6VQEu38g5a8bfbs8P/nOa3Zg2bSYnEOClzoMF95LAHI=";
 
   # `cargo-llvm-cov` reads these environment variables to find these binaries,
   # which are needed to run the tests
diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix
index 1492de85daa0..e8b23c70bd11 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg=";
   };
 
-  cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
+  cargoHash = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
 
   passthru = {
     updateScript = gitUpdater {
diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix
index 94520d0d5669..a95f2c10c32e 100644
--- a/pkgs/development/tools/rust/cargo-play/default.nix
+++ b/pkgs/development/tools/rust/cargo-play/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
   };
 
-  cargoSha256 = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ=";
+  cargoHash = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ=";
 
   # these tests require internet access
   checkFlags = [
diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix
index aa4a6cf5ea37..8924195b4e76 100644
--- a/pkgs/development/tools/rust/cargo-readme/default.nix
+++ b/pkgs/development/tools/rust/cargo-readme/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
   };
 
-  cargoSha256 = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ=";
+  cargoHash = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ=";
 
   # disable doc tests
   cargoTestFlags = [
diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix
index 6c3780719f89..cccd1368a802 100644
--- a/pkgs/development/tools/rust/cargo-rr/default.nix
+++ b/pkgs/development/tools/rust/cargo-rr/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
   };
 
-  cargoSha256 = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM=";
+  cargoHash = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix
index cb8efeef1230..53f941e788d0 100644
--- a/pkgs/development/tools/rust/cargo-sort/default.nix
+++ b/pkgs/development/tools/rust/cargo-sort/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
   };
 
-  cargoSha256 = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU=";
+  cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU=";
 
   meta = with lib; {
     description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically";
diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix
index 08e0416a9aef..8e04ed2bc9f8 100644
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
   };
 
-  cargoSha256 = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro=";
+  cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro=";
 
   checkFlags = [
     # Requires a rustup toolchain to be installed.
diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix
index c790f097a2a9..953553cb948c 100644
--- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix
+++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
   };
 
-  cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";
+  cargoHash = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";
 
   meta = with lib; {
     description = "Cargo plugin that generates a Markdown section in your README based on your Rust documentation";
diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix
index e084c528c9c2..1020caad551b 100644
--- a/pkgs/development/tools/rust/cargo-valgrind/default.nix
+++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc=";
   };
 
-  cargoSha256 = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28=";
+  cargoHash = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix
index 0d71a77baabe..96822b3078d2 100644
--- a/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/pkgs/development/tools/rust/cargo-vet/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ=";
   };
 
-  cargoSha256 = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso=";
+  cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix
index 86a2dc58050b..af9ae57c7cb8 100644
--- a/pkgs/development/tools/rust/cargo-wipe/default.nix
+++ b/pkgs/development/tools/rust/cargo-wipe/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc=";
   };
 
-  cargoSha256 = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ=";
+  cargoHash = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/development/tools/rust/cauwugo/default.nix
index 29a7fed01102..bfc591bff806 100644
--- a/pkgs/development/tools/rust/cauwugo/default.nix
+++ b/pkgs/development/tools/rust/cauwugo/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww=";
   };
 
-  cargoSha256 = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4=";
+  cargoHash = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index da73d1ca6ea6..1e4d755fde0b 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gyNZAuxpeOjuC+Rh9jAyHSBQRRYUlYoIrBKuCFg3Hao=";
   };
 
-  cargoSha256 = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc=";
+  cargoHash = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/development/tools/rust/gitlab-clippy/default.nix
index 62b3046f05d8..142dde48fbec 100644
--- a/pkgs/development/tools/rust/gitlab-clippy/default.nix
+++ b/pkgs/development/tools/rust/gitlab-clippy/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = version;
     sha256 = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y=";
   };
-  cargoSha256 = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk=";
+  cargoHash = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk=";
 
   # TODO re-add theses tests once they get fixed in upstream
   checkFlags = [
diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/development/tools/rust/ograc/default.nix
index 83938a505316..fc0d516481bb 100644
--- a/pkgs/development/tools/rust/ograc/default.nix
+++ b/pkgs/development/tools/rust/ograc/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage {
     rev = "d09b3102ff7a364bf2593589327a16a473bd4f25";
     sha256 = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo=";
   };
-  cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
+  cargoHash = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
 
   meta = with lib; {
     description = "like cargo, but backwards";
diff --git a/pkgs/development/tools/rust/rhack/default.nix b/pkgs/development/tools/rust/rhack/default.nix
index 967a8a9216f7..5be698ca6eb8 100644
--- a/pkgs/development/tools/rust/rhack/default.nix
+++ b/pkgs/development/tools/rust/rhack/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237";
   };
 
-  cargoSha256 = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s=";
+  cargoHash = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s=";
 
   meta = with lib; {
     description = "Temporary edit external crates that your project depends on";
diff --git a/pkgs/development/tools/rust/roogle/default.nix b/pkgs/development/tools/rust/roogle/default.nix
index 2dbca708add5..2964f07f06b6 100644
--- a/pkgs/development/tools/rust/roogle/default.nix
+++ b/pkgs/development/tools/rust/roogle/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r";
   };
 
-  cargoSha256 = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw=";
+  cargoHash = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw=";
 
   postInstall = ''
     mkdir -p $out/share/roogle
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 6443cae2f58c..9416e5f0c3ef 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -14,7 +14,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
   version = "2024-06-24";
-  cargoSha256 = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg=";
+  cargoHash = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/development/tools/rust/rust-audit-info/default.nix
index b0793e11ca38..f9bedf13c611 100644
--- a/pkgs/development/tools/rust/rust-audit-info/default.nix
+++ b/pkgs/development/tools/rust/rust-audit-info/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ=";
   };
 
-  cargoSha256 = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg=";
+  cargoHash = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg=";
 
   meta = with lib; {
     description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable";
diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/development/tools/rust/rustfilt/default.nix
index 353cdcdbfdc6..45312ccd7e49 100644
--- a/pkgs/development/tools/rust/rustfilt/default.nix
+++ b/pkgs/development/tools/rust/rustfilt/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ=";
   };
 
-  cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
+  cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
 
   meta = with lib; {
     description = "Demangle Rust symbol names using rustc-demangle";
diff --git a/pkgs/development/tools/rust/rusty-man/default.nix b/pkgs/development/tools/rust/rusty-man/default.nix
index 05b9f85af4db..164977facbe9 100644
--- a/pkgs/development/tools/rust/rusty-man/default.nix
+++ b/pkgs/development/tools/rust/rusty-man/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
   };
 
-  cargoSha256 = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0=";
+  cargoHash = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0=";
 
   meta = with lib; {
     description = "Command-line viewer for documentation generated by rustdoc";
diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix
index 6b0c37ec3fec..30563875a22c 100644
--- a/pkgs/development/tools/so/default.nix
+++ b/pkgs/development/tools/so/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8=";
   };
 
-  cargoSha256 = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o=";
+  cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix
index f2689c4692b1..2e569dc60fb7 100644
--- a/pkgs/development/tools/spr/default.nix
+++ b/pkgs/development/tools/spr/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc=";
   };
 
-  cargoSha256 = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8=";
+  cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix
index 7847c253e7e5..49254cdfd98c 100644
--- a/pkgs/development/tools/swc/default.nix
+++ b/pkgs/development/tools/swc/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw=";
   };
 
-  cargoSha256 = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g=";
+  cargoHash = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g=";
 
   buildFeatures = [ "swc_core/plugin_transform_host_native" ];
 
diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix
index 416c377490ae..3e5259ed376f 100644
--- a/pkgs/development/tools/systemfd/default.nix
+++ b/pkgs/development/tools/systemfd/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-HUJgYPD4C9fMUYKpzmIy9gDT6HAZDWw1JLMKLgzRQTY=";
   };
 
-  cargoSha256 = "sha256-UhfE9Q5E79rN2mjkNB5IAN/J0fbpoy9CmM6ojHQcFP0=";
+  cargoHash = "sha256-UhfE9Q5E79rN2mjkNB5IAN/J0fbpoy9CmM6ojHQcFP0=";
 
   meta = {
     description = "Convenient helper for passing sockets into another process";
diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/games/cl-wordle/default.nix
index 505c5166e42a..8765638b051c 100644
--- a/pkgs/games/cl-wordle/default.nix
+++ b/pkgs/games/cl-wordle/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
   };
 
-  cargoSha256 = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o=";
+  cargoHash = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o=";
 
   meta = with lib; {
     description = "Wordle TUI in Rust";
diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix
index ed6c41edac44..af202ffd528d 100644
--- a/pkgs/games/freenukum/default.nix
+++ b/pkgs/games/freenukum/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0=";
   };
 
-  cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M=";
+  cargoHash = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix
index b72a4f78008e..cdd6eb0e574a 100644
--- a/pkgs/games/rpg-cli/default.nix
+++ b/pkgs/games/rpg-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-rhG/EK68PWvQYoZdjhk0w7oNmh/QiTaAt4/WgEkgxEA=";
   };
 
-  cargoSha256 = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w=";
+  cargoHash = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w=";
 
   # tests assume the authors macbook, and thus fail
   doCheck = false;
diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix
index 1d49a220235f..c0ea37fe50c5 100644
--- a/pkgs/games/shticker-book-unwritten/unwrapped.nix
+++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4=";
   };
 
-  cargoSha256 = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc=";
+  cargoHash = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix
index 7a42404500bd..e21e353737d5 100644
--- a/pkgs/games/steam-tui/default.nix
+++ b/pkgs/games/steam-tui/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw=";
   };
 
-  cargoSha256 = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo=";
+  cargoHash = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo=";
 
   nativeBuildInputs = [
     openssl
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
index f55779bd9165..82d188eb48cd 100644
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw=";
   };
 
-  cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs=";
+  cargoHash = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs=";
 
   meta = with lib; {
     description = "Replacement for fancontrol with more fine-grained control interface in its config file";
diff --git a/pkgs/os-specific/linux/system76-power/default.nix b/pkgs/os-specific/linux/system76-power/default.nix
index 0dba9894d23e..adf0714d924c 100644
--- a/pkgs/os-specific/linux/system76-power/default.nix
+++ b/pkgs/os-specific/linux/system76-power/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus libusb1 ];
 
-  cargoSha256 = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0=";
+  cargoHash = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0=";
 
   postInstall = ''
     install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf
diff --git a/pkgs/os-specific/linux/system76-scheduler/default.nix b/pkgs/os-specific/linux/system76-scheduler/default.nix
index 0608fd1c10d0..9378c59ee063 100644
--- a/pkgs/os-specific/linux/system76-scheduler/default.nix
+++ b/pkgs/os-specific/linux/system76-scheduler/default.nix
@@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage {
     rev = version;
     hash = "sha256-o4noaLBXHDe7pMBHfQ85uzKJzwbBE5mkWq8h9l6iIZs=";
   };
-  cargoSha256 = "sha256-hpFDAhOzm4v3lBWwAl/10pS5xvKCScdKsp5wpCeQ+FE=";
+  cargoHash = "sha256-hpFDAhOzm4v3lBWwAl/10pS5xvKCScdKsp5wpCeQ+FE=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
   buildInputs = [ dbus pipewire ];
diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix
index 9c0920ee3a0c..8c642db25055 100644
--- a/pkgs/servers/bindle/default.nix
+++ b/pkgs/servers/bindle/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
 
-  cargoSha256 = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0=";
+  cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0=";
 
   cargoBuildFlags = [
     "--bin" "bindle"
diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix
index c6ca5edd70c7..acc223627fce 100644
--- a/pkgs/servers/microserver/default.nix
+++ b/pkgs/servers/microserver/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M=";
   };
 
-  cargoSha256 = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo=";
+  cargoHash = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo=";
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
 
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index fe1cf89fd2b4..20525bfbf965 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -40,7 +40,7 @@ let
       })
     ];
     sourceRoot = "${src.name}/libflux";
-    cargoSha256 = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko=";
+    cargoHash = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.isDarwin libiconv;
     pkgcfg = ''
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index bee50744cc89..50fe085d4a0d 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA=";
   };
 
-  cargoSha256 = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q=";
+  cargoHash = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q=";
 
   postPatch = ''
     # drop hardcoded linker names, fixing static build
diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix
index 7edc3dd89b2a..a855a9871494 100644
--- a/pkgs/servers/roapi/http.nix
+++ b/pkgs/servers/roapi/http.nix
@@ -22,7 +22,7 @@ in
 #     sha256 = "sha256-qHAO3h+TTCQQ7vdd4CoXVGfKZ1fIxTWKqbUNnRsJaok=";
 #   };
 
-#   cargoSha256 = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo=";
+#   cargoHash = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo=";
 
 #   buildAndTestSubdir = "roapi-http";
 
diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/servers/scaphandre/default.nix
index 07aee5a715b3..4d7d0c506075 100644
--- a/pkgs/servers/scaphandre/default.nix
+++ b/pkgs/servers/scaphandre/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cXwgPYTgom4KrL/PH53Fk6ChtALuMYyJ/oTrUKHCrzE=";
   };
 
-  cargoSha256 = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs=";
+  cargoHash = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix
index 9e07304de8d8..d2ce6e56c8c8 100644
--- a/pkgs/servers/tarssh/default.nix
+++ b/pkgs/servers/tarssh/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk=";
   };
 
-  cargoSha256 = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c=";
+  cargoHash = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c=";
 
   meta = with lib; {
     description = "Simple SSH tarpit inspired by endlessh";
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix
index b5c601a9305b..59dd539e404c 100644
--- a/pkgs/servers/udpt/default.nix
+++ b/pkgs/servers/udpt/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-G3LzbV3b1Y/2SPIBS1kZDuLuGF5gV/H1LFBRhevpdjU=";
   };
 
-  cargoSha256 = "sha256-ebLVyUB65fW8BWctxXnYxrnl/2IESd4YJXeiMsMXn9s=";
+  cargoHash = "sha256-ebLVyUB65fW8BWctxXnYxrnl/2IESd4YJXeiMsMXn9s=";
 
   postInstall = ''
     install -D udpt.toml $out/share/udpt/udpt.toml
diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix
index b67cf7ce0549..4c879a14c9e3 100644
--- a/pkgs/servers/unpfs/default.nix
+++ b/pkgs/servers/unpfs/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/example/unpfs";
 
-  cargoSha256 = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0=";
+  cargoHash = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0=";
 
   RUSTC_BOOTSTRAP = 1;
 
diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix
index 57cd7e88eba1..5c59a7b5386a 100644
--- a/pkgs/tools/admin/colmena/default.nix
+++ b/pkgs/tools/admin/colmena/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=";
   };
 
-  cargoSha256 = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8=";
+  cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix
index 02dbfc683edb..f025a0c578c1 100644
--- a/pkgs/tools/archivers/gbl/default.nix
+++ b/pkgs/tools/archivers/gbl/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  cargoSha256 = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM=";
+  cargoHash = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/audio/pw-volume/default.nix b/pkgs/tools/audio/pw-volume/default.nix
index 13e39484b577..290cd4ffbf2d 100644
--- a/pkgs/tools/audio/pw-volume/default.nix
+++ b/pkgs/tools/audio/pw-volume/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0=";
   };
 
-  cargoSha256 = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew=";
+  cargoHash = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew=";
 
   meta = with lib; {
     description = "Basic interface to PipeWire volume controls";
diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix
index d9b9bc8188b4..c164c2ecc96b 100644
--- a/pkgs/tools/backup/bupstash/default.nix
+++ b/pkgs/tools/backup/bupstash/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g=";
   };
 
-  cargoSha256 = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84=";
+  cargoHash = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84=";
 
   nativeBuildInputs = [ ronn pkg-config installShellFiles ];
   buildInputs = [ libsodium ];
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index 0c8d4afb522d..af62fede4071 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs=";
   };
 
-  cargoSha256 = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI=";
+  cargoHash = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
   buildInputs = [ openssl libsodium xz ]
diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/tools/filesystems/supertag/default.nix
index 9fd35935effb..9047fe185918 100644
--- a/pkgs/tools/filesystems/supertag/default.nix
+++ b/pkgs/tools/filesystems/supertag/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   # patches Cargo.lock to include a more up-to-date version of lexical-core
   cargoPatches = [ ./cargo-lock-update-lexical-core.patch ];
 
-  cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ=";
+  cargoHash = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ];
   buildInputs = [ dbus fuse sqlite ];
diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix
index 9088a1110b7b..6354c4f495fe 100644
--- a/pkgs/tools/graphics/dnglab/default.nix
+++ b/pkgs/tools/graphics/dnglab/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jkOkkcMFK1RLY8Hn/bMMuMZtyGwnwGdm0os8QKhcWqo=";
   };
 
-  cargoSha256 = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI=";
+  cargoHash = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI=";
 
   postInstall = ''
     rm $out/bin/benchmark $out/bin/identify
diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix
index eff9924f4fd0..e71f0d7cc9d2 100644
--- a/pkgs/tools/graphics/shotgun/default.nix
+++ b/pkgs/tools/graphics/shotgun/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k=";
   };
 
-  cargoSha256 = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA=";
+  cargoHash = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA=";
 
   meta = with lib; {
     description = "Minimal X screenshot utility";
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index f3db03c53f63..87e7bafa2e5f 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-pRDRRVb8Lyna8X/PEjS9tS5dbG4g7vyMCU5AqPlpxec=";
   };
 
-  cargoSha256 = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g=";
+  cargoHash = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g=";
 
   meta = with lib; {
     description = "Clean and optimize SVG files from unnecessary data";
diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix
index 20267511fd13..0200957a94eb 100644
--- a/pkgs/tools/graphics/viu/default.nix
+++ b/pkgs/tools/graphics/viu/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   # tests need an interactive terminal
   doCheck = false;
 
-  cargoSha256 = "sha256-ildtjaYGbrQacJOdGDVwFv+kod+vZHqukWN6ARtJqI4=";
+  cargoHash = "sha256-ildtjaYGbrQacJOdGDVwFv+kod+vZHqukWN6ARtJqI4=";
 
   buildFeatures = lib.optional withSixel "sixel";
   buildInputs = lib.optional withSixel libsixel;
diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/tools/graphics/vulkan-helper/default.nix
index 0f7fd3fcc997..19e1d173499e 100644
--- a/pkgs/tools/graphics/vulkan-helper/default.nix
+++ b/pkgs/tools/graphics/vulkan-helper/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2pLHnTn0gJKz4gfrR6h85LHOaZPrhIGYzQeci4Dzz2E=";
   };
 
-  cargoSha256 = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM=";
+  cargoHash = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM=";
 
   nativeBuildInputs = [
     addDriverRunpath
diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix
index 50aa912522d9..f9ba3627f787 100644
--- a/pkgs/tools/graphics/xcolor/default.nix
+++ b/pkgs/tools/graphics/xcolor/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE=";
   };
 
-  cargoSha256 = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0=";
+  cargoHash = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0=";
 
   nativeBuildInputs = [ pkg-config python3 installShellFiles copyDesktopItems ];
 
diff --git a/pkgs/tools/misc/aaa/default.nix b/pkgs/tools/misc/aaa/default.nix
index 0988bbca7acb..6511df5c997a 100644
--- a/pkgs/tools/misc/aaa/default.nix
+++ b/pkgs/tools/misc/aaa/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
   };
-  cargoSha256 = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU=";
+  cargoHash = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU=";
 
   meta = with lib; {
     description = "Terminal viewer for 3a format";
diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/tools/misc/as-tree/default.nix
index f4c5eb1354de..7a8ec4830642 100644
--- a/pkgs/tools/misc/as-tree/default.nix
+++ b/pkgs/tools/misc/as-tree/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
   };
 
-  cargoSha256 = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM=";
+  cargoHash = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM=";
 
   meta = with lib; {
     description = "Print a list of paths as a tree of paths";
diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/tools/misc/asciinema-scenario/default.nix
index 91102ab46eae..fed7a1f468d7 100644
--- a/pkgs/tools/misc/asciinema-scenario/default.nix
+++ b/pkgs/tools/misc/asciinema-scenario/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ=";
   };
 
-  cargoSha256 = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c=";
+  cargoHash = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c=";
 
   meta = with lib; {
     description = "Create asciinema videos from a text file";
diff --git a/pkgs/tools/misc/bartib/default.nix b/pkgs/tools/misc/bartib/default.nix
index 43921e337131..48e131262a90 100644
--- a/pkgs/tools/misc/bartib/default.nix
+++ b/pkgs/tools/misc/bartib/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
   };
 
-  cargoSha256 = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE=";
+  cargoHash = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/tools/misc/bottom-rs/default.nix
index f9a24537676f..503c56c5099d 100644
--- a/pkgs/tools/misc/bottom-rs/default.nix
+++ b/pkgs/tools/misc/bottom-rs/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc=";
   };
 
-  cargoSha256 = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI=";
+  cargoHash = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI=";
 
   meta = with lib; {
     description = "Fantastic (maybe) CLI for translating between bottom and human-readable text";
diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix
index 2d5faff98a02..2db008551c8b 100644
--- a/pkgs/tools/misc/coinlive/default.nix
+++ b/pkgs/tools/misc/coinlive/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
   };
 
-  cargoSha256 = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";
+  cargoHash = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix
index c3a04d289d55..362673a5ca82 100644
--- a/pkgs/tools/misc/didyoumean/default.nix
+++ b/pkgs/tools/misc/didyoumean/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows=";
   };
 
-  cargoSha256 = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk=";
+  cargoHash = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix
index 7e6d4c74e96b..1a73a4d84faf 100644
--- a/pkgs/tools/misc/dijo/default.nix
+++ b/pkgs/tools/misc/dijo/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
   };
-  cargoSha256 = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY=";
+  cargoHash = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY=";
 
   meta = with lib; {
     description = "Scriptable, curses-based, digital habit tracker";
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index b63532216a99..fd37b2b9c99b 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50=";
+  cargoHash = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50=";
 
   meta = with lib; {
     description = "Minimal, fast alternative to 'du -sh'";
diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix
index 3d07baeb5903..e96a753fe86b 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/pkgs/tools/misc/eva/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec=";
   };
 
-  cargoSha256 = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms=";
+  cargoHash = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms=";
 
   meta = with lib; {
     description = "Calculator REPL, similar to bc";
diff --git a/pkgs/tools/misc/fsrx/default.nix b/pkgs/tools/misc/fsrx/default.nix
index 846b600d8e99..c1a1fa9ecc90 100644
--- a/pkgs/tools/misc/fsrx/default.nix
+++ b/pkgs/tools/misc/fsrx/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
   };
 
-  cargoSha256 = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y=";
+  cargoHash = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix
index c4532419f103..7817f0b41695 100644
--- a/pkgs/tools/misc/g933-utils/default.nix
+++ b/pkgs/tools/misc/g933-utils/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kGLMRqZHzRuXQNTjIuLz8JPC1c/ZK38msfkTIVnaomg=";
   };
 
-  cargoSha256 = "sha256-FBX5hrS8tNWN83XX+x+s/mYyvO1h6V63bXCx7y0R8bY=";
+  cargoHash = "sha256-FBX5hrS8tNWN83XX+x+s/mYyvO1h6V63bXCx7y0R8bY=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ udev ];
diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix
index 98334e0afd55..45d28ff72b80 100644
--- a/pkgs/tools/misc/gh-cal/default.nix
+++ b/pkgs/tools/misc/gh-cal/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0=";
   };
 
-  cargoSha256 = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
+  cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix
index 1022763b7540..e2aa411f6c44 100644
--- a/pkgs/tools/misc/handlr/default.nix
+++ b/pkgs/tools/misc/handlr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wENhlUBwfNg/r7yMKa1cQI1fbFw+qowwK8EdO912Yys=";
   };
 
-  cargoSha256 = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M=";
+  cargoHash = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M=";
 
   nativeBuildInputs = [ installShellFiles shared-mime-info ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 388a40f2832b..79377f0f22ac 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA=";
   };
 
-  cargoSha256 = "sha256-RHD2/Uvj8NWpZ+xK16xTN5K/hDWYhwHnu2E5NslGFQI=";
+  cargoHash = "sha256-RHD2/Uvj8NWpZ+xK16xTN5K/hDWYhwHnu2E5NslGFQI=";
 
   # https://github.com/rschmitt/heatseeker/issues/42
   # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple
diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix
index 05d7e1c9f44e..def3f4776949 100644
--- a/pkgs/tools/misc/hiksink/default.nix
+++ b/pkgs/tools/misc/hiksink/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8=";
   };
 
-  cargoSha256 = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M=";
+  cargoHash = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/tools/misc/ikill/default.nix
index b5c18e5dfd97..7b6ac685c50e 100644
--- a/pkgs/tools/misc/ikill/default.nix
+++ b/pkgs/tools/misc/ikill/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs=";
   };
 
-  cargoSha256 = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA=";
+  cargoHash = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA=";
 
   meta = with lib; {
     description = "Interactively kill running processes";
diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix
index 2f0e3b89149c..451089dc185e 100644
--- a/pkgs/tools/misc/jsonwatch/default.nix
+++ b/pkgs/tools/misc/jsonwatch/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TGW04P8t0mAXza7I7qp6QRXA/MDE3m1dlRC7bMf2dSk=";
   };
 
-  cargoSha256 = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc=";
+  cargoHash = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     Security
diff --git a/pkgs/tools/misc/lazycli/default.nix b/pkgs/tools/misc/lazycli/default.nix
index 1522a937ffb8..77596b66302f 100644
--- a/pkgs/tools/misc/lazycli/default.nix
+++ b/pkgs/tools/misc/lazycli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5";
   };
 
-  cargoSha256 = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs=";
+  cargoHash = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs=";
 
   checkFlags = [
     # currently broken: https://github.com/jesseduffield/lazycli/pull/20
diff --git a/pkgs/tools/misc/lemmy-help/default.nix b/pkgs/tools/misc/lemmy-help/default.nix
index 2e4126db38f8..6138d331b02f 100644
--- a/pkgs/tools/misc/lemmy-help/default.nix
+++ b/pkgs/tools/misc/lemmy-help/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "cli" ];
 
-  cargoSha256 = "sha256-BCwpiBPvnLgbpOaXgUK2EDXnT8d4jo7aqgM6uwl80eg=";
+  cargoHash = "sha256-BCwpiBPvnLgbpOaXgUK2EDXnT8d4jo7aqgM6uwl80eg=";
 
   meta = with lib; {
     description = "CLI for generating vim help docs from emmylua comments";
diff --git a/pkgs/tools/misc/moon-phases/default.nix b/pkgs/tools/misc/moon-phases/default.nix
index f4d5a850efc9..e1c41556827c 100644
--- a/pkgs/tools/misc/moon-phases/default.nix
+++ b/pkgs/tools/misc/moon-phases/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY=";
   };
 
-  cargoSha256 = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM=";
+  cargoHash = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM=";
 
   meta = with lib; {
     description = "Command-line/WM bar tool to display the moon phase at a certain date";
diff --git a/pkgs/tools/misc/natls/default.nix b/pkgs/tools/misc/natls/default.nix
index 1398f271a550..195ef7994216 100644
--- a/pkgs/tools/misc/natls/default.nix
+++ b/pkgs/tools/misc/natls/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg=";
   };
 
-  cargoSha256 = "sha256-Am4HmfmhskKxcp1iWod5z3caHwsdo31qCaVi0UxTXAg=";
+  cargoHash = "sha256-Am4HmfmhskKxcp1iWod5z3caHwsdo31qCaVi0UxTXAg=";
 
   meta = with lib; {
     description = "'ls' replacement you never knew you needed";
diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix
index 1b2bebfce895..98d3633a7b8a 100644
--- a/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/pkgs/tools/misc/nvfancontrol/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";
   };
 
-  cargoSha256 = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis=";
+  cargoHash = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis=";
 
   nativeBuildInputs = [ libXNVCtrl libX11 libXext ];
 
diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix
index 4c4083d9555d..db73ba805f2d 100644
--- a/pkgs/tools/misc/octofetch/default.nix
+++ b/pkgs/tools/misc/octofetch/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
   };
 
-  cargoSha256 = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU=";
+  cargoHash = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix
index b623721ec9b2..22bbc4ba72fb 100644
--- a/pkgs/tools/misc/owofetch/default.nix
+++ b/pkgs/tools/misc/owofetch/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18=";
   };
 
-  cargoSha256 = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU=";
+  cargoHash = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU=";
 
   buildInputs = lib.optionals stdenvNoCC.isDarwin [
     Foundation
diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix
index 3989074d2461..d121453bd7d9 100644
--- a/pkgs/tools/misc/rates/default.nix
+++ b/pkgs/tools/misc/rates/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
   };
 
-  cargoSha256 = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
+  cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/misc/ristate/default.nix b/pkgs/tools/misc/ristate/default.nix
index c674b96f9b00..6b44ff020cab 100644
--- a/pkgs/tools/misc/ristate/default.nix
+++ b/pkgs/tools/misc/ristate/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY=";
   };
 
-  cargoSha256 = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw=";
+  cargoHash = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw=";
 
   meta = with lib; {
     description = "River-status client written in Rust";
diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/tools/misc/sanctity/default.nix
index 7c892bb16894..eed6524d531c 100644
--- a/pkgs/tools/misc/sanctity/default.nix
+++ b/pkgs/tools/misc/sanctity/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc=";
   };
 
-  cargoSha256 = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0=";
+  cargoHash = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0=";
 
   meta = with lib; {
     description = "Test the 16 terminal colors in all combinations";
diff --git a/pkgs/tools/misc/sfz/default.nix b/pkgs/tools/misc/sfz/default.nix
index 41841d2ef2b9..768afed6679d 100644
--- a/pkgs/tools/misc/sfz/default.nix
+++ b/pkgs/tools/misc/sfz/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI=";
   };
 
-  cargoSha256 = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24=";
+  cargoHash = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24=";
 
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
   doCheck = false;
diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix
index 4f0c22344a5b..39c6f2082221 100644
--- a/pkgs/tools/misc/sheldon/default.nix
+++ b/pkgs/tools/misc/sheldon/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vGFR8NL3bOCUuNr0KQuAbjQMxvFbN/T9aVmf7Wxt9JU=";
   };
 
-  cargoSha256 = "sha256-wVB+yL+h90f7NnASDaX5gxT5z45M8I1rxIJwY8uyB4k=";
+  cargoHash = "sha256-wVB+yL+h90f7NnASDaX5gxT5z45M8I1rxIJwY8uyB4k=";
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ installShellFiles pkg-config ];
diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix
index 1d2eddbd54e5..688454c8ded1 100644
--- a/pkgs/tools/misc/synth/default.nix
+++ b/pkgs/tools/misc/synth/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE=";
   };
 
-  cargoSha256 = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48=";
+  cargoHash = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     AppKit
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index dfe57f5fef06..9ca82d8f1bec 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-zQzYukhruVUVP1v76/5522ag7wjN9QoE9BtfMNYQ7UY=";
   };
 
-  cargoSha256 = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk=";
+  cargoHash = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/misc/thumbs/default.nix b/pkgs/tools/misc/thumbs/default.nix
index f170375afb87..b4c795bc8cf8 100644
--- a/pkgs/tools/misc/thumbs/default.nix
+++ b/pkgs/tools/misc/thumbs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM=";
   };
 
-  cargoSha256 = "sha256-PfTx6PcW5DESShfr9Ekhbq1asZ0xUGM4Vi9EwmoDv+s";
+  cargoHash = "sha256-PfTx6PcW5DESShfr9Ekhbq1asZ0xUGM4Vi9EwmoDv+s";
 
   patches = [ ./fix.patch ];
 
diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix
index ea1b30b07e81..a379c9294d88 100644
--- a/pkgs/tools/misc/tremor-rs/ls.nix
+++ b/pkgs/tools/misc/tremor-rs/ls.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  cargoSha256 = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4=";
+  cargoHash = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4=";
 
   meta = with lib; {
     description = "Tremor Language Server (Trill)";
diff --git a/pkgs/tools/misc/urlencode/default.nix b/pkgs/tools/misc/urlencode/default.nix
index b61b8a37c2e7..da7066adc882 100644
--- a/pkgs/tools/misc/urlencode/default.nix
+++ b/pkgs/tools/misc/urlencode/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE=";
   };
 
-  cargoSha256 = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8=";
+  cargoHash = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8=";
 
   meta = with lib; {
     description = "CLI utility for URL-encoding or -decoding strings";
diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/tools/misc/uwuify/default.nix
index abcf5e9b23da..4a3411d05a38 100644
--- a/pkgs/tools/misc/uwuify/default.nix
+++ b/pkgs/tools/misc/uwuify/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I=";
   };
 
-  cargoSha256 = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4=";
+  cargoHash = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4=";
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/tools/misc/watchlog/default.nix
index d942d8282379..6c095a8b4558 100644
--- a/pkgs/tools/misc/watchlog/default.nix
+++ b/pkgs/tools/misc/watchlog/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-UNywUEhhJy2cJIwl/S9hRReoBfkzvNoN0c4mxp7PuG0=";
   };
 
-  cargoSha256 = "sha256-HBlfSgR96XIUBj2ZyHi1qaEKP8jG9kcrxJmhIGWjfUE=";
+  cargoHash = "sha256-HBlfSgR96XIUBj2ZyHi1qaEKP8jG9kcrxJmhIGWjfUE=";
 
   meta = {
     description = "Easier monitoring of live logs";
diff --git a/pkgs/tools/misc/writedisk/default.nix b/pkgs/tools/misc/writedisk/default.nix
index cbceb9b7cb10..3c05ee9a2a46 100644
--- a/pkgs/tools/misc/writedisk/default.nix
+++ b/pkgs/tools/misc/writedisk/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY=";
   };
 
-  cargoSha256 = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g=";
+  cargoHash = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index 11fd60aa1ecf..e2a6a7a3b6e0 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04=";
   };
 
-  cargoSha256 = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY=";
+  cargoHash = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY=";
 
   buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index db14b24799e2..ee40cb0f1048 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -18,7 +18,7 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
   };
 
-  cargoSha256 = "sha256-mH76ODPKlKDEK9ckThPnL5Ar7p1l1gNd7zXfesLZlBM=";
+  cargoHash = "sha256-mH76ODPKlKDEK9ckThPnL5Ar7p1l1gNd7zXfesLZlBM=";
 
   buildInputs = [ sqlite ];
 
diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/tools/networking/rconc/default.nix
index 5934dd7e8893..d8af7fb6e9e1 100644
--- a/pkgs/tools/networking/rconc/default.nix
+++ b/pkgs/tools/networking/rconc/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6Bff9NnG1ZEQhntzH5Iq0XEbJBKdwcb0BOn8nCkeWTY=";
   };
 
-  cargoSha256 = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk=";
+  cargoHash = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk=";
 
   meta = with lib; {
     description = "Simple cross-platform RCON client written in rust";
diff --git a/pkgs/tools/networking/rustcat/default.nix b/pkgs/tools/networking/rustcat/default.nix
index 4a71aea6df5c..9848dbdd17b1 100644
--- a/pkgs/tools/networking/rustcat/default.nix
+++ b/pkgs/tools/networking/rustcat/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
   };
 
-  cargoSha256 = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
+  cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix
index 3bd9f825469a..c62ad29e0113 100644
--- a/pkgs/tools/networking/suckit/default.nix
+++ b/pkgs/tools/networking/suckit/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0=";
   };
 
-  cargoSha256 = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao=";
+  cargoHash = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index 5ff731ca2dfa..3f8857fff569 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "tox_node";
 
-  cargoSha256 = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k=";
+  cargoHash = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/tools/networking/transmission-rss/default.nix
index 03674346132c..3d6d80ef474e 100644
--- a/pkgs/tools/networking/transmission-rss/default.nix
+++ b/pkgs/tools/networking/transmission-rss/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./update-cargo-lock-version.patch ];
 
-  cargoSha256 = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4=";
+  cargoHash = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4=";
 
   nativeBuildInputs = [pkg-config];
   buildInputs = [openssl]
diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix
index ed8681315365..b4a34ba22a48 100644
--- a/pkgs/tools/networking/wg-netmanager/default.nix
+++ b/pkgs/tools/networking/wg-netmanager/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M=";
   };
 
-  cargoSha256 = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s=";
+  cargoHash = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
index f5c8a46131bf..8cd6c141cc20 100644
--- a/pkgs/tools/nix/nix-query-tree-viewer/default.nix
+++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     gtk3
   ];
 
-  cargoSha256 = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E=";
+  cargoHash = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E=";
 
   meta = with lib; {
     description = "GTK viewer for the output of `nix store --query --tree`";
diff --git a/pkgs/tools/nix/nixel/default.nix b/pkgs/tools/nix/nixel/default.nix
index 70a0d92101d2..7f9fb9e7234a 100644
--- a/pkgs/tools/nix/nixel/default.nix
+++ b/pkgs/tools/nix/nixel/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A=";
   };
 
-  cargoSha256 = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY=";
+  cargoHash = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY=";
 
   # Package requires a non reproducible submodule
   # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index b7f73c7eb795..cbb2ae1d9017 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ=";
   };
 
-  cargoSha256 = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ=";
+  cargoHash = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ=";
 
   meta = with lib; {
     description = "Nix code formatter for nixpkgs";
diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/tools/nix/npins/default.nix
index 06024fe789e0..7ea75baab100 100644
--- a/pkgs/tools/nix/npins/default.nix
+++ b/pkgs/tools/nix/npins/default.nix
@@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec {
   version = src.version;
   src = passthru.mkSource sources.npins;
 
-  cargoSha256 = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k=";
+  cargoHash = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k=";
 
   buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/tools/nix/rnix-hashes/default.nix
index b9a98b184fb8..d69c7e6ef96f 100644
--- a/pkgs/tools/nix/rnix-hashes/default.nix
+++ b/pkgs/tools/nix/rnix-hashes/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  cargoSha256 = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q=";
+  cargoHash = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q=";
 
   meta = with lib; {
     description = "Nix Hash Converter";
diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix
index 8b2b26420ecc..9cc48659d419 100644
--- a/pkgs/tools/nix/statix/default.nix
+++ b/pkgs/tools/nix/statix/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c=";
   };
 
-  cargoSha256 = "sha256-QF7P0CWlKfBzVQC//eKhf/u1qV9AfLIJDxWDDWzMG8g=";
+  cargoHash = "sha256-QF7P0CWlKfBzVQC//eKhf/u1qV9AfLIJDxWDDWzMG8g=";
 
   buildFeatures = lib.optional withJson "json";
 
diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix
index cea3fb099dce..59704a0a6836 100644
--- a/pkgs/tools/package-management/nix-doc/default.nix
+++ b/pkgs/tools/package-management/nix-doc/default.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     RUSTFLAGS = "-Z relro-level=partial";
   };
 
-  cargoSha256 = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw=";
+  cargoHash = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw=";
 
   meta = with lib; {
     description = "Interactive Nix documentation tool";
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 5ef86d033f9e..bfa6959cf353 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HfmMZVlsdg9hTWGUihl6OlQAp/n1XRvPLfAKJ8as8Ew=";
   };
 
-  cargoSha256 = "sha256-oUxxuBqec4aI2h8BAn1WSA44UU7f5APkv0DIwuSun0M=";
+  cargoHash = "sha256-oUxxuBqec4aI2h8BAn1WSA44UU7f5APkv0DIwuSun0M=";
 
   doCheck = true;
   nativeCheckInputs = [ nix graphviz ];
diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix
index c98bae7e44d9..55adc5415245 100644
--- a/pkgs/tools/package-management/nix-template/default.nix
+++ b/pkgs/tools/package-management/nix-template/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI=";
   };
 
-  cargoSha256 = "sha256-f8Th6SbV66Uukqh1Cb5uQVa844qw1PmBB9W7EMXMU4E=";
+  cargoHash = "sha256-f8Th6SbV66Uukqh1Cb5uQVa844qw1PmBB9W7EMXMU4E=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/tools/security/authoscope/default.nix b/pkgs/tools/security/authoscope/default.nix
index f21df67035e4..b44f8bec2f7f 100644
--- a/pkgs/tools/security/authoscope/default.nix
+++ b/pkgs/tools/security/authoscope/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
   };
 
-  cargoSha256 = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
+  cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/tools/security/keyscope/default.nix b/pkgs/tools/security/keyscope/default.nix
index 7601f2244579..ae5bd80e2964 100644
--- a/pkgs/tools/security/keyscope/default.nix
+++ b/pkgs/tools/security/keyscope/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SrBtgirg52q7gM3GZsJsV8ASACvb4sYv5HDbyItpjbk=";
   };
 
-  cargoSha256 = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo=";
+  cargoHash = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix
index eb3474293814..ff9b297d5361 100644
--- a/pkgs/tools/security/lethe/default.nix
+++ b/pkgs/tools/security/lethe/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E=";
   };
 
-  cargoSha256 = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk=";
+  cargoHash = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/tools/security/shisho/default.nix
index ae61c2a249db..0fed79c2214c 100644
--- a/pkgs/tools/security/shisho/default.nix
+++ b/pkgs/tools/security/shisho/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY=";
     fetchSubmodules = true;
   };
-  cargoSha256 = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY=";
+  cargoHash = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/tools/security/weggli/default.nix b/pkgs/tools/security/weggli/default.nix
index 85083e2cf22b..63f9ddd0f207 100644
--- a/pkgs/tools/security/weggli/default.nix
+++ b/pkgs/tools/security/weggli/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E=";
   };
 
-  cargoSha256 = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs=";
+  cargoHash = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs=";
 
   passthru.tests.version = testers.testVersion {
     package = weggli;
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix
index 26b0aba9889f..d3802098de34 100644
--- a/pkgs/tools/system/safe-rm/default.nix
+++ b/pkgs/tools/system/safe-rm/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
   };
 
-  cargoSha256 = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg=";
+  cargoHash = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg=";
 
   postPatch = ''
     substituteInPlace src/main.rs \
diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix
index 971aa29b9644..59cb00e7095f 100644
--- a/pkgs/tools/system/tre-command/default.nix
+++ b/pkgs/tools/system/tre-command/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg=";
   };
 
-  cargoSha256 = "sha256-b3fScJMG/CIkMrahbELLQp1otmT5En+p8kQsip05SOc=";
+  cargoHash = "sha256-b3fScJMG/CIkMrahbELLQp1otmT5En+p8kQsip05SOc=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/text/anewer/default.nix b/pkgs/tools/text/anewer/default.nix
index 69c4eb39b351..009a6264fddd 100644
--- a/pkgs/tools/text/anewer/default.nix
+++ b/pkgs/tools/text/anewer/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
   };
 
-  cargoSha256 = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM=";
+  cargoHash = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM=";
 
   meta = with lib; {
     description = "Append lines from stdin to a file if they don't already exist in the file";
diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix
index c3afeb492280..da333cd6c39c 100644
--- a/pkgs/tools/text/choose/default.nix
+++ b/pkgs/tools/text/choose/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yW1quDyQn2xhrlhhPj9DKq7g8LlYKvEKDFj3xSagRTU=";
   };
 
-  cargoSha256 = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k=";
+  cargoHash = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k=";
 
   meta = with lib; {
     description = "Human-friendly and fast alternative to cut and (sometimes) awk";
diff --git a/pkgs/tools/text/each/default.nix b/pkgs/tools/text/each/default.nix
index 6f24ee66fe40..688a9adf8847 100644
--- a/pkgs/tools/text/each/default.nix
+++ b/pkgs/tools/text/each/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
   };
 
-  cargoSha256 = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE=";
+  cargoHash = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE=";
 
   meta = with lib; {
     description = " A better way of working with structured data on the command line";
diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix
index 2b9f2e0beaa8..b923a891ed75 100644
--- a/pkgs/tools/text/frawk/default.nix
+++ b/pkgs/tools/text/frawk/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA=";
   };
 
-  cargoSha256 = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs=";
+  cargoHash = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs=";
 
   buildInputs = [ libxml2 ncurses zlib ];
 
diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/tools/text/huniq/default.nix
index 3bb1252ae0c6..606438a4ed2a 100644
--- a/pkgs/tools/text/huniq/default.nix
+++ b/pkgs/tools/text/huniq/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE=";
   };
 
-  cargoSha256 = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ=";
+  cargoHash = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ=";
 
   meta = with lib; {
     description = "Command line utility to remove duplicates from the given input";
diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/tools/text/mdbook-footnote/default.nix
index 7beeb3e33c63..1b3ad02e5c7f 100644
--- a/pkgs/tools/text/mdbook-footnote/default.nix
+++ b/pkgs/tools/text/mdbook-footnote/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses=";
   };
 
-  cargoSha256 = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc=";
+  cargoHash = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix
index 878b93b055de..7129cdd0442c 100644
--- a/pkgs/tools/text/mdbook-linkcheck/default.nix
+++ b/pkgs/tools/text/mdbook-linkcheck/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00=";
   };
 
-  cargoSha256 = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4=";
+  cargoHash = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4=";
 
   buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];
 
diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/tools/text/rnr/default.nix
index fbc4f1b382f8..31f627d4bae6 100644
--- a/pkgs/tools/text/rnr/default.nix
+++ b/pkgs/tools/text/rnr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU=";
   };
 
-  cargoSha256 = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw=";
+  cargoHash = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw=";
 
   meta = with lib; {
     description = "Command-line tool to batch rename files and directories";
diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/tools/text/seehecht/default.nix
index 9a7b1f936a99..0aa6c436595e 100644
--- a/pkgs/tools/text/seehecht/default.nix
+++ b/pkgs/tools/text/seehecht/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0=";
   };
 
-  cargoSha256 = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA=";
+  cargoHash = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA=";
 
   postInstall = ''
     ln -s $out/bin/seh $out/bin/seehecht
diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix
index b2d55ee27615..a88960739ae5 100644
--- a/pkgs/tools/text/tidy-viewer/default.nix
+++ b/pkgs/tools/text/tidy-viewer/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
   };
 
-  cargoSha256 = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM=";
+  cargoHash = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM=";
 
   # this test parses command line arguments
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/tools/text/tv/default.nix
index 9cf6e2e243e8..154d98b4c592 100644
--- a/pkgs/tools/text/tv/default.nix
+++ b/pkgs/tools/text/tv/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM=";
   };
 
-  cargoSha256 = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI=";
+  cargoHash = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI=";
 
   meta = with lib; {
     description = "Format json into table view";
diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/tools/wayland/gnome-randr/default.nix
index 65265f452295..ca136adb24a4 100644
--- a/pkgs/tools/wayland/gnome-randr/default.nix
+++ b/pkgs/tools/wayland/gnome-randr/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0=";
   };
 
-  cargoSha256 = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs=";
+  cargoHash = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs=";
 
   buildInputs = [ dbus ];
 
diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/tools/wayland/wayout/default.nix
index b548279d401e..7bd9f3a64482 100644
--- a/pkgs/tools/wayland/wayout/default.nix
+++ b/pkgs/tools/wayland/wayout/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-EzRetxx0NojhBlBPwhQ7p9rGXDUBlocVqxcEVGIF3+0=";
   };
 
-  cargoSha256 = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194=";
+  cargoHash = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194=";
 
   meta = with lib; {
     description = "Simple output management tool for wlroots based compositors implementing";

From 5b63ef2a48545b449121e522a8d8cfd86dfc9dd5 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 2 Jul 2024 17:12:20 +0800
Subject: [PATCH 115/319] treewide: change cargoSha256 with SRI hash to
 cargoHash manually

---
 pkgs/by-name/ca/cargo-profiler/package.nix |  4 ++--
 pkgs/tools/filesystems/garage/default.nix  | 10 +++++-----
 pkgs/tools/misc/lorri/default.nix          |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-profiler/package.nix b/pkgs/by-name/ca/cargo-profiler/package.nix
index 595bf6d8d032..63b6aa567d89 100644
--- a/pkgs/by-name/ca/cargo-profiler/package.nix
+++ b/pkgs/by-name/ca/cargo-profiler/package.nix
@@ -11,7 +11,7 @@ let
   version = "0.2.0";
   rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8";
   sha256 = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA=";
-  cargoSha256 = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI=";
+  cargoHash = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI=";
 
   inherit (rustPlatform) buildRustPackage;
 in buildRustPackage rec {
@@ -22,7 +22,7 @@ in buildRustPackage rec {
     repo = pname;
   };
 
-  inherit cargoSha256;
+  inherit cargoHash;
 
   meta = with lib; {
     description = "Cargo subcommand for profiling Rust binaries";
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index ce5ccbf69643..aa073ab2d5c8 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -11,7 +11,7 @@
 , nixosTests
 }:
 let
-  generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
+  generic = { version, sha256, cargoHash, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
     pname = "garage";
     inherit version;
 
@@ -29,7 +29,7 @@ let
       rm .cargo/config.toml || true
     '';
 
-    inherit cargoSha256;
+    inherit cargoHash;
 
     nativeBuildInputs = [ protobuf pkg-config ];
 
@@ -97,7 +97,7 @@ rec {
   garage_0_8_7 = generic {
     version = "0.8.7";
     sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc=";
-    cargoSha256 = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
+    cargoHash = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
     broken = stdenv.isDarwin;
   };
 
@@ -106,14 +106,14 @@ rec {
   garage_0_9_4 = generic {
     version = "0.9.4";
     sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
-    cargoSha256 = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
+    cargoHash = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
     broken = stdenv.isDarwin;
   };
 
   garage_1_0_0 = generic {
     version = "1.0.0";
     sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8=";
-    cargoSha256 = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
+    cargoHash = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
     broken = stdenv.isDarwin;
   };
 
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index a2cd0ef600d1..aca2e7050bcf 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -17,7 +17,7 @@ let
   version = "1.6.0";
   gitRev = "1.6.0";
   sha256 = "sha256-peelMKv9GOTPdyb1iifzlFikeayTchqaYCgeXyR5EgM=";
-  cargoSha256 = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg=";
+  cargoHash = "sha256-UFAmTYnCqsQxBnCm1zMu+BcWIZMuuxvpF7poLlzC6Kg=";
 
 in (rustPlatform.buildRustPackage rec {
   pname = "lorri";
@@ -32,7 +32,7 @@ in (rustPlatform.buildRustPackage rec {
 
   outputs = [ "out" "man" "doc" ];
 
-  inherit cargoSha256;
+  inherit cargoHash;
   doCheck = false;
 
   BUILD_REV_COUNT = src.revCount or 1;

From 1862813d11b34e56e4724a9fac69610b5d8d2015 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 3 Jul 2024 20:29:10 +0800
Subject: [PATCH 116/319] treewide: convert cargoSha256 to cargoHash

This is done with the following bash script:

```
#!/usr/bin/env bash
process_line() {
    local filename=${1%:}
    if [[ $4 =~ \"(.*)\"\; ]]; then
      local sha256="${BASH_REMATCH[1]}"
    fi
    [[ -z $sha256 ]] && return 0
    local hash=$(nix hash to-sri --type sha256 $sha256)
    echo "Processing: $filename"
    echo "  $sha256 => $hash"
    sed -i "s|cargoSha256 = \"$sha256\"|cargoHash = \"$hash\"|"
$filename
}

# split output by line
grep -r 'cargoSha256 = ' . | while IFS= read -r line; do
    # split them further by space
    read -r -a parts <<< "$line"
    process_line "${parts[@]}"
done

```
---
 pkgs/applications/display-managers/greetd/dlm.nix               | 2 +-
 pkgs/applications/editors/vim/plugins/overrides.nix             | 2 +-
 pkgs/applications/misc/reddsaver/default.nix                    | 2 +-
 pkgs/applications/misc/zktree/default.nix                       | 2 +-
 pkgs/applications/networking/wg-bond/default.nix                | 2 +-
 pkgs/applications/science/electronics/dwfv/default.nix          | 2 +-
 .../version-management/commit-formatter/default.nix             | 2 +-
 pkgs/applications/version-management/git-codeowners/default.nix | 2 +-
 pkgs/applications/version-management/josh/default.nix           | 2 +-
 .../version-management/rs-git-fsmonitor/default.nix             | 2 +-
 pkgs/applications/window-managers/i3/i3-ratiosplit.nix          | 2 +-
 pkgs/by-name/hi/himalaya/package.nix                            | 2 +-
 pkgs/by-name/ne/neverest/package.nix                            | 2 +-
 pkgs/development/compilers/elm/packages/elm-json/default.nix    | 2 +-
 pkgs/development/compilers/elm/packages/elm-test-rs/default.nix | 2 +-
 pkgs/development/misc/loc/default.nix                           | 2 +-
 pkgs/development/tools/analysis/panopticon/default.nix          | 2 +-
 pkgs/development/tools/async/default.nix                        | 2 +-
 pkgs/development/tools/clog-cli/default.nix                     | 2 +-
 pkgs/development/tools/misc/mdctags/default.nix                 | 2 +-
 pkgs/development/tools/parinfer-rust/default.nix                | 2 +-
 pkgs/development/tools/pax-rs/default.nix                       | 2 +-
 pkgs/development/tools/rust/bootimage/default.nix               | 2 +-
 pkgs/development/tools/rust/cargo-asm/default.nix               | 2 +-
 pkgs/development/tools/rust/cargo-bazel/default.nix             | 2 +-
 pkgs/development/tools/rust/cargo-deadlinks/default.nix         | 2 +-
 pkgs/development/tools/rust/cargo-espmonitor/default.nix        | 2 +-
 pkgs/development/tools/rust/cargo-inspect/default.nix           | 2 +-
 pkgs/development/tools/rust/cargo-kcov/default.nix              | 2 +-
 pkgs/development/tools/rust/cargo-web/default.nix               | 2 +-
 pkgs/misc/autoadb/default.nix                                   | 2 +-
 pkgs/misc/uq/default.nix                                        | 2 +-
 pkgs/os-specific/linux/swapview/default.nix                     | 2 +-
 pkgs/servers/webmetro/default.nix                               | 2 +-
 pkgs/shells/nsh/default.nix                                     | 2 +-
 pkgs/tools/X11/inputplug/default.nix                            | 2 +-
 pkgs/tools/X11/xidlehook/default.nix                            | 2 +-
 pkgs/tools/games/steam-acf/default.nix                          | 2 +-
 pkgs/tools/misc/colorpanes/default.nix                          | 2 +-
 pkgs/tools/misc/didu/default.nix                                | 2 +-
 pkgs/tools/misc/diskonaut/default.nix                           | 2 +-
 pkgs/tools/misc/dutree/default.nix                              | 2 +-
 pkgs/tools/misc/fcp/default.nix                                 | 2 +-
 pkgs/tools/misc/hacksaw/default.nix                             | 2 +-
 pkgs/tools/misc/i3nator/default.nix                             | 2 +-
 pkgs/tools/misc/journaldriver/default.nix                       | 2 +-
 pkgs/tools/misc/licensor/default.nix                            | 2 +-
 pkgs/tools/misc/loop/default.nix                                | 2 +-
 pkgs/tools/misc/pazi/default.nix                                | 2 +-
 pkgs/tools/misc/powerline-rs/default.nix                        | 2 +-
 pkgs/tools/misc/present-cli/default.nix                         | 2 +-
 pkgs/tools/misc/rargs/default.nix                               | 2 +-
 pkgs/tools/misc/shell-hist/default.nix                          | 2 +-
 pkgs/tools/misc/tab-rs/default.nix                              | 2 +-
 pkgs/tools/misc/termplay/default.nix                            | 2 +-
 pkgs/tools/misc/todo/default.nix                                | 2 +-
 pkgs/tools/misc/void/default.nix                                | 2 +-
 pkgs/tools/misc/xprite-editor/default.nix                       | 2 +-
 pkgs/tools/misc/xxv/default.nix                                 | 2 +-
 pkgs/tools/networking/anevicon/default.nix                      | 2 +-
 pkgs/tools/networking/bore/default.nix                          | 2 +-
 pkgs/tools/networking/cocom/default.nix                         | 2 +-
 pkgs/tools/networking/ratman/default.nix                        | 2 +-
 pkgs/tools/nix/cached-nix-shell/default.nix                     | 2 +-
 pkgs/tools/package-management/nix-simple-deploy/default.nix     | 2 +-
 pkgs/tools/security/genpass/default.nix                         | 2 +-
 pkgs/tools/security/sheesy-cli/default.nix                      | 2 +-
 pkgs/tools/system/ddh/default.nix                               | 2 +-
 pkgs/tools/system/dfrs/default.nix                              | 2 +-
 pkgs/tools/system/mq-cli/default.nix                            | 2 +-
 pkgs/tools/text/pinyin-tool/default.nix                         | 2 +-
 pkgs/tools/text/xsv/default.nix                                 | 2 +-
 pkgs/tools/typesetting/tex/tex-match/default.nix                | 2 +-
 73 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/pkgs/applications/display-managers/greetd/dlm.nix b/pkgs/applications/display-managers/greetd/dlm.nix
index a73a96c779a8..42761dbfcf83 100644
--- a/pkgs/applications/display-managers/greetd/dlm.nix
+++ b/pkgs/applications/display-managers/greetd/dlm.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p";
   };
 
-  cargoSha256 = "01a8k60qnx2pgxb2adgw30c2hjb60w6230khm5hyqgmp7z4rm8k8";
+  cargoHash = "sha256-aKKayT+3PuxhqXCCIQwHZkkoGBj8NSVWf1d0i4GZSAU=";
 
   meta = with lib; {
     description = "Stupid simple graphical login manager";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 7736ec5e94e1..f7c6263bb3b4 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -866,7 +866,7 @@
         inherit version;
         src = LanguageClient-neovim-src;
 
-        cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
+        cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
         buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
         # FIXME: Use impure version of CoreFoundation because of missing symbols.
diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix
index 1c6202eb0dee..b737716ed5d3 100644
--- a/pkgs/applications/misc/reddsaver/default.nix
+++ b/pkgs/applications/misc/reddsaver/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
   };
 
-  cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp";
+  cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/applications/misc/zktree/default.nix
index 82b93763ed82..71b8806ae070 100644
--- a/pkgs/applications/misc/zktree/default.nix
+++ b/pkgs/applications/misc/zktree/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
   };
 
-  cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5";
+  cargoHash = "sha256-RZtxpUsh8Gt/7bNcVGE4qfiLLENHDHAYXZapNOpTZ6M=";
 
   meta = with lib; {
     description = "Small tool to display Znodes in Zookeeper in tree structure";
diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix
index f3dec5e6ab07..215821e62119 100644
--- a/pkgs/applications/networking/wg-bond/default.nix
+++ b/pkgs/applications/networking/wg-bond/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y";
   };
 
-  cargoSha256 = "1nlzhkhk1y0jhj6n3wn4dm783ldsxn7dk0d2xjx6ylczf9z3gp12";
+  cargoHash = "sha256-Itw3fnKfUW+67KKB2Y7tutGBTm3E8mGNhBL4MOGEn9o=";
 
   nativeBuildInputs = [ makeWrapper ];
   postInstall = ''
diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/applications/science/electronics/dwfv/default.nix
index 415cc29812d3..b1af561e8877 100644
--- a/pkgs/applications/science/electronics/dwfv/default.nix
+++ b/pkgs/applications/science/electronics/dwfv/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7";
   };
 
-  cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy";
+  cargoHash = "sha256-nmnpHz9sCRlxOngcSrW+oktYIKM/A295/a03fUf3ofw=";
 
   meta = with lib; {
     description = "Simple digital waveform viewer with vi-like key bindings";
diff --git a/pkgs/applications/version-management/commit-formatter/default.nix b/pkgs/applications/version-management/commit-formatter/default.nix
index 3a3fc7b28127..8ed831d88657 100644
--- a/pkgs/applications/version-management/commit-formatter/default.nix
+++ b/pkgs/applications/version-management/commit-formatter/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA=";
   };
 
-  cargoSha256 = "AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ=";
+  cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ=";
 
   meta = with lib; {
     description = "CLI tool to help you write git commit";
diff --git a/pkgs/applications/version-management/git-codeowners/default.nix b/pkgs/applications/version-management/git-codeowners/default.nix
index 7ca69ccc3d4b..7df57966f89b 100644
--- a/pkgs/applications/version-management/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-codeowners/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
   };
 
-  cargoSha256 = "00wi64v2zn8rp8fjwbdwyvl3pva5sn9xclaawp2m222dqnlszb2d";
+  cargoHash = "sha256-TayvqcVNCFHF5UpR1pPVRe076Pa8LS4duhnZLzYxkQM=";
 
   meta = with lib; {
     homepage = "https://github.com/softprops/git-codeowners";
diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix
index aed7ab9b52bf..b074d0b08631 100644
--- a/pkgs/applications/version-management/josh/default.nix
+++ b/pkgs/applications/version-management/josh/default.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v";
   };
 
-  cargoSha256 = "1j0vl3h6f65ldg80bgryh1mz423lcrcdkn8rmajya1850pfxk3w3";
+  cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
index 7c4ecaf30729..ffde4f16f157 100644
--- a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
+++ b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc";
   };
 
-  cargoSha256 = "0hx5nhxci6p0gjjn1f3vpfykq0f7hdvhlv8898vrv0lh5r9hybsn";
+  cargoHash = "sha256-Vi8PUy6Qgp03SghtCneDxwE8vbt7uGClfOCayDq0pUM=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
index 0903ceb3185a..ad585ef08885 100644
--- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
+++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
   };
 
-  cargoSha256 = "134sgc9d0j57swknl9sgil6212rws2hhp92s3cg1yzz5ygx21c76";
+  cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow=";
 
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;
diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix
index 607bb775f8ff..590791630669 100644
--- a/pkgs/by-name/hi/himalaya/package.nix
+++ b/pkgs/by-name/hi/himalaya/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NrWBg0sjaz/uLsNs8/T4MkUgHOUvAWRix1O5usKsw6o=";
   };
 
-  cargoSha256 = "YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
+  cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
 
   NIX_LDFLAGS = lib.optionals stdenv.isDarwin [
     "-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks"
diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix
index 04e68b52841f..ec095dab0286 100644
--- a/pkgs/by-name/ne/neverest/package.nix
+++ b/pkgs/by-name/ne/neverest/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE=";
   };
 
-  cargoSha256 = "i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c=";
+  cargoHash = "sha256-i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix
index 16cd7f972ce4..efb3fbfcc5cd 100644
--- a/pkgs/development/compilers/elm/packages/elm-json/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     openssl
   ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
+  cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
index 02f69c2d2f03..a4f340faf3ca 100644
--- a/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     CoreServices
   ]);
 
-  cargoSha256 = "sha256:1dpdlzv96kpc25yf5jgsz9qldghyw35x382qpxhkadkn5dryzjvd";
+  cargoHash = "sha256-bcvvcyt2NjVhv1ig0cvgHr5Gcfr6yeJ8EexOk/an7bY=";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 23453e92e7f8..caf81e749757 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg";
   };
 
-  cargoSha256 = "1qfqhqimp56g34bir30zgl273yssrbmwf1h8h8yvdpzkybpd92gx";
+  cargoHash = "sha256-/YnU7vLz37Y9gggGx+vKWvtxBH0fjBwXGc+UWyOG2OE=";
 
   meta = with lib; {
     homepage = "https://github.com/cgag/loc";
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 08dd8d397f98..df5032a73700 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   dontWrapQtApps = true;
 
-  cargoSha256 = "0vhcb3kw1zgchx3nrk8lyrz8p5071y99vsysxvi71klv7dcvn0am";
+  cargoHash = "sha256-VQG7WTubznDi7trrnZIPB5SLfvYUzWxHh+z9wOdYDG4=";
   doCheck = false;
 
   postInstall = ''
diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix
index ae5a1d825675..dd2ea5205335 100644
--- a/pkgs/development/tools/async/default.nix
+++ b/pkgs/development/tools/async/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx";
   };
 
-  cargoSha256 = "0y2q46i838gha58p95vcv5r5i14il1kv86k35s30ncfibijgp0lc";
+  cargoHash = "sha256-jIL7ZFzRMQuGLmMatGegkYRYctlsl3RRUfChgaIhWHg=";
 
   meta = with lib; {
     description = "Tool to parallelize shell commands";
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index f1d67bddc66f..6f4fa62cb533 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
   };
 
-  cargoSha256 = "0xcgzlcmlk5ycw4kklprm8lzs72j2zp8xm3dcpy606z4r9qn0c6a";
+  cargoHash = "sha256-yjBgccrkG2D8ZW3Uju4XUhz9Kar50jkJZ75MWhn9j3U=";
 
   meta = {
     description = "Generate changelogs from local git metadata";
diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix
index acd6d39e97f6..2307cc54facb 100644
--- a/pkgs/development/tools/misc/mdctags/default.nix
+++ b/pkgs/development/tools/misc/mdctags/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb";
   };
 
-  cargoSha256 = "1kdbrcpvxiq91m5vq33vzjhsp4j3flzrpbj5hmxf0k3al1a7qk1g";
+  cargoHash = "sha256-L0x8VKBqTOB6hUWumz91Q5Krofx7DLxLDQnHvi/Lq80=";
 
   meta = {
     description = "tags for markdown file";
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 7d7ea67417e0..cc434f14dd6d 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd";
   };
 
-  cargoSha256 = "1lam4gwzcj6w0pyxf61l2cpbvvf5gmj2gwi8dangnhd60qhlnvrx";
+  cargoHash = "sha256-PW9LIQamQfusaijyJ2R9xe29LhM0GNf9BdxI9vkjVdE=";
 
   nativeBuildInputs = [ llvmPackages.clang rustPlatform.bindgenHook ];
 
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index 7b0e2c7a784a..6152e0c8dc38 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -36,5 +36,5 @@ rustPlatform.buildRustPackage rec {
       cp ${cargo-lock} $out/Cargo.lock
     '';
 
-  cargoSha256 = "0d6g52hjflnw2zvlx10pz78527vh7mw5n43yi8q6dwr3pkbds1fs";
+  cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ=";
 }
diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix
index 0a9fa1236545..dddc5d12cb3d 100644
--- a/pkgs/development/tools/rust/bootimage/default.nix
+++ b/pkgs/development/tools/rust/bootimage/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg";
   };
 
-  cargoSha256 = "03jximwqgjq7359c5mxbyfja2d04y57h34f87aby8jy0lz99jy2x";
+  cargoHash = "sha256-XXiZ0qfAS+SXOsiRAU/xBDShpPOr18JSGQfLh3mNXQ4=";
 
   meta = with lib; {
     description = "Creates a bootable disk image from a Rust OS kernel";
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 68d5a256bbf4..9c66f2cd9798 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb";
   };
 
-  cargoSha256 = "1c22aal3i7zbyxr2c41fimfx13fwp9anmhh641951yd7cqb8xij2";
+  cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix
index 3cb68b11c62e..ee28a7183a93 100644
--- a/pkgs/development/tools/rust/cargo-bazel/default.nix
+++ b/pkgs/development/tools/rust/cargo-bazel/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios=";
   };
 
-  cargoSha256 = "+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw=";
+  cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix
index ead5705c59ae..d206e739bb83 100644
--- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix
+++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
   };
 
-  cargoSha256 = "00g06zf0m1wry0mhf098pw99kbb99d8a17985pb90yf1w74rdkh6";
+  cargoHash = "sha256-Bs6WyeHBeZDWLSidoFBLaa2ZEr8oAQcr8JmHCtw34AE=";
 
   checkFlags = [
     # uses internet
diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix
index 55f4df99c6e4..9c4874a97555 100644
--- a/pkgs/development/tools/rust/cargo-espmonitor/default.nix
+++ b/pkgs/development/tools/rust/cargo-espmonitor/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4=";
   };
 
-  cargoSha256 = "d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g=";
+  cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g=";
 
   meta = with lib; {
     description = "Cargo tool for monitoring ESP32/ESP8266 execution";
diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix
index db646ec07c9e..e8b1443dd009 100644
--- a/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "069i8ydrp1pssnjq7d6mydwr7xh2cmcpzpf8bzd6nfjr6xx1pipr";
+  cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk=";
 
   meta = with lib; {
     description = "See what Rust is doing behind the curtains";
diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/development/tools/rust/cargo-kcov/default.nix
index 68ed13d1ad01..2517ac37c712 100644
--- a/pkgs/development/tools/rust/cargo-kcov/default.nix
+++ b/pkgs/development/tools/rust/cargo-kcov/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br";
   };
 
-  cargoSha256 = "0m5gfyjzzwd8wkbb388vmd785dy334x0migq3ssi7dlah9zx62bj";
+  cargoHash = "sha256-cgnTf4KKthO1HvjFCjoZw7eCTqsbobHW5Kjx/6V3r1Q=";
   doCheck = false;
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix
index d1dd2cc527fa..11f1fc6aacf0 100644
--- a/pkgs/development/tools/rust/cargo-web/default.nix
+++ b/pkgs/development/tools/rust/cargo-web/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
   };
 
-  cargoSha256 = "0q7yxvvngfvn4s889qzp1qnsw2c6qy2ryv9vz9cxhmqidx4dg4va";
+  cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA=";
 
   nativeBuildInputs = [ openssl perl pkg-config ];
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/misc/autoadb/default.nix
index 8832d314df85..6b3ef212772a 100644
--- a/pkgs/misc/autoadb/default.nix
+++ b/pkgs/misc/autoadb/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres=";
   };
 
-  cargoSha256 = "1gzg1lhq8gp790mrc8fw8dg146k8lg20pnk45m2ssnmdka0826f7";
+  cargoHash = "sha256-xxmBgJqtWq1FLWTaC8SjaBoSXkPcIZYrSOc+hCEN778=";
 
   meta = with lib; {
     description = "Execute a command whenever a device is adb-connected";
diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix
index 99ebe5a8be0f..414403d81ef9 100644
--- a/pkgs/misc/uq/default.nix
+++ b/pkgs/misc/uq/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb";
   };
 
-  cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4";
+  cargoHash = "sha256-hBV+mqN4rnHGKAVRtlk2VFml/T9YQxzGTvGK2jcCwNw=";
 
   meta = with lib; {
     description = "Simple, user-friendly alternative to sort | uniq";
diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/os-specific/linux/swapview/default.nix
index 2cfc8e57c053..520b2ba4758d 100644
--- a/pkgs/os-specific/linux/swapview/default.nix
+++ b/pkgs/os-specific/linux/swapview/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj";
   };
 
-  cargoSha256 = "03yi6bsjjnl8hznxr1nrnxx5lrqb574625j2lkxqbl9vrg9mswdz";
+  cargoHash = "sha256-v3Fd08s70YX7pEIWYcgpC2daerfZhtzth4haKfUy0Q8=";
 
   meta = with lib; {
     description = "Simple program to view processes' swap usage on Linux";
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index 11cbfa5adbf2..f738c9e50403 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
   };
 
-  cargoSha256 = "1n4498byy2m2f928hamfn959abrrn693wcc323ifqqrvnbkckdz8";
+  cargoHash = "sha256-6LfJ5rI7Y+ziEIMxPpKxOS+VSrKuKohEcqIK7xdKhNg=";
 
   meta = with lib; {
     description = "Simple relay server for broadcasting a WebM stream";
diff --git a/pkgs/shells/nsh/default.nix b/pkgs/shells/nsh/default.nix
index 43938e1e90eb..fc7e5667a4f3 100644
--- a/pkgs/shells/nsh/default.nix
+++ b/pkgs/shells/nsh/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp";
   };
 
-  cargoSha256 = "1kxjr4ymns95g6jz94107nqmd71m2xh8k19gcsy08650gjrn5cz3";
+  cargoHash = "sha256-47Nis3ygGAS8Zi+FiWAXNZxWsT0gkPSleSVpWz3Jss8=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/tools/X11/inputplug/default.nix
index 80d97190a0ce..acfe9f128044 100644
--- a/pkgs/tools/X11/inputplug/default.nix
+++ b/pkgs/tools/X11/inputplug/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ libbsd ];
 
-  cargoSha256 = "161kz47d4psfvh0vm98k8qappg50lpsw1ybyy7s3g3bp6ivfz8jv";
+  cargoHash = "sha256-W6LvdjR3jTf08X75wPWloLx7FUYTpboB3E5f0g75M5g=";
 
   postInstall = ''
     installManPage inputplug.1
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index c23acbedafdf..1c212edafd92 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb";
   };
 
-  cargoSha256 = "1y7m61j07gvqfqz97mda39nc602sv7a826c06m8l22i7z380xfms";
+  cargoHash = "sha256-uroO0PgnCkFRNYAZgdTZWgDDbBqq1ZM+dni/A2Qw9fg=";
 
   buildInputs = [ xorg.libX11 xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkg-config patchelf python3 ];
diff --git a/pkgs/tools/games/steam-acf/default.nix b/pkgs/tools/games/steam-acf/default.nix
index ea6572216104..7028ed33a39b 100644
--- a/pkgs/tools/games/steam-acf/default.nix
+++ b/pkgs/tools/games/steam-acf/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2";
   };
 
-  cargoSha256 = "0fzlvn0sl7613hpsb7ncykmcl53dgl8rzsg317nwkj2w679q4xq6";
+  cargoHash = "sha256-BneC0zFcyMntCePpnxF9bRTK6vTMnqUvHMEcqoHd9Ds=";
 
   meta = with lib; {
     description = "Tool to convert Steam .acf files to JSON";
diff --git a/pkgs/tools/misc/colorpanes/default.nix b/pkgs/tools/misc/colorpanes/default.nix
index e89dc66897c0..72209cf217a9 100644
--- a/pkgs/tools/misc/colorpanes/default.nix
+++ b/pkgs/tools/misc/colorpanes/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU=";
   };
 
-  cargoSha256 = "eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M=";
+  cargoHash = "sha256-eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M=";
 
   postInstall = ''
     ln -s $out/bin/colp $out/bin/colorpanes
diff --git a/pkgs/tools/misc/didu/default.nix b/pkgs/tools/misc/didu/default.nix
index a5a8a790e4ff..6db10b058ae5 100644
--- a/pkgs/tools/misc/didu/default.nix
+++ b/pkgs/tools/misc/didu/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0=";
   };
 
-  cargoSha256 = "O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA=";
+  cargoHash = "sha256-O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA=";
 
   meta = with lib; {
     description = "Duration conversion between units";
diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix
index 6193e0a5e816..d9738b398b04 100644
--- a/pkgs/tools/misc/diskonaut/default.nix
+++ b/pkgs/tools/misc/diskonaut/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54";
   };
 
-  cargoSha256 = "10jrcy8m9ll4136ghq3fhmnphd9g3rw863x708vm17n44kgdxyab";
+  cargoHash = "sha256-S/ne3iTEnlA3AqcPg3geLzV4bYVuYPjMCITSVJFnWYI=";
 
   # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1
   doCheck = !stdenv.isDarwin;
diff --git a/pkgs/tools/misc/dutree/default.nix b/pkgs/tools/misc/dutree/default.nix
index f9fc1afa18d2..421af51aef51 100644
--- a/pkgs/tools/misc/dutree/default.nix
+++ b/pkgs/tools/misc/dutree/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "0gg1w0xx36aswfm0y53nqwwz7zds25ysmklbrc8v2r91j74bhkzw";
+  cargoHash = "sha256-/E+4yJEhZbERy4vOqn0Ruv3zOcd2FA+q41qZ0Tvg4T0=";
 
   meta = with lib; {
     description = "Tool to analyze file system usage written in Rust";
diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix
index dd7035e19c28..814d764a7999 100644
--- a/pkgs/tools/misc/fcp/default.nix
+++ b/pkgs/tools/misc/fcp/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
   };
 
-  cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9";
+  cargoHash = "sha256-iS3H87kTS7Iq0FhHE47zBOozPKC1mG9eHiATxp18hz8=";
 
   nativeBuildInputs = [ expect ];
 
diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/tools/misc/hacksaw/default.nix
index 5532fa181f64..5dbda4630968 100644
--- a/pkgs/tools/misc/hacksaw/default.nix
+++ b/pkgs/tools/misc/hacksaw/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1l6i91xb81p1li1j2jm0r2rx8dbzl2yh468cl3dw0lqpqy4i65hx";
   };
 
-  cargoSha256 = "1rykc06lq3bkblsrj68rbil63yqdnvxkxlppq1w74wf0d6cwjc08";
+  cargoHash = "sha256-CDDJmWnAcXJ4wPfSPvu2DfthaFwZGZk1XXMNTA1g0+c=";
 
   meta = with lib; {
     description = "Lightweight selection tool for usage in screenshot scripts etc";
diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/tools/misc/i3nator/default.nix
index 4c62e4ca8050..ede71688175e 100644
--- a/pkgs/tools/misc/i3nator/default.nix
+++ b/pkgs/tools/misc/i3nator/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p";
   };
 
-  cargoSha256 = "04sx1dsznvh60s2yd9bzbvj6fgjvj37vv33qpww13fyph832i37g";
+  cargoHash = "sha256-74woBoLXuxE4v3iMvc+QWz5n5F5/peaFBgZu+3ULXRM=";
 
   meta = with lib; {
     description = "Tmuxinator for the i3 window manager";
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index a5174c4b309e..89806e5443a9 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -3,7 +3,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "journaldriver";
   version = "5656.0.0";
-  cargoSha256 = "0jxv7skqgkk2j28jzs0gqnic0pqbdpgy8ryhz613pn0cslgy1p5q";
+  cargoHash = "sha256-uNzgH9UM2DuC+dBn5N9tC1/AosUP6C+RkGLOh6c+u0s=";
 
   src = fetchgit {
     url = "https://code.tvl.fyi/depot.git:/ops/journaldriver.git";
diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 2972eb8bbb61..c1716911537a 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32";
   };
 
-  cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0";
+  cargoHash = "sha256-gEOMOb2VRx0cFnzmfKBh9W1FoI4Nr7/PW4GQnldoxsA=";
 
   # https://github.com/raftario/licensor/issues/67
   postPatch = ''
diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index 6fa819cd8366..c8fbb1845b83 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix";
   };
 
-  cargoSha256 = "0pk6hwmzs58vgbkvmlpa4s4cd29izp6xq17zaix5v2didbzr5ixi";
+  cargoHash = "sha256-sceS/2qxiV16VP8E3M39MYnGiCbq0rrnehsV/SuHZl4=";
 
   meta = with lib; {
     description = "UNIX's missing `loop` command";
diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix
index 43ea65c54de3..b7a05116f38b 100644
--- a/pkgs/tools/misc/pazi/default.nix
+++ b/pkgs/tools/misc/pazi/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "1iamlp5519h8mmgd4964cvyp7mmnqdg2d3qj5v7yzilyp4nz15jc";
+  cargoHash = "sha256-TJbwLbmexu/PLhKPJl7DttZz/WbEJNJerQimUMqlVcU=";
 
   meta = with lib; {
     description = "Autojump \"zap to directory\" helper";
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 5edde7b3653f..c9378d7c3d40 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y";
   };
 
-  cargoSha256 = "1i29wps7wz6b0qarqqg8rplq7ak1zz83k6m182sjk17cni74n21l";
+  cargoHash = "sha256-NAhLTrTshCm1QKGaOdD/YaqD6c3oYZwVBst8fvTlScQ=";
 
   nativeBuildInputs = [ pkg-config file perl cmake curl ];
   buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/misc/present-cli/default.nix b/pkgs/tools/misc/present-cli/default.nix
index 4c0ac78b6ccd..0f425accb699 100644
--- a/pkgs/tools/misc/present-cli/default.nix
+++ b/pkgs/tools/misc/present-cli/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "+kCHe84ikdCLd7j5YwP2j3xz+XTzzo/kLy+b9YUFDnI=";
   };
 
-  cargoSha256 = "VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI=";
+  cargoHash = "sha256-VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI=";
 
   # required for tests
   postPatch = ''
diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/tools/misc/rargs/default.nix
index 54c7e393d2d2..7d97a9ecacba 100644
--- a/pkgs/tools/misc/rargs/default.nix
+++ b/pkgs/tools/misc/rargs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd";
   };
 
-  cargoSha256 = "18yd4dpzjyw6w1ms74pzxqyn5fkh8q4rsg6rqsp6bsz7300fxxvh";
+  cargoHash = "sha256-cPfuABjn62Wuxtk8nQlGcLpiPe7/kqNr4IZ7+W8jzaM=";
 
   doCheck=false;  # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs
 
diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix
index 438b687c73f1..ee5d2da6e543 100644
--- a/pkgs/tools/misc/shell-hist/default.nix
+++ b/pkgs/tools/misc/shell-hist/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf";
   };
 
-  cargoSha256 = "1b2cfs03vlaz7jnr67ilgjfi7cm59izpcdi6pyvbzv8s46z2dysp";
+  cargoHash = "sha256-V/smviEa7b+2vyY2dn9MpbITnXw0HpOtPF/RPYB2TKw=";
 
   meta = with lib; {
     description = "Inspect your shell history";
diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix
index 26b4fa724b48..9bae5eb51925 100644
--- a/pkgs/tools/misc/tab-rs/default.nix
+++ b/pkgs/tools/misc/tab-rs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr";
   };
 
-  cargoSha256 = "0v5vkxr2sncw4r4pwvk0jbk4as7zwwfvjk2cpj9872zp07s35a77";
+  cargoHash = "sha256-56gy9AH3i4OSvExMuR3n/2hF5pJgbn5JJpxZLXKfu2w=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
 
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index aa35e24da017..373be087bf6f 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p";
   };
 
-  cargoSha256 = "08ip6x4kink244majlk595yh551c2ap3ry58wly994mh8wf6ifwb";
+  cargoHash = "sha256-i7toHEewkpQ85aj4PK4SLJQCfUllUqkqIWLaOEk3NyI=";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/tools/misc/todo/default.nix
index 6b6c858490a1..4f5789527ae6 100644
--- a/pkgs/tools/misc/todo/default.nix
+++ b/pkgs/tools/misc/todo/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40=";
   };
 
-  cargoSha256 = "B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI=";
+  cargoHash = "sha256-B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index 1204206d34b6..8ead979eed80 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   # The tests are long-running and not that useful
   doCheck = false;
 
-  cargoSha256 = "1wh1yb02w5afghd19i2s0v8mq4lq20djsljrr44xciq68bqfdcp0";
+  cargoHash = "sha256-4LLm8EIGR9YJyVlSLRsQmBJc0QZaxBQafE4VLsDyAfI=";
 
   meta = with lib; {
     description = "Terminal-based personal organizer";
diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix
index b6a0a9b47085..f5581bd354c1 100644
--- a/pkgs/tools/misc/xprite-editor/default.nix
+++ b/pkgs/tools/misc/xprite-editor/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ];
 
-  cargoSha256 = "0z1ip667d1qwvm9md3zg8ib9jixpg7qj5ypwib7r2928h14yg7ck";
+  cargoHash = "sha256-k53nSYBIJJHPivz6IvF5t0eZVkTvj1ZT3RyHdoy5MXw=";
 
   cargoBuildFlags = [ "--bin" "xprite-native" ];
 
diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix
index 1cb13709bb89..c1ef7ae81b19 100644
--- a/pkgs/tools/misc/xxv/default.nix
+++ b/pkgs/tools/misc/xxv/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3";
   };
 
-  cargoSha256 = "0pmpvlmy4pw252is34r9af1ysrp78xs8pz8cw4rys9s4fh2hmhjb";
+  cargoHash = "sha256-S8IKBXREJ+0z4Qz9i3RH52btg1Mpk6GjKIJf4ivdt14=";
 
   buildInputs = lib.optionals useNcurses [ ncurses ]
   ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ])
diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix
index 346c79dd6f31..961127580500 100644
--- a/pkgs/tools/networking/anevicon/default.nix
+++ b/pkgs/tools/networking/anevicon/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1m3ci7g7nn28p6x5m85av3ljgszwlg55f1hmgjnarc6bas5bapl7";
   };
 
-  cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
+  cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix
index f32e9ff7542c..20b577fab91e 100644
--- a/pkgs/tools/networking/bore/default.nix
+++ b/pkgs/tools/networking/bore/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9";
   };
 
-  cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx";
+  cargoHash = "sha256-vUKv98lfsrxBiJxjL8ZKLZ1IVCX5hHzl+F5y4Ot3i/Y=";
   cargoBuildFlags = [ "-p" pname ];
 
   # error[E0793]: reference to packed field is unaligned
diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix
index 6ae004de9b3e..7281583b17c1 100644
--- a/pkgs/tools/networking/cocom/default.nix
+++ b/pkgs/tools/networking/cocom/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j";
   };
 
-  cargoSha256 = "04kj1yj6hhnis3ss0xs4zq8rl71rzn577g8i0wmapkjqzqwg37yb";
+  cargoHash = "sha256-y5/xOP5YzqsqBxG9c4r9ORyaEf5Ed6D10NFCaKQPchI=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix
index cccf50206d5d..ebadc2a41c93 100644
--- a/pkgs/tools/networking/ratman/default.nix
+++ b/pkgs/tools/networking/ratman/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZZ7idZ67xvQFmQJqIFU/l77YU+yDQOqNthX5NR/l4k8=";
   };
 
-  cargoSha256 = "Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc=";
+  cargoHash = "sha256-Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc=";
 
   nativeBuildInputs = [ protobuf pkg-config installShellFiles ];
 
diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix
index 84672a8e96a3..39282f7d4022 100644
--- a/pkgs/tools/nix/cached-nix-shell/default.nix
+++ b/pkgs/tools/nix/cached-nix-shell/default.nix
@@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "17v38llx83mp05a0axjxcd2zyafd57syh7xhx5cq6qibcbha0by9";
   };
 
-  cargoSha256 = "1jkkwsn3k2anmzf99x99r9zfnf0gpcjbi5pyakh4agiryqcdyg0j";
+  cargoHash = "sha256-EjzfGPY5PkXgVP6WuCS7Dzjrfsop9ZTcr1aJOazmc8o=";
 
   # The BLAKE3 C library is intended to be built by the project depending on it
   # rather than as a standalone library.
diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix
index 647a11b01fdc..3e119f9488bd 100644
--- a/pkgs/tools/package-management/nix-simple-deploy/default.nix
+++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qq4fbsd2mvxblsggwbnh88mj18f3vrfzv1kgc7a92pfiwxznq8r";
   };
 
-  cargoSha256 = "1r6dl7qipbyyvjcd3l9ynawjln1g1qzvw5za6nyjcf41dzv48m8x";
+  cargoHash = "sha256-HVVE9m+BOCa9NeoXvj8OL1gqubI+0dGY3N6vG/GhzeQ=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix
index da6b5c5bda08..0c326c2dac66 100644
--- a/pkgs/tools/security/genpass/default.nix
+++ b/pkgs/tools/security/genpass/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns=";
   };
 
-  cargoSha256 = "ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
+  cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
 
diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix
index 50aee190a763..2df2cfe72913 100644
--- a/pkgs/tools/security/sheesy-cli/default.nix
+++ b/pkgs/tools/security/sheesy-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1l21ji9zqy8x1g2gvqwdhya505max07ibx1hh88s36k0jbvdb7xc";
   };
 
-  cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3";
+  cargoHash = "sha256-o2XRvzw54x6xv81l97s1hwc2MC0Ioeyheoz3F+AtKpU=";
   cargoDepsName = pname;
 
   nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ];
diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/tools/system/ddh/default.nix
index 14afcec4c463..b042f5549a19 100644
--- a/pkgs/tools/system/ddh/default.nix
+++ b/pkgs/tools/system/ddh/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw=";
   };
 
-  cargoSha256 = "6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI=";
+  cargoHash = "sha256-6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI=";
 
   meta = with lib; {
     description = "Fast duplicate file finder";
diff --git a/pkgs/tools/system/dfrs/default.nix b/pkgs/tools/system/dfrs/default.nix
index 002e421900b9..abef6bb05d67 100644
--- a/pkgs/tools/system/dfrs/default.nix
+++ b/pkgs/tools/system/dfrs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
   };
 
-  cargoSha256 = "1dgmn4g35yc7hwnxznkrpwnikn329nc0z8y7bxlcd308k1v83919";
+  cargoHash = "sha256-KaSBdpgIjMZoX8ejD5hNYtgZLb952t8th4f5Mh6x9bU=";
 
   meta = with lib; {
     description = "Display file system space usage using graphs and colors";
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
index 81adc7daa272..6da2fbefab4b 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7";
   };
 
-  cargoSha256 = "19mk0hl7cr5qb3r64zi0hcsn4yqbg8c3g2f9jywm0g2c13ak36li";
+  cargoHash = "sha256-kZox1QhMPFC5l8mJNxh6C3tiNYMgfmLyWLhkdigEs6Y=";
 
   meta = with lib; {
     description      = "CLI tool to manage POSIX message queues";
diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix
index 9d434d1aa98f..b2427e4f5f4b 100644
--- a/pkgs/tools/text/pinyin-tool/default.nix
+++ b/pkgs/tools/text/pinyin-tool/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b";
   };
 
-  cargoSha256 = "1ixl4bsb8c8dmz9s28a2v5l5f2hi3g9xjy6ribmhybpwmfs4mr4d";
+  cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index bf5a7ed6b805..b779a6c962ca 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045";
   };
 
-  cargoSha256 = "1bh60zgflaa5n914irkr4bpq3m4h2ngcj6bp5xx1qj112dwgvmyb";
+  cargoHash = "sha256-y9f9eBMhSBx6L3cZyZ4VkNSB7yJ55khCskUp6t4HBq4=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/pkgs/tools/typesetting/tex/tex-match/default.nix b/pkgs/tools/typesetting/tex/tex-match/default.nix
index c7d961d21fc1..18dffb657c89 100644
--- a/pkgs/tools/typesetting/tex/tex-match/default.nix
+++ b/pkgs/tools/typesetting/tex/tex-match/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ gtk3 ];
 
-  cargoSha256 = "13ihwrckpsb4j1ai923vh151frw0yriwg9yylj9lk0ycps51y1sn";
+  cargoHash = "sha256-Vgcfir7Mg0mTpN6nx2P2gGcXSoB7iBRVkGTpO1nmMI4=";
 
   meta = with lib; {
     description = "Search through over 1000 different LaTeX symbols by sketching. A desktop version of detexify";

From ede1ffbdfc75b5546db0218f9c6c7dd6761de473 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 3 Jul 2024 20:45:08 +0800
Subject: [PATCH 117/319] rover: use cargoHash instead of cargoSha256 in
 updateScript

---
 pkgs/development/tools/rover/update.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/rover/update.sh b/pkgs/development/tools/rover/update.sh
index 3914c9acb540..a9a5bdb6ad6c 100755
--- a/pkgs/development/tools/rover/update.sh
+++ b/pkgs/development/tools/rover/update.sh
@@ -36,16 +36,16 @@ sed --in-place \
     "s|sha256 = \"[a-zA-Z0-9\/+-=]*\"|sha256 = \"$rover_sri_hash\"|" \
     "$dirname/default.nix"
 
-# Clear cargoSha256.
+# Clear cargoHash.
 sed --in-place \
-    "s|cargoSha256 = \".*\"|cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \
+    "s|cargoHash = \".*\"|cargoHash = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \
     "$dirname/default.nix"
 
-# Update cargoSha256
-echo "Computing cargoSha256"
-cargoSha256=$(
-    nix-prefetch "{ sha256 }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = sha256; })"
+# Update cargoHash
+echo "Computing cargoHash"
+cargoHash=$(
+    nix-prefetch "{ hash }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = hash; })"
 )
 sed --in-place \
-    "s|cargoSha256 = \".*\"|cargoSha256 = \"$cargoSha256\"|" \
+    "s|cargoHash = \".*\"|cargoHash = \"$cargoHash\"|" \
     "$dirname/default.nix"

From 07fddc62e49dc8dbe7fe99266602826f305a041a Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 3 Jul 2024 20:52:14 +0800
Subject: [PATCH 118/319] buildRustPackage: deprecate cargoSha256 in favor of
 cargoHash

---
 pkgs/build-support/rust/build-rust-package/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 36e0408cc198..a1727c91ba36 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -61,7 +61,7 @@
 
 assert cargoVendorDir == null && cargoLock == null
     -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null)
-    -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set";
+    -> throw "cargoHash, cargoVendorDir, or cargoLock must be set";
 
 let
 
@@ -75,7 +75,7 @@ let
     } // lib.optionalAttrs (args ? cargoHash) {
       hash = args.cargoHash;
     } // lib.optionalAttrs (args ? cargoSha256) {
-      sha256 = args.cargoSha256;
+      sha256 = lib.warn "cargoSha256 is deprecated. Please use cargoHash with SRI hash instead" args.cargoSha256;
     } // depsExtraArgs);
 
   target = stdenv.hostPlatform.rust.rustcTargetSpec;

From cb93149275bb21205650bc942f4b5993bc5c9394 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 3 Jul 2024 21:14:55 +0800
Subject: [PATCH 119/319] doc/rust: deprecate cargoSha256

---
 doc/languages-frameworks/rust.section.md | 29 +++++++++++-------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index e12bbe02bfb5..dbbf48f7a95c 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -46,11 +46,16 @@ rustPlatform.buildRustPackage rec {
 }
 ```
 
-`buildRustPackage` requires either a `cargoHash` (preferred) or a
-`cargoSha256` attribute, computed over all crate sources of this package.
-`cargoHash` supports [SRI](https://www.w3.org/TR/SRI/) hashes and should be
-preferred over `cargoSha256` which was used for traditional Nix SHA-256 hashes.
-For example:
+`buildRustPackage` requires a `cargoHash` attribute, computed over all crate sources of this package.
+
+::: {.warning}
+`cargoSha256` is already deprecated, and is subject to removal in favor of
+`cargoHash` which supports [SRI](https://www.w3.org/TR/SRI/) hashes.
+
+If you are still using `cargoSha256`, you can simply replace it with
+`cargoHash` and recompute the hash, or convert the original sha256 to SRI
+hash using `nix-hash --to-sri --type sha256 "<original sha256>"`.
+:::
 
 ```nix
 {
@@ -58,7 +63,7 @@ For example:
 }
 ```
 
-Exception: If the application has cargo `git` dependencies, the `cargoHash`/`cargoSha256`
+Exception: If the application has cargo `git` dependencies, the `cargoHash`
 approach will not work, and you will need to copy the `Cargo.lock` file of the application
 to nixpkgs and continue with the next section for specifying the options of the `cargoLock`
 section.
@@ -76,14 +81,6 @@ then be taken from the failed build. A fake hash can be used for
 }
 ```
 
-For `cargoSha256` you can use:
-
-```nix
-{
-  cargoSha256 = lib.fakeSha256;
-}
-```
-
 Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
 best practices guide, Rust applications should always commit the `Cargo.lock`
 file in git to ensure a reproducible build. However, a few packages do not, and
@@ -98,7 +95,7 @@ directory into a tar.gz archive.
 The tarball with vendored dependencies contains a directory with the
 package's `name`, which is normally composed of `pname` and
 `version`. This means that the vendored dependencies hash
-(`cargoHash`/`cargoSha256`) is dependent on the package name and
+(`cargoHash`) is dependent on the package name and
 version. The `cargoDepsName` attribute can be used to use another name
 for the directory of vendored dependencies. For example, the hash can
 be made invariant to the version by setting `cargoDepsName` to
@@ -123,7 +120,7 @@ rustPlatform.buildRustPackage rec {
 
 ### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file}
 
-Using a vendored hash (`cargoHash`/`cargoSha256`) is tedious when using
+Using a vendored hash (`cargoHash`) is tedious when using
 `buildRustPackage` within a project, since it requires that the hash
 is updated after every change to `Cargo.lock`. Therefore,
 `buildRustPackage` also supports vendoring dependencies directly from

From f6ee8a0bdcace1518c86fcb3b5ad76b167e95ef1 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 3 Jul 2024 21:24:07 +0800
Subject: [PATCH 120/319] nixos/doc/rl-2411: mention cargoSha256 deprecation

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 92945ae414bb..64dfc008944e 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -176,6 +176,11 @@
 
 - The `stackclashprotection` hardening flag has been added, though disabled by default.
 
+- `cargoSha256` in `rustPlatform.buildRustPackage` has been deprecated in favor
+  of `cargoHash` which supports SRI hashes. See
+  [buildRustPackage: Compiling Rust applications with Cargo](https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo)
+  for more information.
+
 - `hareHook` has been added as the language framework for Hare. From now on, it,
   not the `hare` package, should be added to `nativeBuildInputs` when building
   Hare programs.

From 2082109d30094f95bf852ebf31cb25a1234155a1 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sun, 25 Jun 2023 12:55:52 +0200
Subject: [PATCH 121/319] linux: enable EFI_ZBOOT for generic compression
 support

Starting 6.1, it is possible to have generic compression for aarch64 and riscv64
via CONFIG_EFI_ZBOOT which implements apparently its own decompression.

https://lwn.net/Articles/907679/
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1bd673e10729..bb7d6334e342 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1051,6 +1051,7 @@ let
       EFI_STUB            = yes; # EFI bootloader in the bzImage itself
       EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER =
           whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
+      EFI_ZBOOT = whenAtLeast "6.1" yes; # Generic compression support for EFI payloads
       CGROUPS             = yes; # used by systemd
       FHANDLE             = yes; # used by systemd
       SECCOMP             = yes; # used by systemd >= 231

From fd4cba375d1b5e021f4d35ddba1b9112d3ee6681 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 27 Jun 2024 11:22:11 +0200
Subject: [PATCH 122/319] gnome2.libgnomeui: remove

This has been long dead.
---
 pkgs/desktops/gnome-2/default.nix             |  3 +-
 .../gnome-2/platform/libgnomeui/default.nix   | 29 -------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/libgnomeui/default.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 76cb60f9f5f1..5d7f0662b70f 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -27,8 +27,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libgnome = callPackage ./platform/libgnome { };
 
-  libgnomeui = callPackage ./platform/libgnomeui { };
-
   libbonobo = callPackage ./platform/libbonobo { };
 
   libbonoboui = callPackage ./platform/libbonoboui { };
@@ -72,6 +70,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
   libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15
   libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15
+  libgnomeui = throw "gnome2.libgnomeui has been removed"; # 2024-06-27
   libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15
   python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14
 })
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
deleted file mode 100644
index 29ed44431c31..000000000000
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango
-, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
-, gnome_vfs, libgnome-keyring, libglade }:
-
-stdenv.mkDerivation rec {
-  pname = "libgnomeui";
-  version = "2.24.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomeui/${lib.versions.majorMinor version}/libgnomeui-${version}.tar.bz2";
-    sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  patches = [
-    (fetchpatch {
-      name = "0001-gnome-scores.h-Convert-to-UTF-8.patch";
-      url = "https://gitlab.gnome.org/Archive/libgnomeui/-/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff";
-      sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs =
-    [ xorg.libX11 xorg.libSM xorg.libICE libxml2 GConf pango glib libgnome-keyring libglade libtool ];
-
-  propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
-}

From 9dcf8132c996c788d67f842fe78492a593b5be68 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 27 Jun 2024 11:23:13 +0200
Subject: [PATCH 123/319] gnome2.libgnome: remove

This has been long dead.
---
 pkgs/desktops/gnome-2/default.nix             |  3 +-
 .../gnome-2/platform/libgnome/default.nix     | 24 -------
 .../gnome-2/platform/libgnome/new-glib.patch  | 65 -------------------
 3 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/libgnome/default.nix
 delete mode 100644 pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 5d7f0662b70f..89bd5f7e15e3 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -25,8 +25,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome_vfs = callPackage ./platform/gnome-vfs { };
 
-  libgnome = callPackage ./platform/libgnome { };
-
   libbonobo = callPackage ./platform/libbonobo { };
 
   libbonoboui = callPackage ./platform/libbonoboui { };
@@ -70,6 +68,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
   libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15
   libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15
+  libgnome = throw "gnome2.libgnome has been removed"; # 2024-06-27
   libgnomeui = throw "gnome2.libgnomeui has been removed"; # 2024-06-27
   libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15
   python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
deleted file mode 100644
index c265b2ea6993..000000000000
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2
-, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libgnome";
-  version = "2.32.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome/${lib.versions.majorMinor version}/libgnome-${version}.tar.bz2";
-    sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
-  };
-
-  patches = [ ./new-glib.patch ];
-  /* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */
-  postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h";
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ];
-  propagatedBuildInputs = [ glib libbonobo libogg ];
-  meta.mainProgram = "gnome-open";
-}
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch b/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
deleted file mode 100644
index ceabfbdd158e..000000000000
--- a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Porting libgnome to newer glib:
- * remove g_thread_init and g_thread_supported, which are longer needed
-   https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#g-thread-init
- * replace GStaticRecMutex by GRecMutex
-   https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#GStaticRecMutex
-
-diff --git a/libgnome/gnome-i18n.c b/libgnome/gnome-i18n.c
-index 531c56c..f13d61e 100644
---- a/libgnome/gnome-i18n.c
-+++ b/libgnome/gnome-i18n.c
-@@ -55,12 +55,14 @@
- const GList *
- gnome_i18n_get_language_list (const gchar *ignored)
- {
--  static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT;
-+  static GRecMutex lang_list_lock;
-+  g_rec_mutex_init (&lang_list_lock);
-+
-   static GList *list = NULL;
-   const char * const* langs;
-   int i;
- 
--  g_static_rec_mutex_lock (&lang_list_lock);
-+  g_rec_mutex_lock (&lang_list_lock);
- 
-   if (list == NULL) {
-     langs = g_get_language_names ();
-@@ -71,7 +73,7 @@ gnome_i18n_get_language_list (const gchar *ignored)
-     list = g_list_reverse (list);
-   }
- 
--  g_static_rec_mutex_unlock (&lang_list_lock);
-+  g_rec_mutex_unlock (&lang_list_lock);
- 
-   return list;
- }
-diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
-index fe3efd4..c6619af 100644
---- a/libgnome/gnome-init.c
-+++ b/libgnome/gnome-init.c
-@@ -115,9 +115,6 @@ gnome_bonobo_module_info_get (void)
- static void
- bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
- {
--        if (!g_thread_supported ())
--		g_thread_init (NULL);
--
- 	if (!bonobo_activation_is_initialized ())
- 		bonobo_activation_preinit (program, mod_info);
- }
-diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c
-index 739765e..cd14999 100644
---- a/libgnome/gnome-program.c
-+++ b/libgnome/gnome-program.c
-@@ -1878,10 +1878,6 @@ gnome_program_init (const char *app_id, const char *app_version,
-     GnomeProgram *program;
-     va_list args;
- 
--    /* g_thread_init() has to be the first GLib function called ever */
--    if (!g_threads_got_initialized)
--        g_thread_init (NULL);
--
-     g_type_init ();
- 
-     va_start(args, first_property_name);

From 77f5a747f44917e040a1bd0dfbde5c1a01e17410 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 27 Jun 2024 11:24:36 +0200
Subject: [PATCH 124/319] gnome2.gnome_vfs: remove

This has been long dead.
---
 pkgs/desktops/gnome-2/default.nix             |  3 +-
 .../gnome-2/platform/gnome-vfs/default.nix    | 48 -------------------
 .../top-level/pkg-config/pkg-config-data.json | 12 -----
 3 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 89bd5f7e15e3..65b628ba42b8 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -23,8 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome_mime_data = callPackage ./platform/gnome-mime-data { };
 
-  gnome_vfs = callPackage ./platform/gnome-vfs { };
-
   libbonobo = callPackage ./platform/libbonobo { };
 
   libbonoboui = callPackage ./platform/libbonoboui { };
@@ -61,6 +59,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome_common = gnome-common;
   gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14
   gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14
+  gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27
   gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15
   gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15
   libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
deleted file mode 100644
index 7ce615fb3c71..000000000000
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib
-, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gnome-vfs";
-  version = "2.24.4";
-
-  src = let
-    inherit (finalAttrs) pname version;
-  in fetchurl {
-    url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ intltool pkg-config ];
-  buildInputs =
-    [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia
-      gnome_mime_data avahi acl
-    ];
-
-  propagatedBuildInputs = [ GConf glib ];
-
-  # struct SSL is opaque in openssl-1.1; and the SSL_free() man page
-  # says that one should not free members of it manually (in both
-  # the openssl-1.0 and openssl-1.1 man pages).
-  # https://bugs.gentoo.org/592540
-  patches = [ (fetchpatch {
-                name = "gnome-vfs-2.24.4-openssl-1.1.patch";
-                url = "https://bugs.gentoo.org/attachment.cgi?id=535944";
-                sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040";
-                extraPrefix = "";
-              })
-            ];
-
-  postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
-
-  doCheck = false; # needs dbus daemon
-
-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-
-  meta = {
-    pkgConfigModules = [ "gnome-vfs-2.0" "gnome-vfs-module-2.0" ];
-  };
-})
diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json
index 94808884918f..96561fc7b7da 100644
--- a/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -279,18 +279,6 @@
         "libgnome-keyring"
       ]
     },
-    "gnome-vfs-2.0": {
-      "attrPath": [
-        "gnome2",
-        "gnome_vfs"
-      ]
-    },
-    "gnome-vfs-module-2.0": {
-      "attrPath": [
-        "gnome2",
-        "gnome_vfs"
-      ]
-    },
     "gobject-2.0": {
       "attrPath": [
         "glib"

From 9fb7750cdd51ad5d289391e8f72cb86634203b26 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 3 Jul 2024 00:44:06 +0200
Subject: [PATCH 125/319] gnome2.libbonoboui: Remove

---
 pkgs/desktops/gnome-2/default.nix              |  3 +--
 .../gnome-2/platform/libbonoboui/default.nix   | 18 ------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/libbonoboui/default.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 65b628ba42b8..6dfcaac59d61 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -25,8 +25,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libbonobo = callPackage ./platform/libbonobo { };
 
-  libbonoboui = callPackage ./platform/libbonoboui { };
-
   gtkglext = callPackage ./platform/gtkglext { };
 
 #### DESKTOP
@@ -62,6 +60,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27
   gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15
   gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15
+  libbonoboui = throw "gnome2.libbonoboui has been removed"; # 2024-06-27
   libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15
   libgnomecanvasmm = "gnome2.libgnomecanvasmm has been removed"; # 2022-01-15
   libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
deleted file mode 100644
index 36ab293f5f12..000000000000
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool
-, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
-
-stdenv.mkDerivation rec {
-  pname = "libbonoboui";
-  version = "2.24.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libbonoboui/${lib.versions.majorMinor version}/libbonoboui-${version}.tar.bz2";
-    sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
-  propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
-}

From 9f3282ec3b54ebca61476e8955c509b497c87990 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 3 Jul 2024 00:45:52 +0200
Subject: [PATCH 126/319] gnome2.libbonobo: Drop

---
 pkgs/desktops/gnome-2/default.nix             |  3 +--
 .../gnome-2/platform/libbonobo/default.nix    | 21 -------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/libbonobo/default.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 6dfcaac59d61..3f8d7c634096 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -23,8 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome_mime_data = callPackage ./platform/gnome-mime-data { };
 
-  libbonobo = callPackage ./platform/libbonobo { };
-
   gtkglext = callPackage ./platform/gtkglext { };
 
 #### DESKTOP
@@ -60,6 +58,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27
   gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15
   gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15
+  libbonobo = throw "gnome2.libbonobo has been removed"; # 2024-06-27
   libbonoboui = throw "gnome2.libbonoboui has been removed"; # 2024-06-27
   libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15
   libgnomecanvasmm = "gnome2.libgnomecanvasmm has been removed"; # 2022-01-15
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
deleted file mode 100644
index e928052a4764..000000000000
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt
-, intltool, ORBit2, procps }:
-
-stdenv.mkDerivation rec {
-  pname = "libbonobo";
-  version = "2.32.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libbonobo/${lib.versions.majorMinor version}/libbonobo-${version}.tar.bz2";
-    sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = # still using stuff deprecated in new glib versions
-    "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";
-
-  nativeBuildInputs = [ flex bison pkg-config intltool procps ];
-  buildInputs = [ libxml2 ];
-  propagatedBuildInputs = [ popt glib ORBit2 ];
-}

From 44cce81d0f084abd6468120f36f798271f4e125b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 3 Jul 2024 22:01:44 +0100
Subject: [PATCH 127/319] gnutls: 3.8.5 -> 3.8.6

Changes: https://gitlab.com/gnutls/gnutls/-/blob/3.8.6/NEWS
---
 pkgs/development/libraries/gnutls/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 48e027f5246b..33b35446d725 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -60,11 +60,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnutls";
-  version = "3.8.5";
+  version = "3.8.6";
 
   src = fetchurl {
     url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
-    hash = "sha256-ZiaaLP4OHC2r7Ie9u9irZW85bt2aQN0AaXjgA8+lK/w=";
+    hash = "sha256-LhWIquU8sy1Dk38fTsoo/r2cDHqhc0/F3WGn6B4OvN0=";
   };
 
   outputs = [ "bin" "dev" "out" ]
@@ -85,16 +85,6 @@ stdenv.mkDerivation rec {
       revert = true;
       hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM=";
     })
-    # Makes the system-wide configuration for RSAES-PKCS1-v1_5 actually apply
-    # and makes it enabled by default when the config file is missing
-    # Without this an error 113 is thrown when using some RSA certificates
-    # see https://gitlab.com/gnutls/gnutls/-/issues/1540
-    # "This is pretty sever[e], since it breaks on letsencrypt-issued RSA keys." (comment from above issue)
-    (fetchpatch2 {
-      name = "fix-rsaes-pkcs1-v1_5-system-wide-configuration.patch";
-      url = "https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.diff";
-      hash = "sha256-2aWcLff9jzJnY+XSqCIaK/zdwSLwkNlfDeMlWyRShN8=";
-    })
   ];
 
   # Skip some tests:

From d5c83b4a42ce9d7e4414ab7e4dbf8c69b40fa97c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 3 Jul 2024 20:09:08 +0200
Subject: [PATCH 128/319] linux: restrict zboot to aarch64

Enabling EFI_ZBOOT fails at least the x86 builds. More compatible
platforms can be added after testing.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bb7d6334e342..282a94fe3ea8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1051,7 +1051,12 @@ let
       EFI_STUB            = yes; # EFI bootloader in the bzImage itself
       EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER =
           whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
-      EFI_ZBOOT = whenAtLeast "6.1" yes; # Generic compression support for EFI payloads
+
+      # Generic compression support for EFI payloads
+      # Add new platforms only after they have been verified to build and boot.
+      # This is unsupported on x86 due to a custom decompression mechanism.
+      EFI_ZBOOT = mkIf stdenv.hostPlatform.isAarch64 (whenAtLeast "6.1" yes);
+
       CGROUPS             = yes; # used by systemd
       FHANDLE             = yes; # used by systemd
       SECCOMP             = yes; # used by systemd >= 231

From 0a5599cda2cd2c442c27bc37d36826956245f2ab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 30 Jun 2024 17:41:39 +0200
Subject: [PATCH 129/319] =?UTF-8?q?ffado:=202.4.8=20=E2=86=92=202.4.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ffado.org/posts/ffado-2.4.9-release/
---
 pkgs/os-specific/linux/ffado/default.nix | 26 ++----------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 3c13b9604059..8c835fdaf14e 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -7,7 +7,6 @@
   dbus_cplusplus,
   desktop-file-utils,
   fetchurl,
-  fetchpatch,
   glibmm,
   libavc1394,
   libconfig,
@@ -31,7 +30,7 @@ let
 in
 mkDerivation rec {
   pname = "ffado";
-  version = "2.4.8";
+  version = "2.4.9";
 
   outputs = [
     "out"
@@ -41,7 +40,7 @@ mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.ffado.org/files/libffado-${version}.tgz";
-    hash = "sha256-0iFXYyGctOoHCdc232Ud80/wV81tiS7ItiS0uLKyq2Y=";
+    hash = "sha256-xELFL60Ryv1VE7tOhGyFHxAchIT4karFRe0ZDo/U0Q8=";
   };
 
   prePatch = ''
@@ -49,20 +48,7 @@ mkDerivation rec {
       --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
   '';
 
-  patches = [
-    # fix installing metainfo file
-    ./fix-build.patch
-
-    (fetchpatch {
-      name = "musl.patch";
-      url = "http://subversion.ffado.org/changeset?format=diff&new=2846&old=2845";
-      stripLen = 2;
-      hash = "sha256-iWeYnb5J69Uvo1lftc7MWg7WrLa+CGZyOwJPOe8/PKg=";
-    })
-  ];
-
   nativeBuildInputs = [
-    desktop-file-utils
     (scons.override { python3Packages = python311.pkgs; })
     pkg-config
     which
@@ -76,7 +62,6 @@ mkDerivation rec {
     "DEBUG=False"
     "ENABLE_ALL=True"
     "BUILD_TESTS=True"
-    "WILL_DEAL_WITH_XDG_MYSELF=True"
     "BUILD_MIXER=True"
     "UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
     "PYPKGDIR=${placeholder "out"}/${python.sitePackages}"
@@ -105,13 +90,6 @@ mkDerivation rec {
   dontWrapQtApps = true;
 
   postInstall = ''
-    desktop="$bin/share/applications/ffado-mixer.desktop"
-    install -DT -m 444 support/xdg/ffado.org-ffadomixer.desktop $desktop
-    substituteInPlace "$desktop" \
-      --replace Exec=ffado-mixer "Exec=$bin/bin/ffado-mixer" \
-      --replace hi64-apps-ffado ffado-mixer
-    install -DT -m 444 support/xdg/hi64-apps-ffado.png "$bin/share/icons/hicolor/64x64/apps/ffado-mixer.png"
-
     # prevent build tools from leaking into closure
     echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt
   '';

From f94db72728355b347c71d1823f232b01c93685ac Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 22 Apr 2024 19:56:59 +0200
Subject: [PATCH 130/319] ffado: Remove Qt dependency

This slims up `pipewire` closure.

The full package is available as `ffado-mixer`.
---
 pkgs/os-specific/linux/ffado/default.nix | 42 ++++++++++++++----------
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 8c835fdaf14e..34bb094bfae8 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -17,16 +17,21 @@
   python311,
   scons,
   which,
+  withMixer ? false,
   wrapQtAppsHook,
 }:
 
 let
-  python = python311.withPackages (
-    pkgs: with pkgs; [
-      pyqt5
-      dbus-python
-    ]
-  );
+  python =
+    if withMixer then
+      python311.withPackages (
+        pkgs: with pkgs; [
+          pyqt5
+          dbus-python
+        ]
+      )
+    else
+      python311;
 in
 mkDerivation rec {
   pname = "ffado";
@@ -48,21 +53,24 @@ mkDerivation rec {
       --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
   '';
 
-  nativeBuildInputs = [
-    (scons.override { python3Packages = python311.pkgs; })
-    pkg-config
-    which
-    python
-    python.pkgs.pyqt5
-    wrapQtAppsHook
-  ];
+  nativeBuildInputs =
+    [
+      (scons.override { python3Packages = python311.pkgs; })
+      pkg-config
+      which
+    ]
+    ++ lib.optionals withMixer [
+      python
+      python.pkgs.pyqt5
+      wrapQtAppsHook
+    ];
 
   prefixKey = "PREFIX=";
   sconsFlags = [
     "DEBUG=False"
     "ENABLE_ALL=True"
     "BUILD_TESTS=True"
-    "BUILD_MIXER=True"
+    "BUILD_MIXER=${if withMixer then "True" else "False"}"
     "UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
     "PYPKGDIR=${placeholder "out"}/${python.sitePackages}"
     "BINDIR=${placeholder "bin"}/bin"
@@ -94,8 +102,8 @@ mkDerivation rec {
     echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt
   '';
 
-  preFixup = ''
-    wrapQtApp $bin/bin/ffado-mixer
+  preFixup = lib.optionalString withMixer ''
+    wrapQtApp "$bin/bin/ffado-mixer"
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d559a0aee7b3..ecd17071b342 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26850,6 +26850,7 @@ with pkgs;
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
   ffado = libsForQt5.callPackage ../os-specific/linux/ffado { };
+  ffado-mixer = libsForQt5.callPackage ../os-specific/linux/ffado { withMixer = true; };
   libffado = ffado;
 
   fbterm = callPackage ../os-specific/linux/fbterm { };

From 343caa6c47b554fdb802d4bda759c97528afa169 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 31 May 2024 00:29:50 +0300
Subject: [PATCH 131/319] meson: add patch to find boost via pkg-config

---
 pkgs/by-name/me/meson/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 6b685d292f8b..cb5093c2caf4 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -13,6 +13,7 @@
 , python3
 , substituteAll
 , zlib
+, fetchpatch
 }:
 
 let
@@ -70,6 +71,16 @@ python3.pkgs.buildPythonApplication rec {
 
     # This edge case is explicitly part of meson but is wrong for nix
     ./007-freebsd-pkgconfig-path.patch
+
+    # Find boost via pkg-config
+    # https://github.com/NixOS/nixpkgs/issues/86131
+    # Already merged upstream PR: https://github.com/mesonbuild/meson/pull/13272
+    # FIXME: Will be in meson 1.5.0
+    (fetchpatch {
+      name = "find-boost-pkg-config.patch";
+      url = "https://github.com/mesonbuild/meson/commit/c21b886ba8a60cce7fa56e4be40bd7547129fb00.patch";
+      hash = "sha256-uSilNuSx9yd1cxs0XVLcLw4MOXEd2uIe2g+wk+SBqeU=";
+    })
   ];
 
   buildInputs = lib.optionals (python3.pythonOlder "3.9") [

From 821841dd87f4fa90c60a08f9d4e1c36130259250 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 31 May 2024 00:30:09 +0300
Subject: [PATCH 132/319] boost: add a pkg-config file

for meson
---
 pkgs/development/libraries/boost/generic.nix | 24 +++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 3db9b77bf05d..6a8b204e430d 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,6 @@
 { lib, stdenv, icu, expat, zlib, bzip2, zstd, xz, python ? null, fixDarwinDylibNames, libiconv, libxcrypt
+, makePkgconfigItem
+, copyPkgconfigItems
 , boost-build
 , fetchpatch
 , which
@@ -210,12 +212,28 @@ stdenv.mkDerivation {
     EOF
   '';
 
-  NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin
-                      "-headerpad_max_install_names";
+  env = {
+    NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names";
+    # copyPkgconfigItems will substitute these in the pkg-config file
+    includedir = "${placeholder "dev"}/include";
+    libdir = "${placeholder "out"}/lib";
+  };
+
+  pkgconfigItems = [
+    (makePkgconfigItem {
+      name = "boost";
+      inherit version;
+      # Exclude other variables not needed by meson
+      variables = {
+        includedir = "@includedir@";
+        libdir = "@libdir@";
+      };
+    })
+  ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ which boost-build ]
+  nativeBuildInputs = [ which boost-build copyPkgconfigItems ]
     ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ expat zlib bzip2 libiconv ]
     ++ lib.optional (lib.versionAtLeast version "1.69") zstd

From cde3f1cadacfe853b1afe6429300d16b15aa367b Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 23 Jun 2024 18:21:43 +0300
Subject: [PATCH 133/319] treewide: Remove now unnecessary boost vars

`meson` now finds `boost` using `pkg-config`
---
 pkgs/applications/audio/pulseeffects-legacy/default.nix | 5 -----
 pkgs/applications/misc/tuxclocker/default.nix           | 4 ----
 pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix    | 2 +-
 pkgs/by-name/tu/tuxclocker-plugins/package.nix          | 2 +-
 pkgs/development/interpreters/emilua/default.nix        | 7 -------
 pkgs/development/libraries/cairomm/1.16.nix             | 5 -----
 pkgs/development/libraries/cairomm/default.nix          | 5 -----
 pkgs/tools/package-management/lix/common.nix            | 7 -------
 8 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix
index 1fb71e05d2f2..744b5f0cd4ce 100644
--- a/pkgs/applications/audio/pulseeffects-legacy/default.nix
+++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix
@@ -99,11 +99,6 @@ in stdenv.mkDerivation rec {
     )
   '';
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   meta = with lib; {
     description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
     mainProgram = "pulseeffects";
diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix
index 7a47e571cee0..8f1cdde3d703 100644
--- a/pkgs/applications/misc/tuxclocker/default.nix
+++ b/pkgs/applications/misc/tuxclocker/default.nix
@@ -27,10 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0=";
   };
 
-  # Meson doesn't find boost without these
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   nativeBuildInputs = [
     git
     makeWrapper
diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
index b783953acd93..714eb8752a4c 100644
--- a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
+++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
@@ -11,7 +11,7 @@
 stdenv.mkDerivation {
   pname = "tuxclocker-nvidia-plugin";
 
-  inherit (tuxclocker-plugins) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR nativeBuildInputs;
+  inherit (tuxclocker-plugins) src version meta nativeBuildInputs;
 
   buildInputs = [
     boost
diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix
index 12deedd5c56f..0504b163f7c9 100644
--- a/pkgs/by-name/tu/tuxclocker-plugins/package.nix
+++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation {
-  inherit (tuxclocker) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR;
+  inherit (tuxclocker) src version meta;
 
   pname = "tuxclocker-plugins";
 
diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix
index 396164b14a89..4ef35441d344 100644
--- a/pkgs/development/interpreters/emilua/default.nix
+++ b/pkgs/development/interpreters/emilua/default.nix
@@ -71,13 +71,6 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  env = {
-    BOOST_INCLUDEDIR = "${lib.getDev boost182}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib";
-  };
-
   mesonFlags = [
     (lib.mesonBool "enable_file_io" true)
     (lib.mesonBool "enable_io_uring" true)
diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix
index 9da00741c34e..83428f0fef9b 100644
--- a/pkgs/development/libraries/cairomm/1.16.nix
+++ b/pkgs/development/libraries/cairomm/1.16.nix
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
     "-Dbuild-tests=true"
   ];
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   # Tests fail on Darwin, possibly because of sandboxing.
   doCheck = !stdenv.isDarwin;
 
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index d8d908cbc40d..957cfa26ac73 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
     "-Dbuild-tests=true"
   ];
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix
index 8c89cf9fefda..b01b381d1491 100644
--- a/pkgs/tools/package-management/lix/common.nix
+++ b/pkgs/tools/package-management/lix/common.nix
@@ -203,13 +203,6 @@ stdenv.mkDerivation {
       (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
     ];
 
-  # Needed for Meson to find Boost.
-  # https://github.com/NixOS/nixpkgs/issues/86131.
-  env = {
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   postInstall =
     ''
       mkdir -p $doc/nix-support

From d0eebe82f63b05fd6fb4061d0d51720cd427936d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 4 Jul 2024 11:40:41 +0200
Subject: [PATCH 134/319] bluez: fix hid devices

---
 pkgs/by-name/bl/bluez/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index 09e36c8dd027..1a459bba189b 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -5,6 +5,7 @@
 , docutils
 , ell
 , enableExperimental ? false
+, fetchpatch
 , fetchurl
 , glib
 , json_c
@@ -25,10 +26,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM=";
   };
 
-  patches =
+  patches = [
+    # hog-lib: Fix passing wrong parameters to bt_uhid_get_report_reply
+    (fetchpatch {
+      url = "https://github.com/bluez/bluez/commit/5ebaeab4164f80539904b9a520d9b7a8307e06e2.patch";
+      hash = "sha256-f1A8DmRPfm+zid4XMj1zsfcLZ0WTEax3YPbydKZF9RE=";
+    })
+  ]
     # Disable one failing test with musl libc, also seen by alpine
     # https://github.com/bluez/bluez/issues/726
-    lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
+    ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
       (fetchurl {
         url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
         hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";

From f0769acc65ac7c4085d757cfde2e0667bff79956 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 4 Jul 2024 10:54:12 +0100
Subject: [PATCH 135/319] s2n-tls: 1.4.16 -> 1.4.17 (#314094)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/development/libraries/s2n-tls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix
index d4a440e587c1..73148c5069af 100644
--- a/pkgs/development/libraries/s2n-tls/default.nix
+++ b/pkgs/development/libraries/s2n-tls/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.4.16";
+  version = "1.4.17";
 
   src = fetchFromGitHub {
     owner = "aws";
-    repo = pname;
+    repo = "s2n-tls";
     rev = "v${version}";
-    hash = "sha256-HkpOd05/5YIDsBm4L3hLuI0obm7uAwsV1dC2/e2f5aw=";
+    hash = "sha256-Go6p+6VidsoN7IMfBp7BMGnIcttaEA0q3CRAKDO5b+c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 399840962e3290e870e4deb2ee6677d51812f0cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 4 Jul 2024 13:29:27 +0200
Subject: [PATCH 136/319] p11-kit: 0.25.3 -> 0.25.5

https://github.com/p11-glue/p11-kit/raw/0.25.5/NEWS
---
 pkgs/development/libraries/p11-kit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 32ee1dced38e..b520c7087ba7 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p11-kit";
-  version = "0.25.3";
+  version = "0.25.5";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = pname;
     rev = version;
-    hash = "sha256-zIbkw0pwt4TdyjncnSDeTN6Gsx7cc+x7Un4rnagZxQk=";
+    hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc=";
     fetchSubmodules = true;
   };
 

From 87327df1061ee068d2a1d1b2d8bd72a68e010cc5 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 4 Jul 2024 15:37:37 +0200
Subject: [PATCH 137/319] nodejs_22: 22.3.0 -> 22.4.0 (#323982)

---
 pkgs/development/web/nodejs/v22.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 4bc7c46c15ba..a849618e48bb 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -8,19 +8,13 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.3.0";
-  sha256 = "0k0h4s9s2y0ms3g6xhynsqsrkl9hz001dmj6j0gpc5x5vk8mpf5z";
+  version = "22.4.0";
+  sha256 = "sha256-KStDAITy8ykT3H2k6y+8iWklJ3Kp0b/ormxLSpjKOtM=";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
-    (fetchpatch2 {
-      # Fixes OpenSSL 3.0.14 compatibility in tests.
-      # See https://github.com/nodejs/node/pull/53373
-      url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch";
-      hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo=";
-    })
   ];
 }

From 8f413d8a44d713dc9cff2ad1e4bcc248a7961fa3 Mon Sep 17 00:00:00 2001
From: "Travis A. Everett" <travis.a.everett@gmail.com>
Date: Tue, 16 Apr 2024 11:58:38 -0500
Subject: [PATCH 138/319] binlore: migrate override lore to package passthru

Lore overrides have been included with binlore's source up to now, but
this hasn't worked very well. (It isn't as easy to self-service for
people working in nixpkgs, and its use of partial pnames for matching
breaks down around some edge cases like version numbers appearing
early in perl pnames, or multiple packages having identical pnames.)
---
 pkgs/by-name/pd/pdf2odt/package.nix           |   4 +
 .../libraries/libarchive/default.nix          |  10 ++
 .../development/libraries/ncurses/default.nix |  12 ++
 .../tools/analysis/binlore/default.nix        | 165 +++++++++++++++---
 .../linux/nixos-rebuild/default.nix           |   9 +
 pkgs/os-specific/linux/procps-ng/default.nix  |   9 +
 pkgs/tools/misc/coreutils/default.nix         |  24 ++-
 pkgs/tools/misc/linuxquota/default.nix        |   6 +-
 .../tools/nix/nixos-install-tools/default.nix |   7 +
 pkgs/tools/text/esh/default.nix               |  10 +-
 pkgs/top-level/unixtools.nix                  |  35 +++-
 11 files changed, 259 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/pd/pdf2odt/package.nix b/pkgs/by-name/pd/pdf2odt/package.nix
index eb748da0842b..809af8919343 100644
--- a/pkgs/by-name/pd/pdf2odt/package.nix
+++ b/pkgs/by-name/pd/pdf2odt/package.nix
@@ -49,6 +49,10 @@ resholve.mkDerivation rec {
       imagemagick
       zip
     ];
+    execer = [
+      # zip can exec; confirmed 2 invocations in pdf2odt don't
+      "cannot:${zip}/bin/zip"
+    ];
   };
 
   meta = with lib; {
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 5e37255d235b..09a96e829e33 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -23,6 +23,9 @@
 , cmake
 , nix
 , samba
+
+# for passthru.lore
+, binlore
 }:
 
 assert xarSupport -> libxml2 != null;
@@ -125,4 +128,11 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests = {
     inherit cmake nix samba;
   };
+
+  # bsdtar is detected as "cannot" because its exec is internal to
+  # calls it makes into libarchive itself. If binlore gains support
+  # for detecting another layer down into libraries, this can be cut.
+  passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage ''
+    execer can bin/bsdtar
+  '';
 })
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 85bf4bee634e..95b427a7bad3 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -11,6 +11,7 @@
 , mouseSupport ? false, gpm
 , unicodeSupport ? true
 , testers
+, binlore
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -180,6 +181,17 @@ stdenv.mkDerivation (finalAttrs: {
     rm "$out"/lib/*.a
   '';
 
+  # I'm not very familiar with ncurses, but it looks like most of the
+  # exec here will run hard-coded executables. There's one that is
+  # dynamic, but it looks like it only comes from executing a terminfo
+  # file, so I think it isn't going to be under user control via CLI?
+  # Happy to have someone help nail this down in either direction!
+  # The "capability" is 'iprog', and I could only find 1 real example:
+  # https://invisible-island.net/ncurses/terminfo.ti.html#tic-linux-s
+  passthru.binlore.out = binlore.synthesize ncurses ''
+    execer cannot bin/{reset,tput,tset}
+  '';
+
   meta = with lib; {
     homepage = "https://www.gnu.org/software/ncurses/";
     description = "Free software emulation of curses in SVR4 and more";
diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix
index f8a88b4ce679..53a024766576 100644
--- a/pkgs/development/tools/analysis/binlore/default.nix
+++ b/pkgs/development/tools/analysis/binlore/default.nix
@@ -56,58 +56,169 @@ let
     #   in here, but I'm erring on the side of flexibility
     #   since this form will make it easier to pilot other
     #   uses of binlore.
-    callback = lore: drv: overrides: ''
+    callback = lore: drv: ''
       if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then
         echo generating binlore for $drv by running:
         echo "${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}"
       else
         echo "failed to generate binlore for $drv (none of ${drv}/{bin,lib,libexec} exist)"
       fi
-    '' +
-    /*
-    Override lore for some packages. Unsure, but for now:
-    1. start with the ~name (pname-version)
-    2. remove characters from the end until we find a match
-       in overrides/
-    3. execute the override script with the list of expected
-       lore types
-    */
-    ''
-      i=''${#identifier}
-      filter=
-      while [[ $i > 0 ]] && [[ -z "$filter" ]]; do
-        if [[ -f "${overrides}/''${identifier:0:$i}" ]]; then
-          filter="${overrides}/''${identifier:0:$i}"
-          echo using "${overrides}/''${identifier:0:$i}" to generate overriden binlore for $drv
-          break
-        fi
-        ((i--)) || true # don't break build
-      done # || true # don't break build
+
       if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then
-        ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback} "$filter"
+        ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}
       fi
     '';
   };
-  overrides = (src + "/overrides");
 
 in rec {
+  /*
+    Output a directory containing lore for multiple drvs.
+
+    This will `make` lore for drv in drvs and then combine lore
+    of the same type across all packages into a single file.
+
+    When drvs are also specified in the strip argument, corresponding
+    lore is made relative by stripping the path of each drv from
+    matching entries. (This is mainly useful in a build process that
+    uses a chain of two or more derivations where the output of one
+    is the source for the next. See resholve for an example.)
+  */
   collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } ''
     mkdir $out
     for lorefile in ${toString lore.types}; do
       cat ${lib.concatMapStrings (x: x + "/$lorefile ") (map (make lore) (map lib.getBin (builtins.filter lib.isDerivation drvs)))} > $out/$lorefile
-      substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace '${x}/' '' ") strip}
+      substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace-quiet '${x}/' '' ") strip}
     done
   '');
-  # TODO: echo for debug, can be removed at some point
+
+  /*
+    Output a directory containing lore for a single drv.
+
+    This produces lore for the derivation (via lore.callback) and
+    appends any lore that the derivation itself wrote to nix-support
+    or which was overridden in drv.binlore.<outputName> (passthru).
+
+    > *Note*: Since the passthru is attached to all outputs, binlore
+    > is an attrset namespaced by outputName to support packages with
+    > executables in more than one output.
+
+    Since the last entry wins, the effective priority is:
+    drv.binlore.<outputName> > $drv/nix-support > lore generated here by callback
+  */
   make = lore: drv: runCommand "${drv.name}-binlore" {
-      identifier = drv.name;
       drv = drv;
     } (''
     mkdir $out
     touch $out/{${builtins.concatStringsSep "," lore.types}}
 
-    ${lore.callback lore drv overrides}
+    ${lore.callback lore drv}
+    '' +
+    # append lore from package's $out and drv.binlore.${drv.outputName} (last entry wins)
+    ''
+    for lore_type in ${builtins.toString lore.types}; do
+      if [[ -f "${drv}/nix-support/$lore_type" ]]; then
+        cat "${drv}/nix-support/$lore_type" >> "$out/$lore_type"
+      fi
+      '' + lib.optionalString (builtins.hasAttr "binlore" drv && builtins.hasAttr drv.outputName drv.binlore) ''
+      if [[ -f "${drv.binlore."${drv.outputName}"}/$lore_type" ]]; then
+        cat "${drv.binlore."${drv.outputName}"}/$lore_type" >> "$out/$lore_type"
+      fi
+      '' + ''
+    done
 
     echo binlore for $drv written to $out
   '');
+
+  /*
+    Utility function for creating override lore for drv.
+
+    We normally attach this lore to `drv.passthru.binlore.<outputName>`.
+
+    > *Notes*:
+    > - Since the passthru is attached to all outputs, binlore is an
+    >   attrset namespaced by outputName to support packages with
+    >   executables in more than one output. You'll generally just use
+    >   `out` or `bin`.
+    > - We can reconsider the passthru attr name if someone adds
+    >   a new lore provider. We settled on `.binlore` for now to make it
+    >   easier for people to figure out what this is for.
+
+    The lore argument should be a Shell script (string) that generates
+    the necessary lore. You can use arbitrary Shell, but this function
+    includes a shell DSL you can use to declare/generate lore in most
+    cases. It has the following functions:
+
+    - `execer <verdict> [<path>...]`
+    - `wrapper <wrapper_path> <original_path>`
+
+    Writing every override explicitly in a Nix list would be tedious
+    for large packages, but this small shell DSL enables us to express
+    many overrides efficiently via pathname expansion/globbing.
+
+    Here's a very general example of both functions:
+
+    passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage ''
+      execer can bin/hello bin/{a,b,c}
+      wrapper bin/hello bin/.hello-wrapped
+    '';
+
+    And here's a specific example of how pathname expansion enables us
+    to express lore for the single-binary variant of coreutils while
+    being both explicit and (somewhat) efficient:
+
+    passthru = {} // optionalAttrs (singleBinary != false) {
+      binlore.out = binlore.synthesize coreutils ''
+        execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
+        execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
+      '';
+    };
+
+    Caution: Be thoughtful about using a bare wildcard (*) glob here.
+    We should generally override lore only when a human understands if
+    the executable will exec arbitrary user-passed executables. A bare
+    glob can match new executables added in future package versions
+    before anyone can audit them.
+  */
+  synthesize = drv: loreSynthesizingScript: runCommand "${drv.name}-lore-override" {
+    drv = drv;
+  } (''
+    execer(){
+      local verdict="$1"
+
+      shift
+
+      for path in "$@"; do
+        if [[ -f "$PWD/$path" ]]; then
+          echo "$verdict:$PWD/$path"
+        else
+          echo "error: Tried to synthesize execer lore for missing file: $PWD/$path" >&2
+          exit 2
+        fi
+      done
+    } >> $out/execers
+
+    wrapper(){
+      local wrapper="$1"
+      local original="$2"
+
+      if [[ ! -f "$wrapper" ]]; then
+        echo "error: Tried to synthesize wrapper lore for missing wrapper: $PWD/$wrapper" >&2
+        exit 2
+      fi
+
+      if [[ ! -f "$original" ]]; then
+        echo "error: Tried to synthesize wrapper lore for missing original: $PWD/$original" >&2
+        exit 2
+      fi
+
+      echo "$PWD/$wrapper:$PWD/$original"
+
+    } >> $out/wrappers
+
+    mkdir $out
+
+    # lore override commands are relative to the drv root
+    cd $drv
+
+  '' + loreSynthesizingScript);
 }
diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix
index 63f8c92e2327..12c5856edb26 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/default.nix
+++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix
@@ -10,6 +10,8 @@
 , lib
 , nixosTests
 , installShellFiles
+, binlore
+, nixos-rebuild
 }:
 let
   fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
@@ -49,6 +51,13 @@ substitute {
     target-host = nixosTests.nixos-rebuild-target-host;
   };
 
+  # nixos-rebuild can’t execute its arguments
+  # (but it can run ssh with the with the options stored in $NIX_SSHOPTS,
+  # and ssh can execute its arguments...)
+  passthru.binlore.out = binlore.synthesize nixos-rebuild ''
+    execer cannot bin/nixos-rebuild
+  '';
+
   meta = {
     description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild";
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 70df91d31eee..da2c80934172 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -15,6 +15,9 @@
   # exception is ‘watch’ which is portable enough to run on pretty much
   # any UNIX-compatible system.
 , watchOnly ? !(stdenv.isLinux || stdenv.isCygwin)
+
+, binlore
+, procps
 }:
 
 stdenv.mkDerivation rec {
@@ -61,6 +64,12 @@ stdenv.mkDerivation rec {
     install -m 0644 -D watch.1 $out/share/man/man1/watch.1
   '';
 
+  # no obvious exec in documented arguments; haven't trawled source
+  # to figure out what exec binlore hits on
+  passthru.binlore.out = binlore.synthesize procps ''
+    execer cannot bin/{ps,top,free}
+  '';
+
   meta = with lib; {
     homepage = "https://gitlab.com/procps-ng/procps";
     description = "Utilities that give information about processes using the /proc filesystem";
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8e051b798f33..0e11363b8210 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -7,6 +7,8 @@
 , perl
 , texinfo
 , xz
+, binlore
+, coreutils
 , gmpSupport ? true, gmp
 , aclSupport ? stdenv.isLinux, acl
 , attrSupport ? stdenv.isLinux, attr
@@ -27,7 +29,7 @@ assert aclSupport -> acl != null;
 assert selinuxSupport -> libselinux != null && libsepol != null;
 
 let
-  inherit (lib) concatStringsSep isString optional optionals optionalString;
+  inherit (lib) concatStringsSep isString optional optionalAttrs optionals optionalString;
   isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
 in
 stdenv.mkDerivation rec {
@@ -181,6 +183,26 @@ stdenv.mkDerivation rec {
     rm -r "$out/share"
   '';
 
+  passthru = {} // optionalAttrs (singleBinary != false) {
+    # everything in the single binary gets the same verdict, so we
+    # override _that case_ with verdicts from separate binaries.
+    #
+    # binlore only spots exec in runcon on some platforms (i.e., not
+    # darwin; see comment on inverse case below)
+    binlore.out = binlore.synthesize coreutils ''
+      execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
+      execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
+    '';
+  } // optionalAttrs (singleBinary == false) {
+    # binlore only spots exec in runcon on some platforms (i.e., not
+    # darwin; I have a note that the behavior may need selinux?).
+    # hard-set it so people working on macOS don't miss cases of
+    # runcon until ofBorg fails.
+    binlore.out = binlore.synthesize coreutils ''
+      execer can bin/runcon
+    '';
+  };
+
   meta = with lib; {
     homepage = "https://www.gnu.org/software/coreutils/";
     description = "GNU Core Utilities";
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix
index 65e5646e6a7d..d9aa6492b581 100644
--- a/pkgs/tools/misc/linuxquota/default.nix
+++ b/pkgs/tools/misc/linuxquota/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }:
+{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config, binlore, linuxquota }:
 
 stdenv.mkDerivation rec {
   version = "4.09";
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ e2fsprogs openldap ];
 
+  passthru.binlore.out = binlore.synthesize linuxquota ''
+    execer cannot bin/quota
+  '';
+
   meta = with lib; {
     description = "Tools to manage kernel-level quotas in Linux";
     homepage = "https://sourceforge.net/projects/linuxquota/";
diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix
index e0b24a4e70dd..6e98df7890a5 100644
--- a/pkgs/tools/nix/nixos-install-tools/default.nix
+++ b/pkgs/tools/nix/nixos-install-tools/default.nix
@@ -8,6 +8,7 @@
   nixos-install-tools,
   runCommand,
   nixosTests,
+  binlore,
 }:
 let
   inherit (nixos {}) config;
@@ -62,6 +63,12 @@ in
       touch $out
     '';
   };
+
+  # no documented flags show signs of exec; skim of source suggests
+  # it's just --help execing man
+  passthru.binlore.out = binlore.synthesize nixos-install-tools ''
+    execer cannot bin/nixos-generate-config
+  '';
 }).overrideAttrs {
   inherit version;
   pname = "nixos-install-tools";
diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix
index abbeb29234da..2b7b2a427f6b 100644
--- a/pkgs/tools/text/esh/default.nix
+++ b/pkgs/tools/text/esh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }:
+{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell, binlore, esh }:
 
 stdenv.mkDerivation rec {
   pname = "esh";
@@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
+  # working around a bug in file. Was fixed in
+  # file 5.41-5.43 but regressed in 5.44+
+  # see https://bugs.astron.com/view.php?id=276
+  # "can" verdict because of `-s SHELL` arg
+  passthru.binlore.out = binlore.synthesize esh ''
+    execer can bin/esh
+  '';
+
   meta = with lib; {
     description = "Simple templating engine based on shell";
     mainProgram = "esh";
diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index 428a37363d7e..959d87d5864d 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -1,4 +1,4 @@
-{ pkgs, buildEnv, runCommand, lib, stdenv, freebsd }:
+{ pkgs, buildEnv, runCommand, lib, stdenv, freebsd, binlore }:
 
 # These are some unix tools that are commonly included in the /usr/bin
 # and /usr/sbin directory under more normal distributions. Along with
@@ -30,7 +30,9 @@ let
         priority = 10;
         platforms = platforms.${stdenv.hostPlatform.parsed.kernel.name} or platforms.all;
       };
-      passthru = { inherit provider; };
+      passthru = { inherit provider; } // lib.optionalAttrs (builtins.hasAttr "binlore" providers) {
+        binlore.out = (binlore.synthesize (getBin bins.${cmd}) providers.binlore);
+      };
       preferLocalBuild = true;
     } ''
       if ! [ -x ${bin} ]; then
@@ -76,6 +78,10 @@ let
       linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc
               else pkgs.netbsd.getconf;
       darwin = pkgs.darwin.system_cmds;
+      # I don't see any obvious arg exec in the doc/manpage
+      binlore = ''
+        execer cannot bin/getconf
+      '';
     };
     getent = {
       linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent
@@ -118,6 +124,11 @@ let
       linux = pkgs.glibc;
       darwin = pkgs.darwin.adv_cmds;
       freebsd = pkgs.freebsd.locale;
+      # technically just targeting glibc version
+      # no obvious exec in manpage
+      binlore = ''
+        execer cannot bin/locale
+      '';
     };
     logger = {
       linux = pkgs.util-linux;
@@ -130,6 +141,13 @@ let
       linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
       freebsd = freebsd.mount;
+      # technically just targeting the darwin version; binlore already
+      # ids the util-linux copy as 'cannot'
+      # no obvious exec in manpage args; I think binlore flags 'can'
+      # on the code to run `mount_<filesystem>` variants
+      binlore = ''
+        execer cannot bin/mount
+      '';
     };
     netstat = {
       linux = pkgs.nettools;
@@ -145,6 +163,12 @@ let
       linux = pkgs.procps;
       darwin = pkgs.darwin.ps;
       freebsd = pkgs.freebsd.bin;
+      # technically just targeting procps ps (which ids as can)
+      # but I don't see obvious exec in args; have yet to look
+      # for underlying cause in source
+      binlore = ''
+        execer cannot bin/ps
+      '';
     };
     quota = {
       linux = pkgs.linuxquota;
@@ -168,6 +192,13 @@ let
       linux = pkgs.procps;
       darwin = pkgs.darwin.top;
       freebsd = pkgs.freebsd.top;
+      # technically just targeting procps top; haven't needed this in
+      # any scripts so far, but overriding it for consistency with ps
+      # override above and in procps. (procps also overrides 'free',
+      # but it isn't included here.)
+      binlore = ''
+        execer cannot bin/top
+      '';
     };
     umount = {
       linux = pkgs.util-linux;

From befa36d8b0dbb12461bd9ef7ca29f936ab8a7123 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 5 Jul 2024 01:51:48 +0200
Subject: [PATCH 139/319] llvmPackages: 17.0.6 -> 18.1.5 on Linux (#312981)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfe83ba9ead8..5a2a5c8daf22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16132,7 +16132,7 @@ with pkgs;
       else if platform.isFreeBSD then 16
       else if platform.isOpenBSD then 18
       else if platform.isAndroid then 12
-      else if platform.isLinux then 17
+      else if platform.isLinux then 18
       else if platform.isWasm then 16
       # For unknown systems, assume the latest version is required.
       else 18;

From 9e54afc0aab1ee5462b033fc3351e703aa163995 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Feb 2024 03:06:12 +0000
Subject: [PATCH 140/319] libunistring: 1.1 -> 1.2

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

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index e865873c2851..f768434fce4b 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libunistring";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz";
-    sha256 = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o=";
+    sha256 = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4=";
   };
 
   outputs = [ "out" "dev" "info" "doc" ];

From 963c56ce6fb9c7fb4697eef301bdc14acf30a06b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 4 Jul 2024 23:46:30 +0530
Subject: [PATCH 141/319] libunistring: rec -> finalAttrs, nixfmt-rfc-style

---
 .../libraries/libunistring/default.nix        | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index f768434fce4b..f36e1554636c 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,42 +1,52 @@
-{ fetchurl, lib, stdenv, libiconv, updateAutotoolsGnuConfigScriptsHook }:
+{
+  fetchurl,
+  lib,
+  stdenv,
+  libiconv,
+  updateAutotoolsGnuConfigScriptsHook,
+}:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libunistring";
   version = "1.2";
 
   src = fetchurl {
-    url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz";
-    sha256 = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4=";
+    url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
+    hash = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4=";
   };
 
-  outputs = [ "out" "dev" "info" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "info"
+    "doc"
+  ];
 
   strictDeps = true;
   propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
-  configureFlags = [
-    "--with-libiconv-prefix=${libiconv}"
-  ];
+  configureFlags = [ "--with-libiconv-prefix=${libiconv}" ];
 
   doCheck = false;
 
-  /* This seems to cause several random failures like these, which I assume
-     is because of bad or missing target dependencies in their build system:
+  /*
+    This seems to cause several random failures like these, which I assume
+    is because of bad or missing target dependencies in their build system:
 
-        ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
-        FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
+      ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+      FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
 
-        FAIL: unistdio/test-u16-vasnprintf3.sh
-        ======================================
+      FAIL: unistdio/test-u16-vasnprintf3.sh
+      ======================================
 
-        ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
-        FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
+      ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+      FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
   */
   enableParallelChecking = false;
   enableParallelBuilding = true;
@@ -72,4 +82,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})

From 19b834e17fc9189ea94d02a6c4a63818c93d8528 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 4 Jul 2024 23:48:33 +0530
Subject: [PATCH 142/319] libunistring: fix build on darwin

Co-authored-by: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
---
 pkgs/development/libraries/libunistring/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index f36e1554636c..8876c3292f90 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -4,6 +4,7 @@
   stdenv,
   libiconv,
   updateAutotoolsGnuConfigScriptsHook,
+  darwin
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -29,6 +30,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
   propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk_11_0.frameworks.CoreServices
+  ];
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
   configureFlags = [ "--with-libiconv-prefix=${libiconv}" ];

From e2254dbadf909ce97a0c1aedeaec45a39fd08d32 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 5 Jul 2024 11:13:49 +0200
Subject: [PATCH 143/319] gpgme: patch out LFS64 usage (#324771)

Needed for compatibility with musl 1.2.4+.

Link: https://github.com/NixOS/nixpkgs/pull/229439
---
 pkgs/development/libraries/gpgme/LFS64.patch | 34 ++++++++++++++++++++
 pkgs/development/libraries/gpgme/default.nix |  3 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/gpgme/LFS64.patch

diff --git a/pkgs/development/libraries/gpgme/LFS64.patch b/pkgs/development/libraries/gpgme/LFS64.patch
new file mode 100644
index 000000000000..8aaed815d386
--- /dev/null
+++ b/pkgs/development/libraries/gpgme/LFS64.patch
@@ -0,0 +1,34 @@
+From 1726e0a0a3b9765a4ddf99c506178d3939a46ccd Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Fri, 3 May 2024 13:39:26 +0200
+Subject: [PATCH] posix: don't use LFS64 types in struct linux_dirent64
+
+The *64_t types are transitional APIs for applications that do not yet
+fully support large files on 32-bit platforms.  They have been removed
+in musl 1.2.5, which caused gpgme to fail to build.  Since this is for
+a raw syscall anyway, it doesn't make sense to use libc-specific types
+here anyway, so I've changed this to match the definition of the
+struct used in the kernel (except there the kernel-specific u64 and
+s64 typedefs are used instead).
+---
+ src/posix-io.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/posix-io.c b/src/posix-io.c
+index a422d8f6..c943f75c 100644
+--- a/src/posix-io.c
++++ b/src/posix-io.c
+@@ -74,8 +74,8 @@
+  * define it ourselves.  */
+ struct linux_dirent64
+ {
+-  ino64_t d_ino;
+-  off64_t d_off;
++  uint64_t d_ino;
++  int64_t d_off;
+   unsigned short d_reclen;
+   unsigned char d_type;
+   char d_name[];
+-- 
+2.44.0
+
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index c712b5195dc5..395ccfde0632 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
     ./python-310-312-remove-distutils.patch
     # Fix a test after disallowing compressed signatures in gpg (PR #180336)
     ./test_t-verify_double-plaintext.patch
+    # Don't use deprecated LFS64 APIs (removed in musl 1.2.4)
+    # https://dev.gnupg.org/D600
+    ./LFS64.patch
   ];
 
   postPatch = ''

From 4dec9be42a2e1589874956221e6e976b23bd7954 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Fri, 5 Jul 2024 20:29:51 +0300
Subject: [PATCH 144/319] buildRubyGem: do not override fixupPhase (#323587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Oops, looks like we were overriding stdenv’s fixupPhase that runs
fixupOutputHooks, including patchShebangsAuto.
---
 pkgs/development/ruby-modules/gem/default.nix | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix
index c5d174fab395..b2bb43736657 100644
--- a/pkgs/development/ruby-modules/gem/default.nix
+++ b/pkgs/development/ruby-modules/gem/default.nix
@@ -251,19 +251,15 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
     done
     ''}
 
-    runHook postInstall
-  '';
-
-  # For Ruby-generated binstubs, shebang paths are already in Nix store but for
-  # ruby used to build the package. Update them to match the host system. Note
-  # that patchShebangsAuto ignores scripts where shebang line is already in Nix
-  # store.
-  fixupPhase = attrs.fixupPhase or ''
-    runHook preFixup
-    if [[ -d $out/${ruby.gemPath}/bin ]]; then
-      patchShebangs --update --host $out/${ruby.gemPath}/bin
+    # For Ruby-generated binstubs, shebang paths are already in Nix store but for
+    # ruby used to build the package. Update them to match the host system. Note
+    # that patchShebangsAuto ignores scripts where shebang line is already in Nix
+    # store.
+    if [[ -d $GEM_HOME/bin ]]; then
+      patchShebangs --update --host -- "$GEM_HOME"/bin
     fi
-    runHook postFixup
+
+    runHook postInstall
   '';
 
   propagatedBuildInputs = gemPath ++ propagatedBuildInputs;

From d976a67189123a259d08093b6ff353a8f49696cf Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 5 Jul 2024 16:42:55 -0400
Subject: [PATCH 145/319] zsh: fix compatibility with texinfo 7.1

https://www.zsh.org/mla/workers/2023/msg00591.html
---
 pkgs/shells/zsh/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index c04d4d4bd672..ac8d3aa9a736 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -39,6 +39,12 @@ stdenv.mkDerivation {
       hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU=";
       excludes = [ "ChangeLog" ];
     })
+    # Fixes compatibility with texinfo 7.1. This patch can be dropped with the next release of zsh.
+    (fetchpatch {
+      url = "https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.patch";
+      hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8=";
+      excludes = [ "ChangeLog" ];
+    })
   ];
 
   strictDeps = true;

From 21ad4b3a71f6dd460fae07fe04090039f91c53bf Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 13 Jun 2024 22:13:31 +0100
Subject: [PATCH 146/319] shadow: 4.14.6 -> 4.16.0

Changes:
- https://github.com/shadow-maint/shadow/releases/tag/4.14.7
- https://github.com/shadow-maint/shadow/releases/tag/4.15.0
- https://github.com/shadow-maint/shadow/releases/tag/4.15.1
- https://github.com/shadow-maint/shadow/releases/tag/4.15.2
- https://github.com/shadow-maint/shadow/releases/tag/4.15.3
- https://github.com/shadow-maint/shadow/releases/tag/4.16.0
---
 pkgs/os-specific/linux/shadow/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 8329e9e8f966..98cb0c061ef5 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchFromGitHub
 , runtimeShell, nixosTests
 , autoreconfHook, bison, flex
 , docbook_xml_dtd_45, docbook_xsl
@@ -17,13 +17,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "shadow";
-  version = "4.14.6";
+  version = "4.16.0";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = pname;
     rev = version;
-    hash = "sha256-+klU1a0cSgHPwZkDnbCSjKnBUKIm2Z3OGUvR/zrqQxo=";
+    hash = "sha256-GAwwpyIN5qWSIapjGFfOxPbOx5G6//fEbTpPmkXh6uA=";
   };
 
   outputs = [ "out" "su" "dev" "man" ];
@@ -47,13 +47,6 @@ stdenv.mkDerivation rec {
     ./respect-xml-catalog-files-var.patch
     ./runtime-shell.patch
     ./fix-install-with-tcb.patch
-    # Fix build against `clang-16` and upcoming `gcc-14`:
-    #   https://github.com/shadow-maint/shadow/pull/857
-    (fetchpatch {
-      name = "fix-implicit-getdef_bool.patch";
-      url = "https://github.com/shadow-maint/shadow/commit/5abe0811b880208600f646356549b7e5cad89060.patch";
-      hash = "sha256-XqvVv8mYY58uXJBKRwncHQRSI45PUkp3dQNn44gzezU=";
-    })
   ];
 
   # The nix daemon often forbids even creating set[ug]id files.

From e99754e3a456c0248e15e35d26850a5e180ca5d1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 6 Jul 2024 07:15:30 +0100
Subject: [PATCH 147/319] hwdata: 0.383 -> 0.384

Changes: https://github.com/vcrhonek/hwdata/compare/v0.383...v0.384
---
 pkgs/os-specific/linux/hwdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 484e63bb357c..81cf885dca86 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwdata";
-  version = "0.383";
+  version = "0.384";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    hash = "sha256-jYD1/sl9ffe+lmrICLe32NU1u0Hi7ZfZrD4zWH+bxsk=";
+    hash = "sha256-FuqjvJ0Jtz4hl7fBPXAkz8fGRXkHN8mnZZ3owdzfrnE=";
   };
 
   configureFlags = [ "--datadir=${placeholder "out"}/share" ];

From 83aaf6183611b2816a35d3d437eb99177d43378f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 16 Jun 2024 15:21:02 +0200
Subject: [PATCH 148/319] cargo,clippy,rustc,rustfmt: 1.78.0 -> 1.79.0

For the first time, it seems that no new kernel patch is required!
---
 .../compilers/rust/{1_78.nix => 1_79.nix}     | 32 +++++++++----------
 pkgs/top-level/all-packages.nix               |  8 ++---
 2 files changed, 20 insertions(+), 20 deletions(-)
 rename pkgs/development/compilers/rust/{1_78.nix => 1_79.nix} (55%)

diff --git a/pkgs/development/compilers/rust/1_78.nix b/pkgs/development/compilers/rust/1_79.nix
similarity index 55%
rename from pkgs/development/compilers/rust/1_78.nix
rename to pkgs/development/compilers/rust/1_79.nix
index d81e964fb745..a749e58c16bc 100644
--- a/pkgs/development/compilers/rust/1_78.nix
+++ b/pkgs/development/compilers/rust/1_79.nix
@@ -19,8 +19,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.78.0";
-  rustcSha256 = "/1RII6XLJ/JzgShXfx5+AO6PTIPyo0h4GuT8NV6R1ak=";
+  rustcVersion = "1.79.0";
+  rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA=";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
@@ -34,25 +34,25 @@ import ./default.nix {
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.77.2";
+  bootstrapVersion = "1.78.0";
 
   # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "168e653fbc30b3a80801bc7735a79ff644651618434234959925f669bf77d1a2";
-    x86_64-unknown-linux-gnu = "b7d12b1b162c36c1fd5234b4b16856aa7eafca91d17c49787f6487cb26f4062d";
-    x86_64-unknown-linux-musl = "2e08fe23c4837a780a40ebfac601760cd6297581d21eae2f88cb59060243a375";
-    arm-unknown-linux-gnueabihf = "9f14a31dbef0153c0a7463a79cf8f9e8295b355354de41aa054953027beb70d7";
-    armv7-unknown-linux-gnueabihf = "b37649399081228244b3ff3acc6047f6c138e602c721cd500efe43715d043c5e";
-    aarch64-unknown-linux-gnu = "297c6201edd42e580f242fcd75b521b0392f6f3be02cf03ca76690fece4a74da";
-    aarch64-unknown-linux-musl = "fdd9c485f93c73a085c113b4f0fbad0989f79153079d394ec4bbac2b3804f71b";
-    x86_64-apple-darwin = "16bbbfcf0c982b35271d8904977d80fda1bb7caa7f898abceed3569a867d9cea";
-    aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7";
-    powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19";
-    riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648";
-    x86_64-unknown-freebsd = "72f49040fc2ed4492cddfaef3b4a9cb28d008f9f5ce5cac50802a5fca910f58c";
+    i686-unknown-linux-gnu = "8f3f5d2ab7b609ab30d584cfb5cecc3d8b16d2620fffb7643383c8a0a3881e21";
+    x86_64-unknown-linux-gnu = "1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87";
+    x86_64-unknown-linux-musl = "c11ab908cbffbe98097d99ed62f5db00aa98496520b1e09583a151d36df7fca4";
+    arm-unknown-linux-gnueabihf = "2a2b1cf93b31e429624380e5b0d2bcce327274f8593b63657b863e38831f6421";
+    armv7-unknown-linux-gnueabihf = "fcce5ddb4f55bbdc9a1359a4cb6e65f2ff790d59ad228102cd472112ea65d3fe";
+    aarch64-unknown-linux-gnu = "131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af";
+    aarch64-unknown-linux-musl = "f328bcf109bf3eae01559b53939a9afbdb70ef30429f95109f7ea21030d60dfa";
+    x86_64-apple-darwin = "6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898";
+    aarch64-apple-darwin = "3be74c31ee8dc4f1d49e2f2888228de374138eaeca1876d0c1b1a61df6023b3b";
+    powerpc64le-unknown-linux-gnu = "c5aedb12c552daa18072e386697205fb7b91cef1e8791fe6fb74834723851388";
+    riscv64gc-unknown-linux-gnu = "847a925ace172d4c0a8d3da8d755b8678071ef73e659886128a3103bb896dcd9";
+    x86_64-unknown-freebsd = "b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_78;
+  selectRustPackage = pkgs: pkgs.rust_1_79;
 
   rustcPatches = [ ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba02b57b0357..d15884f24575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16388,11 +16388,11 @@ with pkgs;
   wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
-  rust_1_78 = callPackage ../development/compilers/rust/1_78.nix {
+  rust_1_79 = callPackage ../development/compilers/rust/1_79.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_18 = llvmPackages_18.libllvm;
   };
-  rust = rust_1_78;
+  rust = rust_1_79;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -16400,8 +16400,8 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  rustPackages_1_78 = rust_1_78.packages.stable;
-  rustPackages = rustPackages_1_78;
+  rustPackages_1_79 = rust_1_79.packages.stable;
+  rustPackages = rustPackages_1_79;
 
   inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
 

From 45c85e2b1d6d3a26b9bc846e0146b1d6f498000c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 6 Jul 2024 16:56:12 +0200
Subject: [PATCH 149/319] ffado: Add comment about Python 3.11 override

This was introduced in 20001b719e1927d687c4909cf522e64cb93379e1
---
 pkgs/os-specific/linux/ffado/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 34bb094bfae8..207e0a6fe30d 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -55,7 +55,10 @@ mkDerivation rec {
 
   nativeBuildInputs =
     [
-      (scons.override { python3Packages = python311.pkgs; })
+      (scons.override {
+        # SConstruct script depends on distutils removed in Python 3.12
+        python3Packages = python311.pkgs;
+      })
       pkg-config
       which
     ]

From 5bf99d06948c6e6dc7de7dff3d7518d207f442e0 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Sun, 22 Oct 2023 00:23:51 +0300
Subject: [PATCH 150/319] nodejs: remove unused bypass-xcodebuild.diff

---
 .../web/nodejs/bypass-xcodebuild.diff         | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/bypass-xcodebuild.diff

diff --git a/pkgs/development/web/nodejs/bypass-xcodebuild.diff b/pkgs/development/web/nodejs/bypass-xcodebuild.diff
deleted file mode 100644
index 5c900dd2143f..000000000000
--- a/pkgs/development/web/nodejs/bypass-xcodebuild.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
---- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2020-09-15 09:08:46.000000000 +0200
-+++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2020-12-03 16:55:43.781860687 +0100
-@@ -436,7 +436,14 @@
-     # Since the CLT has no SDK paths anyway, returning None is the
-     # most sensible route and should still do the right thing.
-     try:
--      return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem])
-+      # Return fake data that xcodebuild would normally return
-+
-+      xcodedata = {
-+        "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
-+        "ProductBuildVersion": "19A547",
-+        "ProductVersion": "10.15"
-+      }
-+      return xcodedata[infoitem]
-     except GypError:
-       pass
- 
-@@ -1271,7 +1278,7 @@
-   version = ""
-   build = ""
-   try:
--    version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
-+    version_list = []
-     # In some circumstances xcodebuild exits 0 but doesn't return
-     # the right results; for example, a user on 10.7 or 10.8 with
-     # a bogus path set via xcode-select

From ce685a84225f553a22a47b79abbf7e7e009a8e26 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Thu, 19 Oct 2023 21:29:09 +0300
Subject: [PATCH 151/319] nodejs: fix sandboxed build on darwin

---
 .../gyp-patches-pre-v22-import-sys.patch      | 24 ++++++++
 .../nodejs/gyp-patches-v22-import-sys.patch   | 14 +++++
 pkgs/development/web/nodejs/gyp-patches.nix   | 22 +++++++
 pkgs/development/web/nodejs/nodejs.nix        | 57 +++++++++++++++++--
 pkgs/development/web/nodejs/v18.nix           |  6 +-
 pkgs/development/web/nodejs/v20.nix           |  6 +-
 pkgs/development/web/nodejs/v22.nix           |  6 +-
 7 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch
 create mode 100644 pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch
 create mode 100644 pkgs/development/web/nodejs/gyp-patches.nix

diff --git a/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch b/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch
new file mode 100644
index 000000000000..fa499c6491c7
--- /dev/null
+++ b/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch
@@ -0,0 +1,24 @@
+Add missing import statement for gyp-patches.nix.
+
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
+@@ -25,6 +25,7 @@
+ import os
+ import re
+ import subprocess
++import sys
+ import gyp
+ import gyp.common
+ import gyp.xcode_emulation
+
+--- a/tools/gyp/pylib/gyp/generator/make.py
++++ b/tools/gyp/pylib/gyp/generator/make.py
+@@ -25,6 +25,7 @@
+ import os
+ import re
+ import subprocess
++import sys
+ import gyp
+ import gyp.common
+ import gyp.xcode_emulation
+
diff --git a/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch b/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch
new file mode 100644
index 000000000000..4f1abea901c0
--- /dev/null
+++ b/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch
@@ -0,0 +1,14 @@
+For some reason Node.js v22 has two different GYP versions vendored, and
+only one of them contains `import sys`.
+
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
+@@ -25,6 +25,7 @@
+ import os
+ import re
+ import subprocess
++import sys
+ import gyp
+ import gyp.common
+ import gyp.xcode_emulation
+
diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
new file mode 100644
index 000000000000..67a2a2a12844
--- /dev/null
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -0,0 +1,22 @@
+{ fetchpatch2 }:
+let
+  name = "gyp-darwin-sandbox.patch";
+  url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch";
+in
+[
+  # Fixes builds with Nix sandbox on Darwin for gyp.
+  # See https://github.com/NixOS/nixpkgs/issues/261820
+  # and https://github.com/nodejs/gyp-next/pull/216
+  (fetchpatch2 {
+    inherit name url;
+    hash = "sha256-l8FzgLq9CbVJCkXfnTyDQ+vXKCz65wpaffE74oSU+kY=";
+    stripLen = 1;
+    extraPrefix = "tools/gyp/";
+  })
+  (fetchpatch2 {
+    inherit name url;
+    hash = "sha256-UVUn4onXfJgFoAdApLAbliiBgM9rxDdIo53WjFryoBI=";
+    stripLen = 1;
+    extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
+  })
+]
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b4e6dbcc0e6b..3077c7306317 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -131,25 +131,74 @@ let
 
     inherit patches;
 
-    doCheck = lib.versionAtLeast version "16"; # some tests fail on v14
+    __darwinAllowLocalNetworking = true; # for tests
+
+    # TODO: what about tests when cross-compiling?
+    # Note that currently stdenv does not run check phase if build ≠ host.
+    doCheck = true;
 
     # Some dependencies required for tools/doc/node_modules (and therefore
     # test-addons, jstest and others) target are not included in the tarball.
     # Run test targets that do not require network access.
-    checkTarget = lib.concatStringsSep " " [
+    checkTarget = lib.concatStringsSep " " ([
       "build-js-native-api-tests"
       "build-node-api-tests"
       "tooltest"
       "cctest"
+    ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
+      # There are some test failures on macOS before v20 that are not worth the
+      # time to debug for a version that would be eventually removed in less
+      # than a year (Node.js 18 will be EOL at 2025-04-30). Note that these
+      # failures are specific to Nix sandbox on macOS and should not affect
+      # actual functionality.
       "test-ci-js"
-    ];
+    ]);
 
     checkFlags = [
       # Do not create __pycache__ when running tests.
       "PYTHONDONTWRITEBYTECODE=1"
+    ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
       "FLAKY_TESTS=skip"
       # Skip some tests that are not passing in this context
-      "CI_SKIP_TESTS=test-setproctitle,test-tls-cli-max-version-1.3,test-tls-client-auth,test-child-process-exec-env,test-fs-write-stream-eagain,test-tls-sni-option,test-https-foafssl,test-child-process-uid-gid,test-process-euid-egid,test-process-initgroups,test-process-uid-gid,test-process-setgroups"
+      "CI_SKIP_TESTS=${lib.concatStringsSep "," ([
+        "test-child-process-exec-env"
+        "test-child-process-uid-gid"
+        "test-fs-write-stream-eagain"
+        "test-https-foafssl"
+        "test-process-euid-egid"
+        "test-process-initgroups"
+        "test-process-setgroups"
+        "test-process-uid-gid"
+        "test-setproctitle"
+        "test-tls-cli-max-version-1.3"
+        "test-tls-client-auth"
+        "test-tls-sni-option"
+      ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Disable tests that don’t work under macOS sandbox.
+        "test-macos-app-sandbox"
+        "test-os"
+        "test-os-process-priority"
+        # This is a bit weird, but for some reason fs watch tests fail with
+        # sandbox.
+        "test-fs-promises-watch"
+        "test-fs-watch"
+        "test-fs-watch-encoding"
+        "test-fs-watch-non-recursive"
+        "test-fs-watch-recursive-add-file"
+        "test-fs-watch-recursive-add-file-to-existing-subfolder"
+        "test-fs-watch-recursive-add-file-to-new-folder"
+        "test-fs-watch-recursive-add-file-with-url"
+        "test-fs-watch-recursive-add-folder"
+        "test-fs-watch-recursive-assert-leaks"
+        "test-fs-watch-recursive-promise"
+        "test-fs-watch-recursive-symlink"
+        "test-fs-watch-recursive-sync-write"
+        "test-fs-watch-recursive-update-file"
+        "test-fs-watchfile"
+        "test-runner-run"
+        "test-runner-watch-mode"
+        "test-watch-mode-files_watcher"
+      ])}"
     ];
 
     postInstall = ''
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 3a0b77c904c2..bdef9c3b92f0 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -16,6 +16,10 @@ let
     buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; };
     python = python311;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    ./gyp-patches-pre-v22-import-sys.patch
+  ];
 in
 buildNodejs {
   inherit enableNpm;
@@ -33,5 +37,5 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch";
       hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I=";
     })
-  ];
+  ] ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index 2bc23d9c1fd3..b293870e74a5 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -5,6 +5,10 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    ./gyp-patches-pre-v22-import-sys.patch
+  ];
 in
 buildNodejs {
   inherit enableNpm;
@@ -23,5 +27,5 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch";
       hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo=";
     })
-  ];
+  ] ++ gypPatches;
 }
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index a849618e48bb..d2623844ae53 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -5,6 +5,10 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    ./gyp-patches-v22-import-sys.patch
+  ];
 in
 buildNodejs {
   inherit enableNpm;
@@ -16,5 +20,5 @@ buildNodejs {
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
-  ];
+  ] ++ gypPatches;
 }

From 97240ea0ac7bfec5aed52b1899ce371b85436edc Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 1 Jul 2024 21:51:35 +0300
Subject: [PATCH 152/319] nodejs: add testVersion to passthru.tests

---
 pkgs/development/web/nodejs/nodejs.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 3077c7306317..06208eec517d 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, bash
 , pkg-config, which, buildPackages
+, testers
 # for `.pkgs` attribute
 , callPackage
 # Updater dependencies
@@ -259,6 +260,13 @@ let
       EOF
     '';
 
+    passthru.tests = {
+      version = testers.testVersion {
+        package = self;
+        version = "v${version}";
+      };
+    };
+
     passthru.updateScript = import ./update.nix {
       inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell;
       inherit lib;

From 90b11e4031a6d1236657d7509ff0790ea4285712 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Sat, 6 Jul 2024 20:27:01 +0200
Subject: [PATCH 153/319] openssl: fix CVE-2024-5535

Upstream commit: https://github.com/openssl/openssl/commit/e86ac436f0

This patch fixes the ALPN negotiation in OpenSSL.
It applies to all used versions >= 3.0, but was taken
from the 3.3 branch. Therefore I added it to the 3.3
directory.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 .../libraries/openssl/3.3/CVE-2024-5535.patch | 108 ++++++++++++++++++
 .../development/libraries/openssl/default.nix |   6 +
 2 files changed, 114 insertions(+)
 create mode 100644 pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch

diff --git a/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch b/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch
new file mode 100644
index 000000000000..2d0f822b25ee
--- /dev/null
+++ b/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch
@@ -0,0 +1,108 @@
+From e86ac436f0bd54d4517745483e2315650fae7b2c Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Fri, 31 May 2024 11:14:33 +0100
+Subject: [PATCH] Fix SSL_select_next_proto
+
+Ensure that the provided client list is non-NULL and starts with a valid
+entry. When called from the ALPN callback the client list should already
+have been validated by OpenSSL so this should not cause a problem. When
+called from the NPN callback the client list is locally configured and
+will not have already been validated. Therefore SSL_select_next_proto
+should not assume that it is correctly formatted.
+
+We implement stricter checking of the client protocol list. We also do the
+same for the server list while we are about it.
+
+CVE-2024-5535
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24716)
+
+(cherry picked from commit 2ebbe2d7ca8551c4cb5fbb391ab9af411708090e)
+---
+ ssl/ssl_lib.c | 63 ++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 40 insertions(+), 23 deletions(-)
+
+diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
+index 5ec6ac4b63dc5..4c20ac4bf1fe7 100644
+--- a/ssl/ssl_lib.c
++++ b/ssl/ssl_lib.c
+@@ -3530,37 +3530,54 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
+                           unsigned int server_len,
+                           const unsigned char *client, unsigned int client_len)
+ {
+-    unsigned int i, j;
+-    const unsigned char *result;
+-    int status = OPENSSL_NPN_UNSUPPORTED;
++    PACKET cpkt, csubpkt, spkt, ssubpkt;
++
++    if (!PACKET_buf_init(&cpkt, client, client_len)
++            || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt)
++            || PACKET_remaining(&csubpkt) == 0) {
++        *out = NULL;
++        *outlen = 0;
++        return OPENSSL_NPN_NO_OVERLAP;
++    }
++
++    /*
++     * Set the default opportunistic protocol. Will be overwritten if we find
++     * a match.
++     */
++    *out = (unsigned char *)PACKET_data(&csubpkt);
++    *outlen = (unsigned char)PACKET_remaining(&csubpkt);
+ 
+     /*
+      * For each protocol in server preference order, see if we support it.
+      */
+-    for (i = 0; i < server_len;) {
+-        for (j = 0; j < client_len;) {
+-            if (server[i] == client[j] &&
+-                memcmp(&server[i + 1], &client[j + 1], server[i]) == 0) {
+-                /* We found a match */
+-                result = &server[i];
+-                status = OPENSSL_NPN_NEGOTIATED;
+-                goto found;
++    if (PACKET_buf_init(&spkt, server, server_len)) {
++        while (PACKET_get_length_prefixed_1(&spkt, &ssubpkt)) {
++            if (PACKET_remaining(&ssubpkt) == 0)
++                continue; /* Invalid - ignore it */
++            if (PACKET_buf_init(&cpkt, client, client_len)) {
++                while (PACKET_get_length_prefixed_1(&cpkt, &csubpkt)) {
++                    if (PACKET_equal(&csubpkt, PACKET_data(&ssubpkt),
++                                     PACKET_remaining(&ssubpkt))) {
++                        /* We found a match */
++                        *out = (unsigned char *)PACKET_data(&ssubpkt);
++                        *outlen = (unsigned char)PACKET_remaining(&ssubpkt);
++                        return OPENSSL_NPN_NEGOTIATED;
++                    }
++                }
++                /* Ignore spurious trailing bytes in the client list */
++            } else {
++                /* This should never happen */
++                return OPENSSL_NPN_NO_OVERLAP;
+             }
+-            j += client[j];
+-            j++;
+         }
+-        i += server[i];
+-        i++;
++        /* Ignore spurious trailing bytes in the server list */
+     }
+ 
+-    /* There's no overlap between our protocols and the server's list. */
+-    result = client;
+-    status = OPENSSL_NPN_NO_OVERLAP;
+-
+- found:
+-    *out = (unsigned char *)result + 1;
+-    *outlen = result[0];
+-    return status;
++    /*
++     * There's no overlap between our protocols and the server's list. We use
++     * the default opportunistic protocol selected earlier
++     */
++    return OPENSSL_NPN_NO_OVERLAP;
+ }
+ 
+ #ifndef OPENSSL_NO_NEXTPROTONEG
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6c87feaab882..c4300e9d5b2d 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -286,6 +286,8 @@ in {
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      ./3.3/CVE-2024-5535.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./use-etc-ssl-certs-darwin.patch
        else ./use-etc-ssl-certs.patch)
@@ -309,6 +311,8 @@ in {
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      ./3.3/CVE-2024-5535.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./3.2/use-etc-ssl-certs-darwin.patch
        else ./3.2/use-etc-ssl-certs.patch)
@@ -332,6 +336,8 @@ in {
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      ./3.3/CVE-2024-5535.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./3.2/use-etc-ssl-certs-darwin.patch
        else ./3.2/use-etc-ssl-certs.patch)

From ca9096d7e85c292a0e40373ad1fbb72ebe95eb35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Jun 2024 07:01:15 +0000
Subject: [PATCH 154/319] libgpg-error: 1.49 -> 1.50

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

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index a990546108cf..926c79317896 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, fetchurl, gettext
+{ stdenv, lib, buildPackages, fetchurl, fetchpatch, gettext
 , genPosixLockObjOnly ? false
 }: let
   genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
@@ -17,13 +17,21 @@
   };
 in stdenv.mkDerivation (rec {
   pname = "libgpg-error";
-  version = "1.49";
+  version = "1.50";
 
   src = fetchurl {
     url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-i3nVRjnb9KvAi1QG+y835mmi3sCR3QJPuH3TZxMcY6k=";
+    hash = "sha256-aUBTSeCmM+REooxbNc6PFEhGhFGKUI3EigiZkv6T4go=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/macports/macports-ports/raw/cc17f22f4056d84967bd94cf41458e3d3150f9e1/devel/libgpg-error/files/patch-src-spawn-posix.c.diff";
+      extraPrefix = "";
+      hash = "sha256-nIS9oKcgHdHtRTlaSx7mgwQPXq855t+SNujplQKKhzQ=";
+    })
+  ];
+
   postPatch = ''
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
   '';

From 7b40ca9eb22f07d0696fdca0aa80884134af01f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 May 2024 15:51:45 +0000
Subject: [PATCH 155/319] nghttp2: 1.61.0 -> 1.62.1

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

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 5566b0c8f67d..f69bd5a4451b 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.61.0";
+  version = "1.62.1";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-Toz37DLUxaQwlmJC1yA10lXNlHCodm1h7tegGQ3VRP0=";
+    sha256 = "sha256-OWbsgv2n/DgFBtNyomDY2bbpRr5N6u8f7MGnS0gJrj0=";
   };
 
   outputs = [ "out" "dev" "lib" "doc" "man" ];
@@ -60,6 +60,10 @@ stdenv.mkDerivation rec {
     (lib.enableFeature enableHttp3 "http3")
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [
+    "-faligned-allocation"
+  ]);
+
   # Unit tests require CUnit and setting TZDIR environment variable
   doCheck = enableTests;
   nativeCheckInputs = lib.optionals (enableTests) [ cunit tzdata ];

From 9d5d41542dcd467c39fd510ba0b22ee9fae375e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Jun 2024 04:28:09 +0000
Subject: [PATCH 156/319] harfbuzz: 8.4.0 -> 9.0.0

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 657ea82f0b85..3c0e4668781e 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "8.4.0";
+  version = "9.0.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-r06nPiWrdIyMBjt4wviOSIM9ubKsNp4pvRFXAueJdV4=";
+    hash = "sha256-pBsnLO65IMVyY+yFFgRULZ7IXuMDBQbZRmIGfHtquJ4=";
   };
 
   postPatch = ''

From ad9505ddce7bb6d88429906ebf65925f92799b15 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 7 Jul 2024 17:15:58 +0200
Subject: [PATCH 157/319] python3Packages.pythonRelaxDepsHook: update example

---
 .../interpreters/python/hooks/python-relax-deps-hook.sh     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
index 16df00013925..7fd1b52a04bf 100644
--- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
@@ -4,12 +4,10 @@
 #
 # Example usage in a derivation:
 #
-#   { …, pythonPackages, … }:
+#   { …, python3Packages, … }:
 #
-#   pythonPackages.buildPythonPackage {
+#   python3Packages.buildPythonPackage {
 #     …
-#     nativeBuildInputs = [ pythonPackages.pythonRelaxDepsHook ];
-#
 #     # This will relax the dependency restrictions
 #     # e.g.: abc>1,<=2 -> abc
 #     pythonRelaxDeps = [ "abc" ];

From c00d3f940fdce5afa80d704a3f1755bb66bc30ed Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 8 Jul 2024 08:57:54 +0100
Subject: [PATCH 158/319] gdb: 14.2 -> 15.1

Changes: https://lists.gnu.org/archive/html/info-gnu/2024-07/msg00004.html
---
 pkgs/development/tools/misc/gdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 263196dab5ef..21dafb9bbce7 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -30,11 +30,11 @@ assert pythonSupport -> python3 != null;
 
 stdenv.mkDerivation rec {
   pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only";
-  version = "14.2";
+  version = "15.1";
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}-${version}.tar.xz";
-    hash = "sha256-LU3YBh2N7RK2xj9V5FNEiB6CJhBfTSqbI0BA76XOd3I=";
+    hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI=";
   };
 
   postPatch = lib.optionalString stdenv.isDarwin ''

From f2e5e8b1add751e01b077e573963f6500bd9d9b4 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Mon, 8 Jul 2024 14:32:24 +0300
Subject: [PATCH 159/319] libunistring: fix sdk version

As per the discussion at:
https://github.com/NixOS/nixpkgs/pull/291282#discussion_r1668442573
mixing SDK versions breaks building on x86_64-darwin

Co-authored-by: reckenrode <randy@largeandhighquality.com>
---
 pkgs/development/libraries/libunistring/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 8876c3292f90..13ffffe6aa74 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
   buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk_11_0.frameworks.CoreServices
+    darwin.apple_sdk.frameworks.CoreServices
   ];
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 

From 81e5c46c1207dfde7bc9515155d579171c73581f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 8 Jul 2024 19:55:52 +0200
Subject: [PATCH 160/319] lorri: fix cargoHash

This is a mismatch after merging both of:
- #323983
- #322749
---
 pkgs/tools/misc/lorri/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index 97ef2bf8deb2..39a6f9efa1a6 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -16,7 +16,7 @@ let
   # Also don’t forget to run `nix-build -A lorri.tests`
   version = "1.7.0";
   sha256 = "sha256-pGNhhEBHyWhTaW24dHrxAvpb/qr5RPbHXRwDZx6Rf74=";
-  cargoSha256 = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU=";
+  cargoHash = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU=";
 
 in (rustPlatform.buildRustPackage rec {
   pname = "lorri";

From 0ce32a5a5cc966d88bf52551c52ac66621176c4b Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Mon, 8 Jul 2024 20:10:07 +0200
Subject: [PATCH 161/319] mercurial: 6.7.4 -> 6.8

This release also fixes Rust support with Python 3.12,
allowing us to re-enable rustSupport for that version of Python.

Changelog: https://wiki.mercurial-scm.org/Release6.8
---
 .../version-management/mercurial/default.nix           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 5057e725010e..feb7a77a6af9 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,8 +1,6 @@
 { lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles
 , re2Support ? true
-# depends on rust-cpython which won't support python312
-# https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9
-, rustSupport ? (stdenv.hostPlatform.isLinux && python3Packages.pythonOlder "3.12"), cargo, rustPlatform, rustc
+, rustSupport ? stdenv.hostPlatform.isLinux, cargo, rustPlatform, rustc
 , fullBuild ? false
 , gitSupport ? fullBuild
 , guiSupport ? fullBuild, tk
@@ -23,11 +21,11 @@ let
 
   self = python3Packages.buildPythonApplication rec {
     pname = "mercurial${lib.optionalString fullBuild "-full"}";
-    version = "6.7.4";
+    version = "6.8";
 
     src = fetchurl {
       url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-      hash = "sha256-dHCPhzQFwSJy/sEWxt1Shi6O0RwQARx+V19eqBJj6l4=";
+      hash = "sha256-COTQ5dqK8RMrUea8M1AYCtV63Nk18Je20LwRmiwsChA=";
     };
 
     format = "other";
@@ -37,7 +35,7 @@ let
     cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
       inherit src;
       name = "mercurial-${version}";
-      hash = "sha256-FRa7frX2z9jQGFBXS2TpOUANs0+xwegNETUAQIU0S4o=";
+      hash = "sha256-mP82UtASD0Fh8ilDDCB6ubY7/MGPoRP6hg6/xRwzwAw=";
       sourceRoot = "mercurial-${version}/rust";
     } else null;
     cargoRoot = if rustSupport then "rust" else null;

From 1344a0f515518bd57b3732a2b8d5b609dd0fa6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 8 Jul 2024 05:32:33 -0700
Subject: [PATCH 162/319] python313Packages.legacy-cgi: init at 2.6.1

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

diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix
new file mode 100644
index 000000000000..e7c3e0a198d3
--- /dev/null
+++ b/pkgs/development/python-modules/legacy-cgi/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "legacy-cgi";
+  version = "2.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jackrosenthal";
+    repo = "legacy-cgi";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hhWZoRswkuwvgkcKthNhMkPPhhoRH4TjdNp+orluQTQ=";
+  };
+
+  build-system = [ poetry-core ];
+
+  pythonImportsCheck = [
+    "cgi"
+    "cgitb"
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594";
+    homepage = "https://github.com/jackrosenthal/legacy-cgi";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39b8b28be828..e1ea83c6c9b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6687,6 +6687,8 @@ self: super: with self; {
     inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
   };
 
+  legacy-cgi = callPackage ../development/python-modules/legacy-cgi { };
+
   leidenalg = callPackage ../development/python-modules/leidenalg {
     igraph-c = pkgs.igraph;
   };

From 5922945c861a8f0b3e607fb091a9ae7d8a96014b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 8 Jul 2024 05:37:08 -0700
Subject: [PATCH 163/319] python312Packages.time-machine: 2.13.0 -> 2.14.2

Diff: https://github.com/adamchainz/time-machine/compare/2.13.0...2.14.2

Changelog: https://github.com/adamchainz/time-machine/blob/2.14.2/CHANGELOG.rst
---
 pkgs/development/python-modules/time-machine/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix
index 8d2490f428e0..17d3827f4853 100644
--- a/pkgs/development/python-modules/time-machine/default.nix
+++ b/pkgs/development/python-modules/time-machine/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "time-machine";
-  version = "2.13.0";
+  version = "2.14.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,12 +21,12 @@ buildPythonPackage rec {
     owner = "adamchainz";
     repo = pname;
     rev = version;
-    hash = "sha256-SjenPLLr4JoWK5HAokwgW+bw3mfAZiuDb1N7Za5wtrw=";
+    hash = "sha256-u5RxNv+hsL+0yxtiWeYHtmMQY7bvb8WY7ipouj+IZJ8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     python-dateutil
   ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
 

From b571fd7e526c51fc3cf48354f7a5408e4f4f6103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 8 Jul 2024 05:38:47 -0700
Subject: [PATCH 164/319] python313Packages.webob: fix build

The cgi module was removed in Python 3.13 but can be brought back using
the legacy-cgi package.
---
 pkgs/development/python-modules/webob/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 921b75ef0778..05eeb73844b2 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -2,14 +2,17 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
+  legacy-cgi,
   pytestCheckHook,
+  pythonAtLeast,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "webob";
   version = "1.8.7";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -19,6 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM=";
   };
 
+  build-system = [ setuptools ];
+
+  # https://github.com/Pylons/webob/issues/437
+  dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "webob" ];

From 2f1765713f65e84aadc3f87cc0e577c0e5813efd Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 8 Jul 2024 21:04:26 +0200
Subject: [PATCH 165/319] nodejs_18: 18.20.3 -> 18.20.4

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

diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index bdef9c3b92f0..1101fbdf725d 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -23,8 +23,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "18.20.3";
-  sha256 = "sha256-SxRPn9auSx1itzLFsxYOe56EvkrwrgYse0hOiepBro0=";
+  version = "18.20.4";
+  sha256 = "sha256-p2x+oblq62ljoViAYmDICUtiRNZKaWUp0CBUe5qVyio=";
   patches = [
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch

From e11b071dbc4aa5b59a94dabbb5f7379dc43e46aa Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 8 Jul 2024 21:05:37 +0200
Subject: [PATCH 166/319] nodejs_22: 22.4.0 -> 22.4.1

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

diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index d2623844ae53..44737d2ba8ec 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -12,8 +12,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.4.0";
-  sha256 = "sha256-KStDAITy8ykT3H2k6y+8iWklJ3Kp0b/ormxLSpjKOtM=";
+  version = "22.4.1";
+  sha256 = "sha256-ZfyFf1qoJWqvyQCzRMARXJrq4loCVB/Vzg29Tf0cX7k=";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch

From 92b04c826bcbf1006dc9d65f8180e5344f15ef11 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 8 Jul 2024 20:19:55 +0100
Subject: [PATCH 167/319] libass: 0.17.2 -> 0.17.3

Changes: https://github.com/libass/libass/releases/tag/0.17.3
---
 pkgs/development/libraries/libass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index cf8f4c85e0c6..3c3fa3ee7066 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -11,11 +11,11 @@ assert fontconfigSupport -> fontconfig != null;
 
 stdenv.mkDerivation rec {
   pname = "libass";
-  version = "0.17.2";
+  version = "0.17.3";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-6CYbUdZrqTP+mSSMb92HZ+2WxaflNjyDmSxzWiwvv3Q=";
+    hash = "sha256-6uQl2lDwAVwh97OpxyYqkQ8CGK9GniLikxRi/tPFCVk=";
   };
 
   outputs = [ "out" "dev" ];

From 96d6f0a2ddb07916cd1a3230fbe6a21e4dc6b29e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 May 2024 18:32:39 +0000
Subject: [PATCH 168/319] pcsclite: 2.1.0 -> 2.2.3

---
 pkgs/tools/security/pcsclite/default.nix | 65 ++++++++++++++----------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index e75be683a6f3..eedec6b239fd 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,8 +1,9 @@
 { stdenv
 , lib
 , fetchFromGitLab
-, autoreconfHook
-, autoconf-archive
+, fetchpatch
+, meson
+, ninja
 , flex
 , pkg-config
 , perl
@@ -15,6 +16,7 @@
 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
 , udevSupport ? dbusSupport
 , libusb1
+, Foundation
 , IOKit
 , testers
 , nix-update-script
@@ -27,7 +29,7 @@ assert systemdSupport -> dbusSupport;
 
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "2.1.0";
+  version = "2.2.3";
 
   outputs = [ "out" "lib" "dev" "doc" "man" ];
 
@@ -36,35 +38,46 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rousseau";
     repo = "PCSC";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-aJKI6pWrZJFmiTxZ9wgCuxKRWRMFVRAkzlo+tSqV8B4=";
+    hash = "sha256-hKyxXqZaqg8KGFoBWhRHV1/50uoxqiG0RsYtgw2BuQ4=";
   };
 
-  configureFlags = [
-    "--enable-confdir=/etc"
-    # The OS should care on preparing the drivers into this location
-    "--enable-usbdropdir=/var/lib/pcsc/drivers"
-    (lib.enableFeature systemdSupport "libsystemd")
-    (lib.enableFeature polkitSupport "polkit")
-    "--enable-ipcdir=/run/pcscd"
-  ] ++ lib.optionals systemdSupport [
-    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-  ] ++ lib.optionals (!udevSupport) [
-    "--disable-libudev"
+  # fix build with macOS 11 SDK
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/rousseau/PCSC/-/commit/f41fdaaf7c82bc270af6d7439c6da037bf149be8.patch";
+      revert = true;
+      hash = "sha256-8A76JfYqcILi52X9l/uIpJXeRJDf2dkrNEToOsxGZXk=";
+    })
   ];
 
-  makeFlags = [
-    "POLICY_DIR=$(out)/share/polkit-1/actions"
+  mesonFlags = [
+    (lib.mesonOption "sysconfdir" "/etc")
+    # The OS should care on preparing the drivers into this location
+    (lib.mesonOption "usbdropdir" "/var/lib/pcsc/drivers")
+    (lib.mesonBool "libsystemd" systemdSupport)
+    (lib.mesonBool "polkit" polkitSupport)
+    (lib.mesonOption "ipcdir" "/run/pcscd")
+  ] ++ lib.optionals systemdSupport [
+    (lib.mesonOption "systemdunit" "system")
+  ] ++ lib.optionals (!udevSupport) [
+    (lib.mesonBool "libudev" false)
   ];
 
   # disable building pcsc-wirecheck{,-gen} when cross compiling
   # see also: https://github.com/LudovicRousseau/PCSC/issues/25
-  postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    substituteInPlace src/Makefile.am \
-      --replace-fail "noinst_PROGRAMS = testpcsc pcsc-wirecheck pcsc-wirecheck-gen" \
-                     "noinst_PROGRAMS = testpcsc"
-  '' + ''
+  postPatch = ''
     substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
       --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+  '' + lib.optionalString systemdSupport ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')" \
+        "systemdsystemunitdir = '${placeholder "out"}/lib/systemd/system'"
+  '' + lib.optionalString polkitSupport ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "install_dir : polkit_dep.get_variable('policydir')" \
+        "install_dir : '${placeholder "out"}/share/polkit-1/actions'"
   '';
 
   postInstall = ''
@@ -72,11 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput bin/pcsc-spy "$dev"
   '';
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
-    autoreconfHook
-    autoconf-archive
+    meson
+    ninja
     flex
     pkg-config
     perl
@@ -85,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ python3 ]
     ++ lib.optionals systemdSupport [ systemdLibs ]
     ++ lib.optionals (!systemdSupport && udevSupport) [ udev ]
-    ++ lib.optionals stdenv.isDarwin [ IOKit ]
+    ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]
     ++ lib.optionals dbusSupport [ dbus ]
     ++ lib.optionals polkitSupport [ polkit ]
     ++ lib.optionals (!udevSupport) [ libusb1 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b644950f1661..ef7761b923e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11662,7 +11662,7 @@ with pkgs;
   otpauth = callPackage ../tools/security/otpauth { };
 
   pcsclite = callPackage ../tools/security/pcsclite {
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
   };
 
   pcscliteWithPolkit = pcsclite.override {

From 3e99b5aec1668549bf4f608e74e84f18d4eb8375 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 8 Jul 2024 23:23:16 +0100
Subject: [PATCH 169/319] ffmpeg_5: add patch for CVE-2023-51794

---
 pkgs/development/libraries/ffmpeg/generic.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 6d54d63c6ca8..3b58c9c814a2 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -462,6 +462,11 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e01a55c5283b82667dad347331816a5e20869ce9";
         hash = "sha256-m4rq+UFG3nXdgOJ3S6XcruMZ+CPw+twmy2HFv3cnvJc=";
       })
+      (fetchpatch2 {
+        name = "CVE-2023-51794.patch";
+        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/50f0f8c53c818f73fe2d752708e2fa9d2a2d8a07";
+        hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28=";
+      })
     ]
     ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [
       (fetchpatch2 { # this can be removed post 6.1

From 0aded3256340f896837cbd03496acbd80114b8ec Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 8 Jul 2024 23:23:31 +0100
Subject: [PATCH 170/319] ffmpeg_4: add patch for CVE-2023-51794

---
 pkgs/development/libraries/ffmpeg/generic.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 3b58c9c814a2..2a3415784b67 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -424,6 +424,11 @@ stdenv.mkDerivation (finalAttrs: {
             --replace 'const AVInputFormat *const ' 'const AVInputFormat *'
         '';
       })
+      (fetchpatch2 {
+        name = "CVE-2023-51794.patch";
+        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/50f0f8c53c818f73fe2d752708e2fa9d2a2d8a07";
+        hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28=";
+      })
     ]
     ++ optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [
       (fetchpatch2 {

From cf39694bd2644e94066f85f62305f0e0b84fc841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 8 Jul 2024 04:16:59 -0700
Subject: [PATCH 171/319] python312Packages.pycountry: 23.12.11 -> 24.6.1

Diff: https://github.com/pycountry/pycountry/compare/refs/tags/23.12.11...24.6.1

Changelog: https://github.com/pycountry/pycountry/blob/refs/tags/24.6.1/HISTORY.txt
---
 .../python-modules/pycountry/default.nix      | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index 5a4fd3fc1bb5..2f5d52d9dacb 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -3,14 +3,13 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   poetry-core,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pycountry";
-  version = "23.12.11";
+  version = "24.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,27 +18,15 @@ buildPythonPackage rec {
     owner = "pycountry";
     repo = "pycountry";
     rev = "refs/tags/${version}";
-    hash = "sha256-B6kphZZZgK0YuPSmkiQNbEqEfqOQb+WZGnO2UeEqQN4=";
+    hash = "sha256-4YVPh6OGWguqO9Ortv+vAejxx7WLs4u0SVLv8JlKSWM=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "fix-usage-of-importlib_metadata.patch";
-      url = "https://github.com/pycountry/pycountry/commit/824d2535833d061c04a1f1b6b964f42bb53bced2.patch";
-      excludes = [
-        "HISTORY.txt"
-        "poetry.lock"
-        "pyproject.toml"
-      ];
-      hash = "sha256-U4fbZP++d6YfTJkVG3k2rBC8nOF9NflM6+ONlwBNu+g=";
-    })
-  ];
-
   postPatch = ''
-    sed -i "/addopts/d" pytest.ini
+    sed -i "/addopts/d" pyproject.toml
+    sed -i "/pytest-cov/d" pyproject.toml
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 9b544959d9190152bb21bf2c72756fd9359d6bfe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 9 Jul 2024 19:29:34 +0200
Subject: [PATCH 172/319] python312Packages.django_4: 4.2.12 -> 4.2.14

https://docs.djangoproject.com/en/4.2/releases/4.2.14/
https://www.djangoproject.com/weblog/2024/jul/09/security-releases/

Fixes: CVE-2024-38875, CVE-2024-39329, CVE-2024-39330, CVE-2024-39614
---
 pkgs/development/python-modules/django/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 2bc86f7579cc..34f2075a442a 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.12";
+  version = "4.2.14";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-n6esWUpZpCP4J4bNckNKJ9E61qFjTPS7XF+WgxNS2JE=";
+    hash = "sha256-Nt+dVIikfe7gJY6/qJzkolkXeSFNBCbCEMSaKYmvCz4=";
   };
 
   patches =

From 4ddb1c3fa3c299b4b8c2ce9ca7c1bd5f0484ed6e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 9 Jul 2024 22:04:25 +0100
Subject: [PATCH 173/319] glib: 2.80.3 -> 2.80.4

Changes: https://gitlab.gnome.org/GNOME/glib/-/releases/2.80.4
---
 pkgs/development/libraries/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 47ca3f35b218..4057d4618816 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -61,11 +61,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.80.3";
+  version = "2.80.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OUeg6t3Q82E9AjC7JG0MaeRhQsGQIvXEsbLjy6I21Bc=";
+    hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08=";
   };
 
   patches = lib.optionals stdenv.isDarwin [

From afa6f75b75020d204a38092e1e148128542f6380 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 9 Jul 2024 22:39:05 +0100
Subject: [PATCH 174/319] ell: 0.66 -> 0.67

Changes: https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.67
---
 pkgs/os-specific/linux/ell/default.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index c4f91658f448..651493746361 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -1,6 +1,5 @@
 { lib, stdenv
 , fetchgit
-, fetchpatch
 , autoreconfHook
 , pkg-config
 , dbus
@@ -10,27 +9,16 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.66";
+  version = "0.67";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    hash = "sha256-FqJbAE2P6rKKUMwcDShCKNDQu4RRifEGrbE7F4gSpm0=";
+    hash = "sha256-PIxPhKqsxybkLQerkQ15kTRh0oW812lWbCGEig11KQk=";
   };
 
-  patches = [
-    # Without the revert TCP dbus tests fail to bind the port and fail.
-    # Seemingly a known dbus bug: https://gitlab.freedesktop.org/dbus/dbus/-/issues/28
-    (fetchpatch {
-      name = "revert-tcp-tests.patch";
-      url = "https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=7863e06b18b9cce56392b65928e927297108337d";
-      hash = "sha256-8+M1k0hGE64CHmK1T5/zW8+Q76pIjl5SMaYktRqpudg=";
-      revert = true;
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
@@ -44,6 +32,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Runs multiple dbus instances on the same port failing the bind.
+  enableParallelChecking = false;
+
   # tests sporadically fail on musl
   doCheck = !stdenv.hostPlatform.isMusl;
 

From 6ca5b11ad8ec0624343614c927fbd844205fe5df Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 9 Jul 2024 22:39:57 +0100
Subject: [PATCH 175/319] iwd: 2.18 -> 2.19

Changes: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.19
---
 pkgs/os-specific/linux/iwd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 174949a7af4d..f19c73f7bfc5 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    hash = "sha256-icPYxbCkfgv3v/FIVnrwKoHuLh9Sx2fcpQPO3kXJe4A=";
+    hash = "sha256-LIzcV8OvtHItMpgFVHDQhUisD3kaMPMESd3cgOaIu/8=";
   };
 
   outputs = [ "out" "man" "doc" ]

From eb8d90ecec8363f67b1531a9b0813e5f51e0c8d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 10 Jul 2024 00:32:25 +0200
Subject: [PATCH 176/319] python312Packages.django-storages: 1.14.2 -> 1.14.4

https://github.com/jschneier/django-storages/blob/1.14.4/CHANGELOG.rst
---
 pkgs/development/python-modules/django-storages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix
index f7524810f4a1..84378ee311a8 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/pkgs/development/python-modules/django-storages/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "django-storages";
-  version = "1.14.2";
+  version = "1.14.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "jschneier";
     repo = "django-storages";
     rev = "refs/tags/${version}";
-    hash = "sha256-V0uFZvnBi0B31b/j/u3Co6dd9XcdVefiSkl3XmCTJG4=";
+    hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 8af30139699360e70b8892ef2fee3b2a796e167c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 10 Jul 2024 03:57:16 -0700
Subject: [PATCH 177/319] python312Packages.trove-classifiers: 2024.5.22 ->
 2024.7.2

Changelog: https://github.com/pypa/trove-classifiers/releases/tag/2024.7.2
---
 .../python-modules/trove-classifiers/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index ec13fb857cee..a62a953eda7a 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -11,7 +11,7 @@
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2024.5.22";
+    version = "2024.7.2";
     pyproject = true;
 
     disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ let
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-imJCu7XJrojTTPZl6Bayh9IhKXPId336717BjXKsHQM=";
+      hash = "sha256-gyjyrCzj/Xc8uzfHZaDteoP4ncVkx9RS8Dm2kknQrDU=";
     };
 
     postPatch = ''
@@ -27,7 +27,7 @@ let
         --replace '"calver"' ""
     '';
 
-    nativeBuildInputs = [
+    build-system = [
       calver
       setuptools
     ];

From 149c046f4d6772bf6148ceaa30659d3d67986158 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 10 Jul 2024 16:17:36 +0200
Subject: [PATCH 178/319] nodejs_20: 20.15.0 -> 20.15.1 (#325616)

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

diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix
index b293870e74a5..bf0e2f7feffb 100644
--- a/pkgs/development/web/nodejs/v20.nix
+++ b/pkgs/development/web/nodejs/v20.nix
@@ -12,8 +12,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.15.0";
-  sha256 = "sha256-D0p6BRw12V65BejLKqQ8XUArExIDkI/mM+s8+gUO+Qc=";
+  version = "20.15.1";
+  sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ=";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch

From 162c184b6248b1dcd486b1c8d498370ab72b4cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 19 May 2024 18:00:22 +0200
Subject: [PATCH 179/319] rsync: use enableFeature

as suggested in https://github.com/NixOS/nixpkgs/pull/311785#pullrequestreview-2057265166
---
 pkgs/applications/networking/sync/rsync/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 555fb68416b8..e20e3c73d7a4 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableXXHash xxHash;
 
   configureFlags = [
+    (lib.enableFeature enableLZ4 "lz4")
+    (lib.enableFeature enableOpenSSL "openssl")
+    (lib.enableFeature enableXXHash "xxhash")
+    (lib.enableFeature enableZstd "zstd")
     "--with-nobody-group=nogroup"
 
     # disable the included zlib explicitly as it otherwise still compiles and
@@ -47,14 +51,6 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [
     # fix `multiversioning needs 'ifunc' which is not supported on this target` error
     "--disable-roll-simd"
-  ] ++ lib.optionals (!enableZstd) [
-    "--disable-zstd"
-  ] ++ lib.optionals (!enableXXHash) [
-    "--disable-xxhash"
-  ] ++ lib.optionals (!enableLZ4) [
-    "--disable-lz4"
-  ] ++ lib.optionals (!enableOpenSSL) [
-    "--disable-openssl"
   ];
 
   enableParallelBuilding = true;

From 0a35e77651202c8cb3f99444db582f1a351080cc Mon Sep 17 00:00:00 2001
From: Mrmaxmeier <Mrmaxmeier@gmail.com>
Date: Tue, 9 Jul 2024 18:26:54 +0200
Subject: [PATCH 180/319] pyqt5: 5.15.9 -> 5.15.10

The release announcements mentions that Python 3.12 is now supported:

https://www.riverbankcomputing.com/pipermail/pyqt/2023-October/045542.html
---
 pkgs/development/python-modules/pyqt/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index ed0264c816dd..376c028170cc 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "pyqt5";
-  version = "5.15.9";
+  version = "5.15.10";
   format = "pyproject";
 
   disabled = isPy27;
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyQt5";
     inherit version;
-    hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA=";
+    hash = "sha256-1Gt4BLGxCk/5F1P4ET5bVYDStEYvMiYoji2ESXM0iYo=";
   };
 
   patches = [

From 29cc0b4a6b63b3b89df2d2bb1e9f6d6219e53285 Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:38:46 +0200
Subject: [PATCH 181/319] generateLuarocksConfig: dont generate rocks_subdir by
 default

Goal is to make generateLuarocksConfig appropriate in more scenarios, in my case, to generate rocks.nvim luarocks config

We override the luarocks default for rocks_subdir to avoid conflicts when creating lua environments but it is not appropriate for other scenarios
so let's not default to it in the "lib" function.
---
 .../interpreters/lua-5/build-luarocks-package.nix            | 5 ++++-
 pkgs/development/lua-modules/lib.nix                         | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
index 55bd577e46d1..263cd11dd572 100644
--- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
@@ -134,12 +134,15 @@ let
       externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated);
       local_cache = "";
 
+      # To prevent collisions when creating environments, we install the rock
+      # files into per-package subdirectories
+      rocks_subdir = self.rocksSubdir;
+
       # Filter out the lua derivation itself from the Lua module dependency
       # closure, as it doesn't have a rock tree :)
       # luaLib.hasLuaModule
       requiredLuaRocks = lib.filter luaLib.hasLuaModule
         (lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs));
-      inherit (self) rocksSubdir;
     };
 
     luarocksConfig' = lib.recursiveUpdate luarocksConfig
diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix
index dc7cbcc5f76e..a527b2e1189f 100644
--- a/pkgs/development/lua-modules/lib.nix
+++ b/pkgs/development/lua-modules/lib.nix
@@ -93,7 +93,6 @@ rec {
       externalDeps ? []
     # a list of lua derivations
     , requiredLuaRocks ? []
-    , rocksSubdir ? "rocks-subdir"
     , ...
     }@args: let
       rocksTrees = lib.imap0
@@ -125,9 +124,6 @@ rec {
 
       generatedConfig = ({
 
-        # To prevent collisions when creating environments, we install the rock
-        # files into per-package subdirectories
-        rocks_subdir = rocksSubdir;
 
         # first tree is the default target where new rocks are installed,
         # any other trees in the list are treated as additional sources of installed rocks for matching dependencies.

From 749f7b3061e00314d8231e78a08cb667b43b1109 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:17:34 -0400
Subject: [PATCH 182/319] python312Packages.nose: use pep517 builder

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

diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix
index f864cfb9125f..89395ed8ae7f 100644
--- a/pkgs/development/python-modules/nose/default.nix
+++ b/pkgs/development/python-modules/nose/default.nix
@@ -7,12 +7,13 @@
   python,
   pythonAtLeast,
   coverage,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   version = "1.3.7";
-  format = "setuptools";
   pname = "nose";
+  pyproject = true;
 
   # unmaintained, relies on the imp module
   disabled = pythonAtLeast "3.12";
@@ -22,6 +23,8 @@ buildPythonPackage rec {
     sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
   };
 
+  build-system = [ setuptools ];
+
   # 2to3 was removed in setuptools 58
   postPatch = ''
     substituteInPlace setup.py \

From f5a03f4035da040b2b66756bd90060b1a6ade7c7 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:21:19 -0400
Subject: [PATCH 183/319] python312Packages.nose: fix build

---
 .../nose/0001-nose-python-3.12-fixes.patch    | 576 ++++++++++++++++++
 .../python-modules/nose/default.nix           |  13 +-
 2 files changed, 582 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch

diff --git a/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch b/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch
new file mode 100644
index 000000000000..67a671a8ae5f
--- /dev/null
+++ b/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch
@@ -0,0 +1,576 @@
+diff --git a/LICENSE.cpython b/LICENSE.cpython
+new file mode 100644
+index 0000000..14603b9
+--- /dev/null
++++ b/LICENSE.cpython
+@@ -0,0 +1,277 @@
++A. HISTORY OF THE SOFTWARE
++==========================
++
++Python was created in the early 1990s by Guido van Rossum at Stichting
++Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands
++as a successor of a language called ABC.  Guido remains Python's
++principal author, although it includes many contributions from others.
++
++In 1995, Guido continued his work on Python at the Corporation for
++National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)
++in Reston, Virginia where he released several versions of the
++software.
++
++In May 2000, Guido and the Python core development team moved to
++BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
++year, the PythonLabs team moved to Digital Creations, which became
++Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
++https://www.python.org/psf/) was formed, a non-profit organization
++created specifically to own Python-related Intellectual Property.
++Zope Corporation was a sponsoring member of the PSF.
++
++All Python releases are Open Source (see https://opensource.org for
++the Open Source Definition).  Historically, most, but not all, Python
++releases have also been GPL-compatible; the table below summarizes
++the various releases.
++
++    Release         Derived     Year        Owner       GPL-
++                    from                                compatible? (1)
++
++    0.9.0 thru 1.2              1991-1995   CWI         yes
++    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
++    1.6             1.5.2       2000        CNRI        no
++    2.0             1.6         2000        BeOpen.com  no
++    1.6.1           1.6         2001        CNRI        yes (2)
++    2.1             2.0+1.6.1   2001        PSF         no
++    2.0.1           2.0+1.6.1   2001        PSF         yes
++    2.1.1           2.1+2.0.1   2001        PSF         yes
++    2.1.2           2.1.1       2002        PSF         yes
++    2.1.3           2.1.2       2002        PSF         yes
++    2.2 and above   2.1.1       2001-now    PSF         yes
++
++Footnotes:
++
++(1) GPL-compatible doesn't mean that we're distributing Python under
++    the GPL.  All Python licenses, unlike the GPL, let you distribute
++    a modified version without making your changes open source.  The
++    GPL-compatible licenses make it possible to combine Python with
++    other software that is released under the GPL; the others don't.
++
++(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
++    because its license has a choice of law clause.  According to
++    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
++    is "not incompatible" with the GPL.
++
++Thanks to the many outside volunteers who have worked under Guido's
++direction to make these releases possible.
++
++
++B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
++===============================================================
++
++Python software and documentation are licensed under the
++Python Software Foundation License Version 2.
++
++Starting with Python 3.8.6, examples, recipes, and other code in
++the documentation are dual licensed under the PSF License Version 2
++and the Zero-Clause BSD license.
++
++Some software incorporated into Python is under different licenses.
++The licenses are listed with code falling under that license.
++
++
++PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
++--------------------------------------------
++
++1. This LICENSE AGREEMENT is between the Python Software Foundation
++("PSF"), and the Individual or Organization ("Licensee") accessing and
++otherwise using this software ("Python") in source or binary form and
++its associated documentation.
++
++2. Subject to the terms and conditions of this License Agreement, PSF hereby
++grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
++analyze, test, perform and/or display publicly, prepare derivative works,
++distribute, and otherwise use Python alone or in any derivative version,
++provided, however, that PSF's License Agreement and PSF's notice of copyright,
++i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved"
++are retained in Python alone or in any derivative version prepared by Licensee.
++
++3. In the event Licensee prepares a derivative work that is based on
++or incorporates Python or any part thereof, and wants to make
++the derivative work available to others as provided herein, then
++Licensee hereby agrees to include in any such work a brief summary of
++the changes made to Python.
++
++4. PSF is making Python available to Licensee on an "AS IS"
++basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
++IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
++INFRINGE ANY THIRD PARTY RIGHTS.
++
++5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
++FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
++A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
++OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
++
++6. This License Agreement will automatically terminate upon a material
++breach of its terms and conditions.
++
++7. Nothing in this License Agreement shall be deemed to create any
++relationship of agency, partnership, or joint venture between PSF and
++Licensee.  This License Agreement does not grant permission to use PSF
++trademarks or trade name in a trademark sense to endorse or promote
++products or services of Licensee, or any third party.
++
++8. By copying, installing or otherwise using Python, Licensee
++agrees to be bound by the terms and conditions of this License
++Agreement.
++
++
++BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
++-------------------------------------------
++
++BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
++
++1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
++office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
++Individual or Organization ("Licensee") accessing and otherwise using
++this software in source or binary form and its associated
++documentation ("the Software").
++
++2. Subject to the terms and conditions of this BeOpen Python License
++Agreement, BeOpen hereby grants Licensee a non-exclusive,
++royalty-free, world-wide license to reproduce, analyze, test, perform
++and/or display publicly, prepare derivative works, distribute, and
++otherwise use the Software alone or in any derivative version,
++provided, however, that the BeOpen Python License is retained in the
++Software, alone or in any derivative version prepared by Licensee.
++
++3. BeOpen is making the Software available to Licensee on an "AS IS"
++basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
++IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
++INFRINGE ANY THIRD PARTY RIGHTS.
++
++4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
++SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
++AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
++DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
++
++5. This License Agreement will automatically terminate upon a material
++breach of its terms and conditions.
++
++6. This License Agreement shall be governed by and interpreted in all
++respects by the law of the State of California, excluding conflict of
++law provisions.  Nothing in this License Agreement shall be deemed to
++create any relationship of agency, partnership, or joint venture
++between BeOpen and Licensee.  This License Agreement does not grant
++permission to use BeOpen trademarks or trade names in a trademark
++sense to endorse or promote products or services of Licensee, or any
++third party.  As an exception, the "BeOpen Python" logos available at
++http://www.pythonlabs.com/logos.html may be used according to the
++permissions granted on that web page.
++
++7. By copying, installing or otherwise using the software, Licensee
++agrees to be bound by the terms and conditions of this License
++Agreement.
++
++
++CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
++---------------------------------------
++
++1. This LICENSE AGREEMENT is between the Corporation for National
++Research Initiatives, having an office at 1895 Preston White Drive,
++Reston, VA 20191 ("CNRI"), and the Individual or Organization
++("Licensee") accessing and otherwise using Python 1.6.1 software in
++source or binary form and its associated documentation.
++
++2. Subject to the terms and conditions of this License Agreement, CNRI
++hereby grants Licensee a nonexclusive, royalty-free, world-wide
++license to reproduce, analyze, test, perform and/or display publicly,
++prepare derivative works, distribute, and otherwise use Python 1.6.1
++alone or in any derivative version, provided, however, that CNRI's
++License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
++1995-2001 Corporation for National Research Initiatives; All Rights
++Reserved" are retained in Python 1.6.1 alone or in any derivative
++version prepared by Licensee.  Alternately, in lieu of CNRI's License
++Agreement, Licensee may substitute the following text (omitting the
++quotes): "Python 1.6.1 is made available subject to the terms and
++conditions in CNRI's License Agreement.  This Agreement together with
++Python 1.6.1 may be located on the internet using the following
++unique, persistent identifier (known as a handle): 1895.22/1013.  This
++Agreement may also be obtained from a proxy server on the internet
++using the following URL: http://hdl.handle.net/1895.22/1013".
++
++3. In the event Licensee prepares a derivative work that is based on
++or incorporates Python 1.6.1 or any part thereof, and wants to make
++the derivative work available to others as provided herein, then
++Licensee hereby agrees to include in any such work a brief summary of
++the changes made to Python 1.6.1.
++
++4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
++basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
++IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
++INFRINGE ANY THIRD PARTY RIGHTS.
++
++5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
++1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
++A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
++OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
++
++6. This License Agreement will automatically terminate upon a material
++breach of its terms and conditions.
++
++7. This License Agreement shall be governed by the federal
++intellectual property law of the United States, including without
++limitation the federal copyright law, and, to the extent such
++U.S. federal law does not apply, by the law of the Commonwealth of
++Virginia, excluding Virginia's conflict of law provisions.
++Notwithstanding the foregoing, with regard to derivative works based
++on Python 1.6.1 that incorporate non-separable material that was
++previously distributed under the GNU General Public License (GPL), the
++law of the Commonwealth of Virginia shall govern this License
++Agreement only as to issues arising under or with respect to
++Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
++License Agreement shall be deemed to create any relationship of
++agency, partnership, or joint venture between CNRI and Licensee.  This
++License Agreement does not grant permission to use CNRI trademarks or
++trade name in a trademark sense to endorse or promote products or
++services of Licensee, or any third party.
++
++8. By clicking on the "ACCEPT" button where indicated, or by copying,
++installing or otherwise using Python 1.6.1, Licensee agrees to be
++bound by the terms and conditions of this License Agreement.
++
++        ACCEPT
++
++
++CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
++--------------------------------------------------
++
++Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
++The Netherlands.  All rights reserved.
++
++Permission to use, copy, modify, and distribute this software and its
++documentation for any purpose and without fee is hereby granted,
++provided that the above copyright notice appear in all copies and that
++both that copyright notice and this permission notice appear in
++supporting documentation, and that the name of Stichting Mathematisch
++Centrum or CWI not be used in advertising or publicity pertaining to
++distribution of the software without specific, written prior
++permission.
++
++STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
++THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
++FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
++OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++
++ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
++----------------------------------------------------------------------
++
++Permission to use, copy, modify, and/or distribute this software for any
++purpose with or without fee is hereby granted.
++
++THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
++REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
++INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
++OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++PERFORMANCE OF THIS SOFTWARE.
+diff --git a/nose/importer.py b/nose/importer.py
+index e677658..77099eb 100644
+--- a/nose/importer.py
++++ b/nose/importer.py
+@@ -7,9 +7,10 @@ the builtin importer.
+ import logging
+ import os
+ import sys
++import tokenize
+ from nose.config import Config
+-
+-from imp import find_module, load_module, acquire_lock, release_lock
++from importlib import _imp
++from importlib import machinery
+ 
+ log = logging.getLogger(__name__)
+ 
+@@ -20,6 +21,244 @@ except AttributeError:
+         return (os.path.normcase(os.path.realpath(src)) ==
+                 os.path.normcase(os.path.realpath(dst)))
+ 
++################################################################################
++# BEGIN IMPORTLIB SHIMS
++################################################################################
++
++# Adapted from the CPython 3.11 imp.py code.
++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation; All Rights Reserved
++# Originally licensed under the PSLv2 (see LICENSE.cpython) and incorporated under the LGPL 2.1 (see lgpl.txt).
++
++try:
++    from _imp import create_dynamic
++except ImportError:
++    # Platform doesn't support dynamic loading.
++    create_dynamic = None
++
++from importlib._bootstrap import _ERR_MSG, _exec, _load, _builtin_from_name
++from importlib._bootstrap_external import SourcelessFileLoader
++
++from importlib import machinery
++from importlib import util
++import importlib
++import os
++import sys
++import tokenize
++import types
++
++
++SEARCH_ERROR = 0
++PY_SOURCE = 1
++PY_COMPILED = 2
++C_EXTENSION = 3
++PY_RESOURCE = 4
++PKG_DIRECTORY = 5
++C_BUILTIN = 6
++PY_FROZEN = 7
++PY_CODERESOURCE = 8
++IMP_HOOK = 9
++
++
++def get_suffixes():
++    extensions = [(s, 'rb', C_EXTENSION) for s in machinery.EXTENSION_SUFFIXES]
++    source = [(s, 'r', PY_SOURCE) for s in machinery.SOURCE_SUFFIXES]
++    bytecode = [(s, 'rb', PY_COMPILED) for s in machinery.BYTECODE_SUFFIXES]
++
++    return extensions + source + bytecode
++
++
++class _HackedGetData:
++
++    """Compatibility support for 'file' arguments of various load_*()
++    functions."""
++
++    def __init__(self, fullname, path, file=None):
++        super().__init__(fullname, path)
++        self.file = file
++
++    def get_data(self, path):
++        """Gross hack to contort loader to deal w/ load_*()'s bad API."""
++        if self.file and path == self.path:
++            # The contract of get_data() requires us to return bytes. Reopen the
++            # file in binary mode if needed.
++            if not self.file.closed:
++                file = self.file
++                if 'b' not in file.mode:
++                    file.close()
++            if self.file.closed:
++                self.file = file = open(self.path, 'rb')
++
++            with file:
++                return file.read()
++        else:
++            return super().get_data(path)
++
++
++class _LoadSourceCompatibility(_HackedGetData, machinery.SourceFileLoader):
++
++    """Compatibility support for implementing load_source()."""
++
++
++def load_source(name, pathname, file=None):
++    loader = _LoadSourceCompatibility(name, pathname, file)
++    spec = util.spec_from_file_location(name, pathname, loader=loader)
++    if name in sys.modules:
++        module = _exec(spec, sys.modules[name])
++    else:
++        module = _load(spec)
++    # To allow reloading to potentially work, use a non-hacked loader which
++    # won't rely on a now-closed file object.
++    module.__loader__ = machinery.SourceFileLoader(name, pathname)
++    module.__spec__.loader = module.__loader__
++    return module
++
++
++class _LoadCompiledCompatibility(_HackedGetData, SourcelessFileLoader):
++
++    """Compatibility support for implementing load_compiled()."""
++
++
++def load_compiled(name, pathname, file=None):
++    loader = _LoadCompiledCompatibility(name, pathname, file)
++    spec = util.spec_from_file_location(name, pathname, loader=loader)
++    if name in sys.modules:
++        module = _exec(spec, sys.modules[name])
++    else:
++        module = _load(spec)
++    # To allow reloading to potentially work, use a non-hacked loader which
++    # won't rely on a now-closed file object.
++    module.__loader__ = SourcelessFileLoader(name, pathname)
++    module.__spec__.loader = module.__loader__
++    return module
++
++
++def load_package(name, path):
++    if os.path.isdir(path):
++        extensions = (machinery.SOURCE_SUFFIXES[:] +
++                      machinery.BYTECODE_SUFFIXES[:])
++        for extension in extensions:
++            init_path = os.path.join(path, '__init__' + extension)
++            if os.path.exists(init_path):
++                path = init_path
++                break
++        else:
++            raise ValueError('{!r} is not a package'.format(path))
++    spec = util.spec_from_file_location(name, path,
++                                        submodule_search_locations=[])
++    if name in sys.modules:
++        return _exec(spec, sys.modules[name])
++    else:
++        return _load(spec)
++
++
++def load_module(name, file, filename, details):
++    """
++
++    Load a module, given information returned by find_module().
++
++    The module name must include the full package name, if any.
++
++    """
++    suffix, mode, type_ = details
++    if mode and (not mode.startswith('r') or '+' in mode):
++        raise ValueError('invalid file open mode {!r}'.format(mode))
++    elif file is None and type_ in {PY_SOURCE, PY_COMPILED}:
++        msg = 'file object required for import (type code {})'.format(type_)
++        raise ValueError(msg)
++    elif type_ == PY_SOURCE:
++        return load_source(name, filename, file)
++    elif type_ == PY_COMPILED:
++        return load_compiled(name, filename, file)
++    elif type_ == PKG_DIRECTORY:
++        return load_package(name, filename)
++    elif type_ == C_BUILTIN:
++        return init_builtin(name)
++    elif type_ == PY_FROZEN:
++        return _imp.init_frozen(name)
++    else:
++        msg =  "Don't know how to import {} (type code {})".format(name, type_)
++        raise ImportError(msg, name=name)
++
++
++def find_module(name, path=None):
++    """
++
++    Search for a module.
++
++    If path is omitted or None, search for a built-in, frozen or special
++    module and continue search in sys.path. The module name cannot
++    contain '.'; to search for a submodule of a package, pass the
++    submodule name and the package's __path__.
++
++    """
++    if not isinstance(name, str):
++        raise TypeError("'name' must be a str, not {}".format(type(name)))
++    elif not isinstance(path, (type(None), list)):
++        # Backwards-compatibility
++        raise RuntimeError("'path' must be None or a list, "
++                           "not {}".format(type(path)))
++
++    if path is None:
++        if _imp.is_builtin(name):
++            return None, None, ('', '', C_BUILTIN)
++        elif _imp.is_frozen(name):
++            return None, None, ('', '', PY_FROZEN)
++        else:
++            path = sys.path
++
++    for entry in path:
++        package_directory = os.path.join(entry, name)
++        for suffix in ['.py', machinery.BYTECODE_SUFFIXES[0]]:
++            package_file_name = '__init__' + suffix
++            file_path = os.path.join(package_directory, package_file_name)
++            if os.path.isfile(file_path):
++                return None, package_directory, ('', '', PKG_DIRECTORY)
++        for suffix, mode, type_ in get_suffixes():
++            file_name = name + suffix
++            file_path = os.path.join(entry, file_name)
++            if os.path.isfile(file_path):
++                break
++        else:
++            continue
++        break  # Break out of outer loop when breaking out of inner loop.
++    else:
++        raise ImportError(_ERR_MSG.format(name), name=name)
++
++    encoding = None
++    if 'b' not in mode:
++        with open(file_path, 'rb') as file:
++            encoding = tokenize.detect_encoding(file.readline)[0]
++    file = open(file_path, mode, encoding=encoding)
++    return file, file_path, (suffix, mode, type_)
++
++
++def reload(module):
++    """
++
++    Reload the module and return it.
++
++    The module must have been successfully imported before.
++
++    """
++    return importlib.reload(module)
++
++
++def init_builtin(name):
++    """
++
++    Load and return a built-in module by name, or None is such module doesn't
++    exist
++    """
++    try:
++        return _builtin_from_name(name)
++    except ImportError:
++        return None
++
++
++################################################################################
++# END IMPORTLIB SHIMS
++################################################################################
++
+ 
+ class Importer(object):
+     """An importer class that does only path-specific imports. That
+@@ -73,7 +312,7 @@ class Importer(object):
+             else:
+                 part_fqname = "%s.%s" % (part_fqname, part)
+             try:
+-                acquire_lock()
++                _imp.acquire_lock()
+                 log.debug("find module part %s (%s) in %s",
+                           part, part_fqname, path)
+                 fh, filename, desc = find_module(part, path)
+@@ -95,7 +334,7 @@ class Importer(object):
+             finally:
+                 if fh:
+                     fh.close()
+-                release_lock()
++                _imp.release_lock()
+             if parent:
+                 setattr(parent, part, mod)
+             if hasattr(mod, '__path__'):
+diff --git a/nose/result.py b/nose/result.py
+index f974a14..228a42c 100644
+--- a/nose/result.py
++++ b/nose/result.py
+@@ -13,7 +13,7 @@ try:
+     # 2.7+
+     from unittest.runner import _TextTestResult
+ except ImportError:
+-    from unittest import _TextTestResult
++    from unittest import TextTestResult as _TextTestResult
+ from nose.config import Config
+ from nose.util import isclass, ln as _ln # backwards compat
+ 
diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix
index 89395ed8ae7f..1a58b6998aef 100644
--- a/pkgs/development/python-modules/nose/default.nix
+++ b/pkgs/development/python-modules/nose/default.nix
@@ -5,7 +5,7 @@
   isPy3k,
   isPyPy,
   python,
-  pythonAtLeast,
+  python312,
   coverage,
   setuptools,
 }:
@@ -15,9 +15,6 @@ buildPythonPackage rec {
   pname = "nose";
   pyproject = true;
 
-  # unmaintained, relies on the imp module
-  disabled = pythonAtLeast "3.12";
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
@@ -25,7 +22,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  # 2to3 was removed in setuptools 58
+  patches = lib.optional isPy3k [ ./0001-nose-python-3.12-fixes.patch ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "'use_2to3': True," ""
@@ -34,8 +32,9 @@ buildPythonPackage rec {
       --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3"
   '';
 
-  preBuild = lib.optionalString (isPy3k) ''
-    ${python.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests
+  # 2to3 is removed from Python 3.13, so always use Python 3.12 2to3 for now.
+  preBuild = lib.optionalString isPy3k ''
+    ${python312.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests
   '';
 
   propagatedBuildInputs = [ coverage ];

From bf05070350f5ae4a26969d35b3b6e8877a8de155 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:22:40 -0400
Subject: [PATCH 184/319] hydrus: re-enable tests on 3.12

---
 pkgs/applications/graphics/hydrus/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 7da1858cb542..51a11528cb8f 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -82,9 +82,6 @@ python3Packages.buildPythonPackage rec {
     twisted
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = with python3Packages; [
     nose
     mock

From 79e06f0f1a4b0f7f5254d229a35cd0323f28582a Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:23:17 -0400
Subject: [PATCH 185/319] python312Packages.actdiag: re-enable tests

---
 pkgs/development/python-modules/actdiag/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix
index cf84a064b54f..effba4c188bb 100644
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -27,9 +27,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ blockdiag ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     pytestCheckHook

From 8f374ae5635a9c3f0be6f72a35c5baaf43d65a99 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:23:36 -0400
Subject: [PATCH 186/319] python312Packages.biopandas: re-enable tests

---
 pkgs/development/python-modules/biopandas/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix
index be59f3638d91..1102457cb94d 100644
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@@ -35,10 +35,6 @@ buildPythonPackage rec {
     looseversion
   ];
 
-  # tests rely on nose
-  # resolved in 0.5.1: https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     pytestCheckHook

From 6f959090a1a5a628fff5bcf3264508a47ad9c0da Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:24:11 -0400
Subject: [PATCH 187/319] python312Packages.blockdiag: re-enable tests

---
 pkgs/development/python-modules/blockdiag/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index 8b43fd2c9065..8b0742ed77f5 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -48,9 +48,6 @@ buildPythonPackage rec {
     webcolors
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     ephem
     nose

From 095a91716bbe5f4f5cfd01c708ce2dbbff80c87b Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:24:40 -0400
Subject: [PATCH 188/319] python312Packages.hkdf: re-enable tests

---
 pkgs/development/python-modules/hkdf/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix
index 176322d93221..f04e486fd73c 100644
--- a/pkgs/development/python-modules/hkdf/default.nix
+++ b/pkgs/development/python-modules/hkdf/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   nose,
   setuptools,
 }:
@@ -23,9 +22,6 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "hkdf" ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   checkPhase = ''

From 7328dcbe94711a4e7f2d96eb04324eaa972e3342 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:24:54 -0400
Subject: [PATCH 189/319] python312Packages.lockfile: re-enable tests

---
 pkgs/development/python-modules/lockfile/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix
index 0a0b906e9122..5423a1abb300 100644
--- a/pkgs/development/python-modules/lockfile/default.nix
+++ b/pkgs/development/python-modules/lockfile/default.nix
@@ -5,7 +5,6 @@
   setuptools,
   pbr,
   nose,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -23,9 +22,6 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   checkPhase = ''

From 04332cda7f1319f98c78953c2c995b8b859a2fbe Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:25:04 -0400
Subject: [PATCH 190/319] python312Packages.nwdiag: re-enable tests

---
 pkgs/development/python-modules/nwdiag/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix
index dc2fd74fbef5..ac121549596e 100644
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -27,9 +27,6 @@ buildPythonPackage rec {
 
   dependencies = [ blockdiag ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     pytestCheckHook

From d65482c4601fdb42ee9e084ae03bb31d86805d03 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:25:15 -0400
Subject: [PATCH 191/319] python312Packages.pprintpp: re-enable tests

---
 pkgs/development/python-modules/pprintpp/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix
index d7da3d5511e8..904e067b6c0a 100644
--- a/pkgs/development/python-modules/pprintpp/default.nix
+++ b/pkgs/development/python-modules/pprintpp/default.nix
@@ -38,9 +38,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     parameterized

From 9bdacf3e43e7b95c68a58c2120bc03120a6ddd47 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:25:27 -0400
Subject: [PATCH 192/319] python312Packages.pydy: re-enable tests

---
 pkgs/development/python-modules/pydy/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix
index 1c858f5d0291..e9b916c888e2 100644
--- a/pkgs/development/python-modules/pydy/default.nix
+++ b/pkgs/development/python-modules/pydy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   numpy,
   scipy,
   sympy,
@@ -29,9 +28,6 @@ buildPythonPackage rec {
     sympy
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     cython

From b43e2adfd56ff631c2b9ad9cc92ffa0e20780af0 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:25:40 -0400
Subject: [PATCH 193/319] python312Packages.pypass: re-enable tests

---
 pkgs/development/python-modules/pypass/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix
index 3a2fc269ceda..a13d4ea19720 100644
--- a/pkgs/development/python-modules/pypass/default.nix
+++ b/pkgs/development/python-modules/pypass/default.nix
@@ -55,8 +55,6 @@ buildPythonPackage rec {
     pexpect
   ];
 
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   # Configuration so that the tests work

From 7df95dce170b5a9fd2a16a63138f7c955cc2c716 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:25:53 -0400
Subject: [PATCH 194/319] python312Packages.pytimeparse: re-enable tests

---
 pkgs/development/python-modules/pytimeparse/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix
index 819bc5875c6f..03b0bc996cdf 100644
--- a/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/pkgs/development/python-modules/pytimeparse/default.nix
@@ -21,9 +21,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   pythonImportsCheck = [ "pytimeparse" ];

From cadf0bfb924b32f63cf27b7778a9ac92237b61c7 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:26:13 -0400
Subject: [PATCH 195/319] python312Packages.seqdiag: re-enable tests

---
 pkgs/development/python-modules/seqdiag/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 79d575a9fa51..d205c2e986a3 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -27,9 +27,6 @@ buildPythonPackage rec {
 
   dependencies = [ blockdiag ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     pytestCheckHook

From 6efa41df1f00902e25bddf88ac8eabfe178f75ca Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:26:35 -0400
Subject: [PATCH 196/319] python312Packages.sphinx-rtd-dark-mode: re-enable
 tests

---
 .../python-modules/sphinx-rtd-dark-mode/default.nix            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
index d3b4bf7f4104..67d6794ee1d5 100644
--- a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
+++ b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
@@ -25,9 +25,6 @@ buildPythonPackage rec {
 
   dependencies = [ sphinx-rtd-theme ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     sphinx

From b25926136ea45e080bf61fc67afe1a72b8d57b13 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:26:52 -0400
Subject: [PATCH 197/319] python312Packages.uvcclient: re-enable tests

---
 pkgs/development/python-modules/uvcclient/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix
index c884e3a02926..374bbdde7a4e 100644
--- a/pkgs/development/python-modules/uvcclient/default.nix
+++ b/pkgs/development/python-modules/uvcclient/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   nose,
   mock,
 }:
@@ -24,9 +23,6 @@ buildPythonPackage rec {
       --replace-fail "assertEquals" "assertEqual"
   '';
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     mock

From 599e471d78801f95ccd2c424a37e76ce177e50b9 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 9 Jul 2024 19:27:02 -0400
Subject: [PATCH 198/319] python312Packages.xlwt: re-enable tests

---
 pkgs/development/python-modules/xlwt/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
index 12dfb75ce341..e4f182143129 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -21,9 +21,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  # tests rely on nose, archived in 2020
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   checkPhase = ''

From bae30f206d83e0940cdd3b416b615dc7157b1a2e Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Wed, 3 Jul 2024 23:18:32 +0000
Subject: [PATCH 199/319] darwin.xnu: use unwrapped clang for MIGCC

the mig header build requires a 32 bit arch but the wrapped compiler
specifies `-arch 64-bit-arch` on the command line causing compile
failures. This was worked around for aarch64 by patching out the 32 bit
arch but that ignores the comment and the code saying that 32 bit arch
is required and thus will generate the wrong sizes for the structures in
the headers. Using the unwrapped clang mig can pass whatever arch it
desires.
---
 .../darwin/apple-source-releases/xnu/default.nix         | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index 2820df1db1b1..1ba9a278ecc5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -44,8 +44,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) (
       --replace " -o 0" "" \
       --replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \
       --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \
-      --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' \
-      --replace 'MACHINE_ARCH=armv7' 'MACHINE_ARCH=arm64' # this might break the comments saying 32-bit is required
+      --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR'
 
     patchShebangs .
   '' + lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11") ''
@@ -72,11 +71,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) (
   HOST_FLEX = "flex";
   HOST_BISON = "bison";
   HOST_GM4 = "m4";
-  # use unwrapped clang to generate headers because wrapper is not compatible with a 32 bit -arch.
-  # aarch64 should likely do this as well and remove the --replace MACHINE_ARCH above
-  MIGCC = if stdenv.isx86_64 && lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11"
-    then "${lib.getBin pkgsBuildBuild.stdenv.cc.cc}/bin/clang"
-    else "cc";
+  MIGCC = "${lib.getBin pkgsBuildBuild.stdenv.cc.cc}/bin/clang";
   ARCHS = arch;
   ARCH_CONFIGS = arch;
 

From 0979f40aeb6da0a027ece586055c9b599cae5f96 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 9 May 2024 20:16:19 -0400
Subject: [PATCH 200/319] cgoban: use jdk17 instead of adoptopenjdk-bin

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

diff --git a/pkgs/games/cgoban/default.nix b/pkgs/games/cgoban/default.nix
index dbd14127ff67..5b453b728d4c 100644
--- a/pkgs/games/cgoban/default.nix
+++ b/pkgs/games/cgoban/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , writers
-, adoptopenjdk-jre-bin
+, temurin-jre-bin-17
 , fetchurl
 , makeWrapper
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "cgoban";
   version = "3.5.144";
 
-  nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ];
+  nativeBuildInputs = [ temurin-jre-bin-17 makeWrapper ];
 
   src = fetchurl {
     url = "https://web.archive.org/web/20240314222506/https://files.gokgs.com/javaBin/cgoban.jar";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     install -D $src $out/lib/cgoban.jar
-    makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar"
+    makeWrapper ${temurin-jre-bin-17}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar"
     runHook postInstall
   '';
 
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.free;
     maintainers = with maintainers; [ savannidgerinel ];
-    platforms = adoptopenjdk-jre-bin.meta.platforms;
+    platforms = temurin-jre-bin-17.meta.platforms;
   };
 }

From 535dd96948f070e4f61735c89472db2389f04a32 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 9 May 2024 20:47:39 -0400
Subject: [PATCH 201/319] openjdk: remove adoptopenjdk-bin, openjdk
 12/13/14/15/16

AdoptOpenJDK is a long-deprecated project, having been superceded by
Eclipse Temurin quite a while ago. Additionally, after running the
generate sources command, many of its subpackages fail to evaluate due
to missing binaries for versions the package expects. Because everything
provided by AdoptOpenJDK is either long-deprecated or also provided by
Temurin, its removal should not cause many problems.

By the same token, OpenJDK 12, 13, 14, 15, and 16 have also all been long
deemed EOL, and 13/14 are both actively broken and fail to build. These
packages, and their associated (and unnecessary) bootstrap chain are a
major factor in the tech debt of OpenJDK as an ecosystem in Nixpkgs.

OpenJDK 16 was the only user of OpenJFX 15, so it has also been removed.

By removing these packages, OpenJDK should hopefully be more
maintainable into the future.
---
 .../adoptopenjdk-bin/generate-sources.py      |   68 -
 .../adoptopenjdk-bin/jdk-darwin-base.nix      |   66 -
 .../adoptopenjdk-bin/jdk-linux-base.nix       |  123 --
 .../adoptopenjdk-bin/jdk11-darwin.nix         |   11 -
 .../adoptopenjdk-bin/jdk11-linux.nix          |   12 -
 .../adoptopenjdk-bin/jdk13-darwin.nix         |   11 -
 .../adoptopenjdk-bin/jdk13-linux.nix          |   12 -
 .../adoptopenjdk-bin/jdk14-darwin.nix         |   11 -
 .../adoptopenjdk-bin/jdk14-linux.nix          |   12 -
 .../adoptopenjdk-bin/jdk15-darwin.nix         |   11 -
 .../adoptopenjdk-bin/jdk15-linux.nix          |   12 -
 .../adoptopenjdk-bin/jdk16-darwin.nix         |   11 -
 .../adoptopenjdk-bin/jdk16-linux.nix          |   12 -
 .../adoptopenjdk-bin/jdk17-darwin.nix         |    9 -
 .../adoptopenjdk-bin/jdk17-linux.nix          |   10 -
 .../adoptopenjdk-bin/jdk8-darwin.nix          |   11 -
 .../compilers/adoptopenjdk-bin/jdk8-linux.nix |   12 -
 .../compilers/adoptopenjdk-bin/sources.json   | 1192 -----------------
 .../compilers/adoptopenjdk-bin/sources.nix    |    1 -
 pkgs/development/compilers/openjdk/12.nix     |  172 ---
 pkgs/development/compilers/openjdk/13.nix     |  177 ---
 pkgs/development/compilers/openjdk/14.nix     |  173 ---
 pkgs/development/compilers/openjdk/15.nix     |  176 ---
 pkgs/development/compilers/openjdk/16.nix     |  181 ---
 .../compilers/openjdk/openjfx/15.nix          |  129 --
 pkgs/top-level/aliases.nix                    |   20 +
 pkgs/top-level/all-packages.nix               |   28 +-
 pkgs/top-level/java-packages.nix              |  140 +-
 28 files changed, 26 insertions(+), 2777 deletions(-)
 delete mode 100755 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.json
 delete mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.nix
 delete mode 100644 pkgs/development/compilers/openjdk/12.nix
 delete mode 100644 pkgs/development/compilers/openjdk/13.nix
 delete mode 100644 pkgs/development/compilers/openjdk/14.nix
 delete mode 100644 pkgs/development/compilers/openjdk/15.nix
 delete mode 100644 pkgs/development/compilers/openjdk/16.nix
 delete mode 100644 pkgs/development/compilers/openjdk/openjfx/15.nix

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
deleted file mode 100755
index 5ff56b2bd299..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
-
-import json
-import re
-import requests
-import sys
-
-# openjdk15 is only for bootstrapping openjdk
-releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17")
-oses = ("mac", "linux", "alpine_linux")
-types = ("jre", "jdk")
-impls = ("hotspot", "openj9")
-
-arch_to_nixos = {
-    "x64": ("x86_64",),
-    "aarch64": ("aarch64",),
-    "arm": ("armv6l", "armv7l"),
-    "ppc64le": ("powerpc64le",),
-}
-
-def get_sha256(url):
-    resp = requests.get(url)
-    if resp.status_code != 200:
-        print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr)
-        sys.exit(1)
-    return resp.text.strip().split(" ")[0]
-
-def generate_sources(release, assets):
-    out = {}
-    for asset in assets:
-        if asset["os"] not in oses: continue
-        if asset["binary_type"] not in types: continue
-        if asset["openjdk_impl"] not in impls: continue
-        if asset["heap_size"] != "normal": continue
-        if asset["architecture"] not in arch_to_nixos: continue
-
-        # examples: 11.0.1+13, 8.0.222+10
-        version, build = asset["version_data"]["semver"].split("+")
-
-        type_map = out.setdefault(asset["os"], {})
-        impl_map = type_map.setdefault(asset["binary_type"], {})
-        arch_map = impl_map.setdefault(asset["openjdk_impl"], {
-            "packageType": asset["binary_type"],
-            "vmType": asset["openjdk_impl"],
-        })
-
-        for nixos_arch in arch_to_nixos[asset["architecture"]]:
-            arch_map[nixos_arch] = {
-                "url": asset["binary_link"],
-                "sha256": get_sha256(asset["checksum_link"]),
-                "version": version,
-                "build": build,
-            }
-
-    return out
-
-out = {}
-for release in releases:
-    resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
-    if resp.status_code != 200:
-        print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
-        sys.exit(1)
-    out[release] = generate_sources(release, resp.json())
-
-with open("sources.json", "w") as f:
-    json.dump(out, f, indent=2, sort_keys=True)
-    f.write('\n')
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
deleted file mode 100644
index 68d33b657c68..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ sourcePerArch, knownVulnerabilities ? [] }:
-
-{ swingSupport ? true # not used for now
-, lib, stdenv
-, fetchurl
-, setJavaClassPath
-}:
-
-assert (stdenv.isDarwin && stdenv.isx86_64);
-
-let cpuName = stdenv.hostPlatform.parsed.cpu.name;
-    result = stdenv.mkDerivation {
-  pname = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
-  version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
-
-  src = fetchurl {
-    inherit (sourcePerArch.${cpuName}) url sha256;
-  };
-
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase = ''
-    cd ..
-
-    mv $sourceRoot $out
-
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/
-
-    rm -rf $out/Home/demo
-
-    # Remove some broken manpages.
-    rm -rf $out/Home/man/ja*
-
-    ln -s $out/Contents/Home/* $out/
-
-    # Propagate the setJavaClassPath setup hook from the JDK so that
-    # any package that depends on the JDK has $CLASSPATH set up
-    # properly.
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <<EOF >> $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-  '';
-
-  # FIXME: use multiple outputs or return actual JRE package
-  passthru.jre = result;
-
-  passthru.home = result;
-
-  meta = with lib; {
-    license = licenses.gpl2Classpath;
-    description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
-    maintainers = with lib.maintainers; [ taku0 ];
-    inherit knownVulnerabilities;
-    mainProgram = "java";
-  };
-
-}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
deleted file mode 100644
index 712efc2f6e4b..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ sourcePerArch, knownVulnerabilities ? [] }:
-
-{ stdenv
-, lib
-, fetchurl
-, autoPatchelfHook
-, makeWrapper
-, setJavaClassPath
-# minimum dependencies
-, alsa-lib
-, fontconfig
-, freetype
-, libffi
-, xorg
-, zlib
-# runtime dependencies
-, cups
-# runtime dependencies for GTK+ Look and Feel
-, gtkSupport ? true
-, cairo
-, glib
-, gtk3
-}:
-
-let
-  cpuName = stdenv.hostPlatform.parsed.cpu.name;
-  runtimeDependencies = [
-    cups
-  ] ++ lib.optionals gtkSupport [
-    cairo glib gtk3
-  ];
-  runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
-in
-
-let result = stdenv.mkDerivation rec {
-  pname = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
-
-  version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
-
-  src = fetchurl {
-    inherit (sourcePerArch.${cpuName}) url sha256;
-  };
-
-  buildInputs = [
-    alsa-lib # libasound.so wanted by lib/libjsound.so
-    fontconfig
-    freetype
-    stdenv.cc.cc.lib # libstdc++.so.6
-    xorg.libX11
-    xorg.libXext
-    xorg.libXi
-    xorg.libXrender
-    xorg.libXtst
-    zlib
-  ] ++ lib.optional stdenv.isAarch32 libffi;
-
-  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
-
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase = ''
-    cd ..
-
-    mv $sourceRoot $out
-
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/include/linux/*_md.h $out/include/
-
-    rm -rf $out/demo
-
-    # Remove some broken manpages.
-    rm -rf $out/man/ja*
-
-    # Remove embedded freetype to avoid problems like
-    # https://github.com/NixOS/nixpkgs/issues/57733
-    find "$out" -name 'libfreetype.so*' -delete
-
-    # Propagate the setJavaClassPath setup hook from the JDK so that
-    # any package that depends on the JDK has $CLASSPATH set up
-    # properly.
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <<EOF >> "$out/nix-support/setup-hook"
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-
-    # We cannot use -exec since wrapProgram is a function but not a command.
-    #
-    # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
-    # breaks building OpenJDK (#114495).
-    for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
-      if patchelf --print-interpreter "$bin" &> /dev/null; then
-        wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
-      fi
-    done
-  '';
-
-  preFixup = ''
-    find "$out" -name libfontmanager.so -exec \
-      patchelf --add-needed libfontconfig.so {} \;
-  '';
-
-  # FIXME: use multiple outputs or return actual JRE package
-  passthru.jre = result;
-
-  passthru.home = result;
-
-  meta = with lib; {
-    license = licenses.gpl2Classpath;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
-    description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
-    maintainers = with lib.maintainers; [ taku0 ];
-    inherit knownVulnerabilities;
-    mainProgram = "java";
-  };
-
-}; in result
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
deleted file mode 100644
index f4f5108df437..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
deleted file mode 100644
index 6d5b1b036e5b..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.hotspot; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.openj9; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.openj9; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
deleted file mode 100644
index 87beaf8ddaf8..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
deleted file mode 100644
index e6c000201415..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
deleted file mode 100644
index a4d5b1fc432e..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
deleted file mode 100644
index 4d357969f0ae..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
deleted file mode 100644
index 422e5f21e96c..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
deleted file mode 100644
index 47bd2a5c9f9f..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
deleted file mode 100644
index 4eef76cb6312..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
deleted file mode 100644
index 873e0ce3549d..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
deleted file mode 100644
index b79b39902226..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.hotspot; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
deleted file mode 100644
index b8bb1cbf2bab..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jre.hotspot; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
deleted file mode 100644
index 56028d7f25e4..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
deleted file mode 100644
index ee8226f6903d..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.hotspot; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.openj9; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.openj9; };
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
deleted file mode 100644
index 18b8e683bc94..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ /dev/null
@@ -1,1192 +0,0 @@
-{
-  "openjdk11": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "797cee6b9f6e18bcc026ee9dcebbce81d62ca897038402d247630b25d41efe15",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "80a0c03f0b603d6008e29c651f884878743fcaa90fc05aef15f3411749da94e7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      }
-    }
-  },
-  "openjdk13": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "8.1",
-            "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "armv6l": {
-            "build": "8.1",
-            "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "armv7l": {
-            "build": "8.1",
-            "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "fb3362e34aac091a4682394d20dcdc3daea51995d369d62c28424573e0fc04aa",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "f71513e525172dfef695b7c27b25e151f232e05b2281648c2b794650c4970832",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "8.1",
-            "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "43d6fb71bdf7b6ad9295087c46dfc9b00bf26db1b5cdcff0c418cbe43b49904a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_ppc64le_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "7bf8dc4c3b95e87b154f7bc2f9388a6539413fe76d49b362bba878217ccb7ed7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      }
-    }
-  },
-  "openjdk14": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "12",
-            "sha256": "ee87e9f03b1fbe6f328429b78fe1a9f44900026d220c90dfd747fe0bcd62d904",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv6l": {
-            "build": "12",
-            "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv7l": {
-            "build": "12",
-            "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "465a3b8e931896b8d95e452d479615c4bf543535c05b6ea246323ae114e67d7d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "177fd161ae14df92203d70cd618559daf889ec0c172d6ee615859352f68a2371",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "12",
-            "sha256": "2b749ceead19d68dd7e3c28b143dc4f94bb0916378a98b7346e851318ea4da84",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_aarch64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv6l": {
-            "build": "12",
-            "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv7l": {
-            "build": "12",
-            "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "0f96998be562cfbe8a4114581349dbd2609d0a23091e538fe142dcd9c83e70cf",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_ppc64le_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "1107845947da56e6bdad0da0b79210a079a74ec5c806f815ec5db9d09e1a9236",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "ad7a55a3669878c0c7d7c66faafe7c626d4341374719b6fdd81d2986c6e80945",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "3a137146a7b0bd8b029e72beb37c5fbb09dcfb9e33a10125076fff1555227cfd",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "09b7e6ab5d5eb4b73813f4caa793a0b616d33794a17988fa6a6b7c972e8f3dd3",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "95e6abcc12dde676ccd5ba65ab86f06ddaa22749dde00e31f4c6d3ea95277359",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "e8b5196de8ecb2b136a28494c2888784b9d9e22e29d2c38528892fb7d0c95260",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_mac_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "2562a442d7278409358f474071db34df4ba9c555925f28d0270139f97133c8d5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      }
-    }
-  },
-  "openjdk15": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "79f657141f1cd0e4a70d041b9215b8b00140d479ce73ed71bc4f3dd015157958",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      }
-    }
-  },
-  "openjdk16": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "5f10ffc12056b735f5fe505ec6c481fff94de27e80c1d77ea9f9e2830669cc1d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_alpine-linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "armv6l": {
-            "build": "9",
-            "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "armv7l": {
-            "build": "9",
-            "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "6d4241c6ede2167fb71bd57f7a770a74564ee007c06bcae98e1abc3c1de4756f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "33eeccbeea75e70b09610ba12e9591386a0e42248525b8358c9ae683bce82779",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_mac_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "f57a6f04cf21a8470bb6f9488c57031d89db73c8b24997d74812855372f4e6b8",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      }
-    }
-  },
-  "openjdk17": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      }
-    }
-  },
-  "openjdk8": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "10",
-            "sha256": "b168245ddc18b85135c15ed6baea5cbcc06192b49af04dcfa698458373efc061",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "10",
-            "sha256": "bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "10",
-            "sha256": "f87f90673e25c3ce9e868e96a6059b22665f12d05e389813f75dfbc95d970393",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "10",
-            "sha256": "b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "d262bc226895e80b7e80d61905e65fe043ca0a3e3b930f7b88ddfacb8835e939",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "50cbc5ef48d0167d649d3ba2c2b8d71553541bffb98914418f4a26e0c5f69aca",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.nix b/pkgs/development/compilers/adoptopenjdk-bin/sources.nix
deleted file mode 100644
index 0d5dd3c6cd48..000000000000
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.nix
+++ /dev/null
@@ -1 +0,0 @@
-builtins.fromJSON (builtins.readFile ./sources.json)
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
deleted file mode 100644
index 3f7213ea8ff6..000000000000
--- a/pkgs/development/compilers/openjdk/12.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  major = "12";
-  update = ".0.2";
-  build = "ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}-${build}";
-
-    src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-      # Fix gnumake 4.3 incompatibility
-      (fetchpatch {
-        url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
-        sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk10.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ];
-
-    NIX_LDFLAGS = lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ];
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = import ./meta.nix lib version;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
deleted file mode 100644
index 292470256d53..000000000000
--- a/pkgs/development/compilers/openjdk/13.nix
+++ /dev/null
@@ -1,177 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  major = "13";
-  update = ".0.2";
-  build = "-ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk13-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}${build}";
-
-    src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-      # Fix gnumake 4.3 incompatibility
-      (fetchpatch {
-        url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
-        sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = (import ./meta.nix lib version) // { broken = true; };
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
deleted file mode 100644
index 5d540b6fe84f..000000000000
--- a/pkgs/development/compilers/openjdk/14.nix
+++ /dev/null
@@ -1,173 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  major = "14";
-  update = ".0.2";
-  build = "-ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk14-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}${build}";
-
-    src = fetchurl {
-      url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = (import ./meta.nix lib version) // { broken = true; };
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
deleted file mode 100644
index 4fc475edba64..000000000000
--- a/pkgs/development/compilers/openjdk/15.nix
+++ /dev/null
@@ -1,176 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  version = {
-    major = "15";
-    update = ".0.1";
-    build = "-ga";
-    __toString = self: "${self.major}${self.update}${self.build}";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk15-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    inherit version;
-
-    src = fetchurl {
-      url = "https://hg.openjdk.java.net/jdk-updates/jdk${version.major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];
-    buildInputs = [
-      cpio perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    pos = builtins.unsafeGetAttrPos "major" version;
-    meta = import ./meta.nix lib version.major;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
deleted file mode 100644
index 357cbb849aba..000000000000
--- a/pkgs/development/compilers/openjdk/16.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
-, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
-, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
-, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGtk ? true, gtk3, glib
-}:
-
-let
-  version = {
-    feature = "16";
-    interim = ".0.2-ga";
-    build = "1";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk16-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${version.feature}${version.interim}+${version.build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jdk${version.feature}u";
-      rev = "jdk-${version.feature}${version.interim}";
-      # rev = "jdk-${version.feature}${version.interim}+${version.build}";
-      sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGtk) [
-      gtk3 glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-      ./fix-glibc-2.34.patch
-    ] ++ lib.optionals (!headless && enableGtk) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-build=${version.build}"
-      "--with-version-opt=nixos"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGtk) [
-      "-lgtk-3" "-lgio-2.0"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    pos = builtins.unsafeGetAttrPos "feature" version;
-    meta = import ./meta.nix lib version.feature;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
deleted file mode 100644
index 77c8e4678d6c..000000000000
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6
-, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
-, ffmpeg_4-headless, python3, ruby
-, withMedia ? true
-, withWebKit ? false
-}:
-
-let
-  major = "15";
-  update = ".0.1";
-  build = "+1";
-  repover = "${major}${update}${build}";
-  gradle_ = (gradle_6.override {
-    java = openjdk11_headless;
-  });
-
-  makePackage = args: stdenv.mkDerivation ({
-    version = "${major}${update}${build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jfx";
-      rev = repover;
-      sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
-    };
-
-    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];
-    nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
-
-    dontUseCmakeConfigure = true;
-
-    config = writeText "gradle.properties" (''
-      CONF = Release
-      JDK_HOME = ${openjdk11_headless.home}
-    '' + args.gradleProperties or "");
-
-    env.NIX_CFLAGS_COMPILE = toString [
-      #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
-      "-DGLIB_DISABLE_DEPRECATION_WARNINGS"
-
-      # gstreamer workaround for -fno-common toolchains:
-      #   ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
-      #     `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
-      "-fcommon"
-    ];
-
-    buildPhase = ''
-      runHook preBuild
-
-      export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
-      export GRADLE_USER_HOME=$(mktemp -d)
-      ln -s $config gradle.properties
-      export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
-      gradle --no-daemon $gradleFlags sdk
-
-      runHook postBuild
-    '';
-  } // args);
-
-  # Fake build to pre-download deps into fixed-output derivation.
-  # We run nearly full build because I see no other way to download everything that's needed.
-  # Anyone who knows a better way?
-  deps = makePackage {
-    pname = "openjfx-deps";
-
-    # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
-    installPhase = ''
-      find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \
-        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
-        | sh
-      rm -rf $out/tmp
-    '';
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI=";
-  };
-
-in makePackage {
-  pname = "openjfx-modular-sdk";
-
-  gradleProperties = ''
-    COMPILE_MEDIA = ${lib.boolToString withMedia}
-    COMPILE_WEBKIT = ${lib.boolToString withWebKit}
-  '';
-
-  preBuild = ''
-    swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
-    substituteInPlace build.gradle \
-      --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \
-      --replace 'name: SWT_FILE_NAME' "files('$swtJar')"
-  '';
-
-  installPhase = ''
-    cp -r build/modular-sdk $out
-  '';
-
-  # glib-2.62 deprecations
-  # -fcommon: gstreamer workaround for -fno-common toolchains:
-  #   ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of
-  #     `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here
-  env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon";
-
-  stripDebugList = [ "." ];
-
-  postFixup = ''
-    # Remove references to bootstrap.
-    export openjdkOutPath='${openjdk11_headless.outPath}'
-    find "$out" -name \*.so | while read lib; do
-      new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
-      patchelf --set-rpath "$new_refs" "$lib"
-    done
-  '';
-
-  disallowedReferences = [ openjdk11_headless ];
-
-  passthru.deps = deps;
-
-  meta = with lib; {
-    homepage = "http://openjdk.java.net/projects/openjfx/";
-    license = licenses.gpl2;
-    description = "Next-generation Java client toolkit";
-    maintainers = with maintainers; [ abbradar ];
-    knownVulnerabilities = [
-      "This OpenJFX version has reached its end of life."
-    ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a2473d767fde..4dd6c8d0fd7e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -68,6 +68,26 @@ mapAliases ({
   acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
   adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
   adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
+  adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09
+  adoptopenjdk-bin-17-packages-darwin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-bin-17-packages-linux = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-bin-17` or `temurin-bin-16`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-jre-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-jre-bin-17` or `temurin-jre-bin-16`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-jre-bin-17` or `semeru-jre-bin-16`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17` or `semeru-bin-16`"; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
   advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29
   # Post 24.11 branch-off, this should throw an error
   addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5500cafd7a05..2d8398dcbe47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14947,32 +14947,6 @@ with pkgs;
   semeru-bin = semeru-bin-21;
   semeru-jre-bin = semeru-jre-bin-21;
 
-  adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; };
-  adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; };
-
-  adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot;
-  adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-openj9;
-
-  adoptopenjdk-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-hotspot;
-  adoptopenjdk-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-openj9;
-
-  adoptopenjdk-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-hotspot;
-  adoptopenjdk-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-openj9;
-
-  adoptopenjdk-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-hotspot;
-  adoptopenjdk-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-openj9;
-
-  adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
-  adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
-
   adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web {
     jdk = jdk8;
   };
@@ -15887,7 +15861,7 @@ with pkgs;
 
   hugs = callPackage ../development/interpreters/hugs { };
 
-  inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
+  inherit (javaPackages) openjfx11 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
   openjfx = openjfx17;
 
   openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index b033b440018b..aeadc874afdc 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -4,7 +4,6 @@ with pkgs;
 
 let
   openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
-  openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { };
   openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { };
   openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { };
   openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { };
@@ -12,44 +11,9 @@ let
   openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22.nix { };
 
 in {
-  inherit openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
+  inherit openjfx11 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
 
   compiler = let
-
-    bootstrapArgs = {
-      openjfx = openjfx11; /* need this despite next line :-( */
-      enableJavaFX = false;
-      headless = true;
-    };
-
-    mkAdoptopenjdk = path-linux: path-darwin: let
-      package-linux  = import path-linux { inherit stdenv lib; };
-      package-darwin = import path-darwin { inherit lib; };
-      package = if stdenv.isLinux
-        then package-linux
-        else package-darwin;
-    in {
-      inherit package-linux package-darwin;
-      __attrsFailEvaluation = true;
-
-      jdk-hotspot = callPackage package.jdk-hotspot {};
-      jre-hotspot = callPackage package.jre-hotspot {};
-    } // lib.optionalAttrs (package?jdk-openj9) {
-      jdk-openj9  = callPackage package.jdk-openj9  {};
-    } // lib.optionalAttrs (package?jre-openj9) {
-      jre-openj9  = callPackage package.jre-openj9  {};
-    };
-
-    mkBootstrap = adoptopenjdk: path: args:
-      /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
-      if   !stdenv.hostPlatform.isi686
-      then
-        # only linux has the gtkSupport option
-        if stdenv.isLinux
-        then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
-        else adoptopenjdk.jdk-hotspot
-      else callPackage path args;
-
     mkOpenjdk = path-linux: path-darwin: args:
       if stdenv.isLinux
       then mkOpenjdkLinuxOnly path-linux args
@@ -64,84 +28,16 @@ in {
     };
 
   in rec {
-    adoptopenjdk-8 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;
-
-    adoptopenjdk-11 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix;
-
-    adoptopenjdk-13 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix;
-
-    adoptopenjdk-14 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix;
-
-    adoptopenjdk-15 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix;
-
-    adoptopenjdk-16 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix;
-
-    adoptopenjdk-17 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix;
-
     corretto11 = callPackage ../development/compilers/corretto/11.nix { };
     corretto17 = callPackage ../development/compilers/corretto/17.nix { };
     corretto19 = callPackage ../development/compilers/corretto/19.nix { };
     corretto21 = callPackage ../development/compilers/corretto/21.nix { };
 
-    openjdk8-bootstrap = mkBootstrap adoptopenjdk-8
-      ../development/compilers/openjdk/bootstrap.nix
-      { version = "8"; };
+    openjdk8-bootstrap = temurin-bin.jdk-8;
 
-    openjdk11-bootstrap = mkBootstrap adoptopenjdk-11
-      ../development/compilers/openjdk/bootstrap.nix
-      { version = "10"; };
+    openjdk11-bootstrap = temurin-bin.jdk-11;
 
-    openjdk13-bootstrap = mkBootstrap adoptopenjdk-13
-      ../development/compilers/openjdk/12.nix
-      (bootstrapArgs // {
-        inherit openjdk11-bootstrap;
-        /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
-        stdenv = gcc8Stdenv;
-      });
-
-    openjdk14-bootstrap = mkBootstrap adoptopenjdk-14
-      ../development/compilers/openjdk/13.nix
-      (bootstrapArgs // {
-        inherit openjdk13-bootstrap;
-      });
-
-    openjdk15-bootstrap = mkBootstrap adoptopenjdk-15
-      ../development/compilers/openjdk/14.nix
-      (bootstrapArgs // {
-        inherit openjdk14-bootstrap;
-      });
-
-    openjdk16-bootstrap = mkBootstrap adoptopenjdk-16
-      ../development/compilers/openjdk/15.nix
-      (bootstrapArgs // {
-        inherit openjdk15-bootstrap;
-      });
-
-    openjdk17-bootstrap = mkBootstrap adoptopenjdk-17
-      ../development/compilers/openjdk/16.nix
-      (bootstrapArgs // {
-        inherit openjdk16-bootstrap;
-      });
-
-    openjdk18-bootstrap = mkBootstrap adoptopenjdk-17
-      ../development/compilers/openjdk/17.nix
-      (bootstrapArgs // {
-        inherit openjdk17-bootstrap;
-      });
+    openjdk17-bootstrap = temurin-bin.jdk-17;
 
     openjdk8 = mkOpenjdk
       ../development/compilers/openjdk/8.nix
@@ -153,32 +49,6 @@ in {
       ../development/compilers/zulu/11.nix
       { openjfx = openjfx11; };
 
-    openjdk12 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/12.nix {
-        /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
-        stdenv = gcc8Stdenv;
-        openjfx = openjfx11;
-    };
-
-    openjdk13 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/13.nix {
-      inherit openjdk13-bootstrap;
-      openjfx = openjfx11;
-    };
-
-    openjdk14 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/14.nix {
-      inherit openjdk14-bootstrap;
-      openjfx = openjfx11;
-    };
-
-    openjdk15 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/15.nix {
-      inherit openjdk15-bootstrap;
-      openjfx = openjfx15;
-    };
-
-    openjdk16 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/16.nix {
-      inherit openjdk16-bootstrap;
-      openjfx = openjfx15;
-    };
-
     openjdk17 = mkOpenjdk
       ../development/compilers/openjdk/17.nix
       ../development/compilers/zulu/17.nix
@@ -191,7 +61,7 @@ in {
       ../development/compilers/openjdk/18.nix
       ../development/compilers/zulu/18.nix
       {
-        inherit openjdk18-bootstrap;
+        openjdk18-bootstrap = temurin-bin.jdk-18;
         openjfx = openjfx17;
       };
 

From 1a2bca4debe8c332e07f15c15f1d0a006d0c56e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 11 Jul 2024 22:11:15 +0200
Subject: [PATCH 202/319] =?UTF-8?q?Re-revert=20"mypy:=201.10.0=20=E2=86=92?=
 =?UTF-8?q?=201.10.1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6c12901eb4ccb5befc2 (PR #326371), reversing
changes made to b0407f152a837ace41f928dafbcdb2b83ee0ecf1.
---
 pkgs/applications/science/misc/cwltool/default.nix       | 3 ++-
 pkgs/development/python-modules/mypy/default.nix         | 8 ++++++--
 pkgs/development/python-modules/schema-salad/default.nix | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index ab43eac8bffb..8da98e131f64 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication rec {
       --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
       --replace "PYTEST_RUNNER + " ""
     substituteInPlace pyproject.toml \
-      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"
+      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
+      --replace "mypy==1.10.0" "mypy==1.10.*"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index ffdd8bc5ac2c..0f264d2c86a1 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  gitUpdater,
   pythonAtLeast,
   pythonOlder,
 
@@ -31,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "1.10.0";
+  version = "1.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +41,10 @@ buildPythonPackage rec {
     owner = "python";
     repo = "mypy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NCnc4C/YFKHN/kT7RTFCYs/yC00Kt1E7mWCoQuUjxG8=";
+    hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc=";
+  };
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 4df6f0af21f0..6e3b6e3d5ed6 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   cachecontrol,
   fetchFromGitHub,
+  fetchpatch,
   importlib-resources,
   mistune,
   mypy,
@@ -56,6 +57,11 @@ buildPythonPackage rec {
     ++ cachecontrol.optional-dependencies.filecache
     ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
+  patches = [ (fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/common-workflow-language/schema_salad/pull/840.patch";
+    hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8=";
+  } ) ];
+
   nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen;
 
   preCheck = ''

From b2e9329b5851b19d0d41e354bd509080ce2a13aa Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 11 Jul 2024 17:00:19 -0400
Subject: [PATCH 203/319] minecraft-servers: replace openjdk16 with openjdk17

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

diff --git a/pkgs/games/minecraft-servers/default.nix b/pkgs/games/minecraft-servers/default.nix
index f3d4aad16698..d49adda6da9d 100644
--- a/pkgs/games/minecraft-servers/default.nix
+++ b/pkgs/games/minecraft-servers/default.nix
@@ -12,7 +12,11 @@ let
       name = "vanilla-${escapeVersion version}";
       value = callPackage ./derivation.nix {
         inherit (value) version url sha1;
-        jre_headless = getJavaVersion (if value.javaVersion == null then 8 else value.javaVersion); # versions <= 1.6 will default to 8
+        jre_headless = getJavaVersion (
+          if value.javaVersion == null then 8
+          else if value.javaVersion == 16 then 17
+          else value.javaVersion
+        ); # versions <= 1.6 will default to 8
       };
     })
     versions;

From 1e7d7e8ddcc50a9421a2297caebc903488d7f866 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 11 Jul 2024 22:26:41 +0100
Subject: [PATCH 204/319] libavif: 1.0.4 -> 1.1.0

Changes: https://github.com/AOMediaCodec/libavif/releases/tag/v1.1.0
---
 pkgs/development/libraries/libavif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix
index 6df341d68eb8..ec2c22a247c0 100644
--- a/pkgs/development/libraries/libavif/default.nix
+++ b/pkgs/development/libraries/libavif/default.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libavif";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9YP4Zq6dehIJanNkpAJK1aYwSOAueqonF8k2t/3B4kw=";
+    hash = "sha256-yNJiMTWgOKR1c2pxTkLY/uPWGIY4xgH+Ee0r15oroDU=";
   };
 
   # reco: encode libaom slowest but best, decode dav1d fastest

From e550655a7119693b90c1dfc271169a1ff7dccf24 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 12 Jul 2024 08:49:32 +0300
Subject: [PATCH 205/319] godot3-mono: fix scons override python3 argument

---
 pkgs/development/tools/godot/3/mono/default.nix | 4 ++--
 pkgs/development/tools/godot/3/mono/glue.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/godot/3/mono/default.nix b/pkgs/development/tools/godot/3/mono/default.nix
index 96130cb92abf..9c6da83d434f 100644
--- a/pkgs/development/tools/godot/3/mono/default.nix
+++ b/pkgs/development/tools/godot/3/mono/default.nix
@@ -6,12 +6,12 @@
 , dotnet-sdk
 , writeText
 , scons
-, python311
+, python311Packages
 }:
 
 (godot3.override {
   scons = scons.override {
-    python3 = python311;
+    python3Packages = python311Packages;
   };
 }).overrideAttrs (self: base: {
   pname = "godot3-mono";
diff --git a/pkgs/development/tools/godot/3/mono/glue.nix b/pkgs/development/tools/godot/3/mono/glue.nix
index e914bd04e55f..09659d0ab48d 100644
--- a/pkgs/development/tools/godot/3/mono/glue.nix
+++ b/pkgs/development/tools/godot/3/mono/glue.nix
@@ -1,8 +1,8 @@
-{ godot3, mono, scons, python311 }:
+{ godot3, mono, scons, python311Packages }:
 
 (godot3.override {
   scons = scons.override {
-    python3 = python311;
+    python3Packages = python311Packages;
   };
 }).overrideAttrs (self: base: {
   pname = "godot3-mono-glue";

From b7795e7a415860ec7ca1f10b6d9e8157a77ca458 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 12 Jul 2024 09:40:58 +0300
Subject: [PATCH 206/319] rust-analyzer: use cargoHash instead of deprecated
 cargoSha256

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

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 65f26ed304f2..1804bfc94753 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -14,7 +14,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
   version = "2024-07-01";
-  cargoSha256 = "sha256-hi3EzQbOWUEv5xxImjV1ooz5K5Xzz2V3AHSXpifhFjg=";
+  cargoHash = "sha256-hi3EzQbOWUEv5xxImjV1ooz5K5Xzz2V3AHSXpifhFjg=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";

From bfb36913f1527dae20d8270209ceecea01486eba Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 11 Jul 2024 17:37:22 -0400
Subject: [PATCH 207/319] qpdf: add meta.mainProgram

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

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index b2858944ef7c..d2d739cb7a7c 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
     description = "C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
     maintainers = with maintainers; [ abbradar ];
+    mainProgram = "qpdf";
     platforms = platforms.all;
     changelog = "https://github.com/qpdf/qpdf/blob/v${version}/ChangeLog";
   };

From 17726eb8bb6926ccc24ca846ba24c49c54138857 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 11 Jul 2024 21:54:41 +0100
Subject: [PATCH 208/319] libbpf: 1.4.3 -> 1.4.5

Changes:
- https://github.com/libbpf/libbpf/releases/tag/v1.4.4
- https://github.com/libbpf/libbpf/releases/tag/v1.4.5
---
 pkgs/os-specific/linux/libbpf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 032283711cf3..187584888986 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "1.4.3";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
     rev = "v${version}";
-    sha256 = "sha256-lcIOgghlBKrDCBDdO0hryjt8KADQd6aroQMun3ein2o=";
+    hash = "sha256-GQbx3LaGrFTwEtUsP7V/Y1Keoa4dSmDxhmSTsML+tVk=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From b99be9ccc7ba4eba576bb3b4443e19a590fb5078 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 12 Jul 2024 13:05:41 +0300
Subject: [PATCH 209/319] ffado: actually get rid of Qt dependency for real
 this time

---
 pkgs/os-specific/linux/ffado/default.nix | 8 +++-----
 pkgs/top-level/all-packages.nix          | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 207e0a6fe30d..cf9c87ed625c 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,11 +1,9 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   argp-standalone,
   dbus,
   dbus_cplusplus,
-  desktop-file-utils,
   fetchurl,
   glibmm,
   libavc1394,
@@ -18,7 +16,7 @@
   scons,
   which,
   withMixer ? false,
-  wrapQtAppsHook,
+  qt5,
 }:
 
 let
@@ -33,7 +31,7 @@ let
     else
       python311;
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "ffado";
   version = "2.4.9";
 
@@ -65,7 +63,7 @@ mkDerivation rec {
     ++ lib.optionals withMixer [
       python
       python.pkgs.pyqt5
-      wrapQtAppsHook
+      qt5.wrapQtAppsHook
     ];
 
   prefixKey = "PREFIX=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c666ddd2b154..cf92aa3da70c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26753,8 +26753,8 @@ with pkgs;
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
-  ffado = libsForQt5.callPackage ../os-specific/linux/ffado { };
-  ffado-mixer = libsForQt5.callPackage ../os-specific/linux/ffado { withMixer = true; };
+  ffado = callPackage ../os-specific/linux/ffado { };
+  ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
   libffado = ffado;
 
   fbterm = callPackage ../os-specific/linux/fbterm { };

From 3f6e5f0a4762d9bf2570bbde84982ee8edec8f69 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 12 Jul 2024 14:52:02 +0300
Subject: [PATCH 210/319] pipewire: 1.2.0 -> 1.2.1

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.2.0...1.2.1

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.2.1
---
 pkgs/development/libraries/pipewire/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 49dc2f4dd5d2..c0540e4080fe 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport;
 
 stdenv.mkDerivation(finalAttrs: {
   pname = "pipewire";
-  version = "1.2.0";
+  version = "1.2.1";
 
   outputs = [
     "out"
@@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-hjjiH7+JoyRTcdbPDvkUEpO72b5p8CbTD6Un/vZrHL8=";
+    sha256 = "sha256-CkxsVD813LbWpuZhJkNLJnqjLF6jmEn+CajXb2XTCsY=";
   };
 
   patches = [

From 79866be383814a8ab5e35436b43629c8486ec6a9 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 1 Jul 2024 01:37:33 -0300
Subject: [PATCH 211/319] ed: a huge rewrite

- delete `edUnstable`
- migrate to `pkgs/by-name`
- strictDeps
- testVersion
- meta.mainProgram
---
 pkgs/applications/editors/ed/default.nix | 14 ------
 pkgs/applications/editors/ed/generic.nix | 32 -------------
 pkgs/applications/editors/ed/sources.nix | 45 ------------------
 pkgs/by-name/ed/ed/package.nix           | 60 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  3 --
 5 files changed, 60 insertions(+), 94 deletions(-)
 delete mode 100644 pkgs/applications/editors/ed/default.nix
 delete mode 100644 pkgs/applications/editors/ed/generic.nix
 delete mode 100644 pkgs/applications/editors/ed/sources.nix
 create mode 100644 pkgs/by-name/ed/ed/package.nix

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
deleted file mode 100644
index c1f99de71057..000000000000
--- a/pkgs/applications/editors/ed/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, pkgs }:
-
-lib.makeScope pkgs.newScope (self:
-  let
-    inherit (self) callPackage;
-  in {
-    sources = import ./sources.nix {
-      inherit lib;
-      inherit (pkgs) fetchurl;
-    };
-
-    ed = callPackage (self.sources.ed) { };
-    edUnstable = callPackage (self.sources.edUnstable) { };
-  })
diff --git a/pkgs/applications/editors/ed/generic.nix b/pkgs/applications/editors/ed/generic.nix
deleted file mode 100644
index 70ffdb4c4af9..000000000000
--- a/pkgs/applications/editors/ed/generic.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pname
-, version
-, src
-, patches ? [ ]
-, meta
-}:
-
-# Note: this package is used for bootstrapping fetchurl, and thus cannot use
-# fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed
-# here should be included directly in Nixpkgs as files.
-
-{ lib
-, stdenv
-, fetchurl
-, lzip
-, runtimeShellPackage
-}:
-
-stdenv.mkDerivation {
-  inherit pname version src patches;
-
-  nativeBuildInputs = [ lzip ];
-  buildInputs = [ runtimeShellPackage ];
-
-  configureFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-  ];
-
-  doCheck = true;
-
-  inherit meta;
-}
diff --git a/pkgs/applications/editors/ed/sources.nix b/pkgs/applications/editors/ed/sources.nix
deleted file mode 100644
index 6601876c88b0..000000000000
--- a/pkgs/applications/editors/ed/sources.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib
-, fetchurl
-}:
-
-let
-  meta = {
-    description = "GNU implementation of the standard Unix editor";
-    longDescription = ''
-      GNU ed is a line-oriented text editor. It is used to create, display,
-      modify and otherwise manipulate text files, both interactively and via
-      shell scripts. A restricted version of ed, red, can only edit files in the
-      current directory and cannot execute shell commands. Ed is the 'standard'
-      text editor in the sense that it is the original editor for Unix, and thus
-      widely available. For most purposes, however, it is superseded by
-      full-screen editors such as GNU Emacs or GNU Moe.
-    '';
-    license = lib.licenses.gpl3Plus;
-    homepage = "https://www.gnu.org/software/ed/";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-in
-{
-  ed = let
-    pname = "ed";
-    version = "1.20.2";
-    src = fetchurl {
-      url = "mirror://gnu/ed/ed-${version}.tar.lz";
-      hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM=";
-    };
-  in import ./generic.nix {
-    inherit pname version src meta;
-  };
-
-  edUnstable = let
-    pname = "ed";
-    version = "1.20-pre2";
-    src = fetchurl {
-      url = "http://download.savannah.gnu.org/releases/ed/ed-${version}.tar.lz";
-      hash = "sha256-bHTDeMhVNNo3qqDNoBNaBA+DHDa4WJpfQNcTvAUPgsY=";
-    };
-  in import ./generic.nix {
-    inherit pname version src meta;
-  };
-}
diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix
new file mode 100644
index 000000000000..a4fe441ae083
--- /dev/null
+++ b/pkgs/by-name/ed/ed/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchurl,
+  lzip,
+  runtimeShellPackage,
+  stdenv,
+  testers,
+}:
+
+# Note: this package is used for bootstrapping fetchurl, and thus cannot use
+# fetchpatch! Any mutable patches (retrieved from GitHub, cgit or any other
+# place) that are needed here should be directly included together as regular
+# files.
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ed";
+  version = "1.20.2";
+
+  src = fetchurl {
+    url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz";
+    hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM=";
+  };
+
+  nativeBuildInputs = [ lzip ];
+
+  buildInputs = [ runtimeShellPackage ];
+
+  configureFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  strictDeps = true;
+
+  doCheck = true;
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "ed --version";
+    };
+  };
+
+  meta = {
+    homepage = "https://www.gnu.org/software/ed/";
+    description = "GNU implementation of the standard Unix editor";
+    longDescription = ''
+      GNU ed is a line-oriented text editor. It is used to create, display,
+      modify and otherwise manipulate text files, both interactively and via
+      shell scripts. A restricted version of ed, red, can only edit files in the
+      current directory and cannot execute shell commands. Ed is the 'standard'
+      text editor in the sense that it is the original editor for Unix, and thus
+      widely available. For most purposes, however, it is superseded by
+      full-screen editors such as GNU Emacs or GNU Moe.
+    '';
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "ed";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1659cfff2c8a..a85ff2cd9c74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30125,9 +30125,6 @@ with pkgs;
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
 
-  inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { }))
-    ed edUnstable;
-
   edlin = callPackage ../applications/editors/edlin { };
 
   oed = callPackage ../applications/editors/oed { };

From d6666a90a273f8f979fcd4a5c831f32702271d7a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 1 Jul 2024 09:16:23 -0300
Subject: [PATCH 212/319] edUnstable: convert to throw

---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2880cd20674b..78019e8c54ac 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -326,6 +326,7 @@ mapAliases ({
   ec2_api_tools = ec2-api-tools; # Added 2021-10-08
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
 
+  edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   elasticsearch7Plugins = elasticsearchPlugins;
 
   # Electron

From af6690a77161745a59d5c94719113d9b3ddf9505 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Wed, 19 Jun 2024 16:30:46 +0200
Subject: [PATCH 213/319] bundler: 2.5.11 -> 2.5.15

https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.12
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.13
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.14
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.15
https://github.com/rubygems/rubygems/compare/bundler-v2.5.11...bundler-v2.5.15
---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 581c2544a220..de08320066e6 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.5.11";
-  source.sha256 = "sha256-3XhL/lODSzmlbmQtvG4eyhmi5kVOTVOZTLcpgAWsTC4=";
+  version = "2.5.15";
+  source.sha256 = "sha256-YUKA8DH/jZrewERrXK/aAQOiSGUg1Vb5/BTRh2LEhhM=";
   dontPatchShebangs = true;
 
   postFixup = ''

From edb4e41b4b0d5f2e36e53718ed00bc86c517d8e0 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Wed, 19 Jun 2024 16:32:07 +0200
Subject: [PATCH 214/319] ruby.rubygems: 3.5.11 -> 3.5.15

https://github.com/rubygems/rubygems/compare/v3.5.11...v3.5.15
---
 pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 9ad7a04eab06..f2d0c84223f0 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
-  version = "3.5.11";
+  version = "3.5.15";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-RSG1L4Q2IKn8XKdBRSa3RjsJiVZMOugLJraPvRMEyBg=";
+    hash = "sha256-0Ibhw2j9PL4Eyg8QhFnQFC0NV0E66eHS/0siDryOa4c=";
   };
 
   patches = [

From a1d6c177ecbaa6464cc515aae2a848fb405fe93f Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 12 Jul 2024 18:27:25 +0200
Subject: [PATCH 215/319] ruby.rubygems: add passthru.updateScript

---
 pkgs/development/interpreters/ruby/default.nix      |  4 +++-
 .../interpreters/ruby/rubygems/default.nix          | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 10906bd67be1..a47e8cdf73ce 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -6,6 +6,7 @@
 , makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
 , openssl
 , linuxPackages, libsystemtap
+, gitUpdater
 } @ args:
 
 let
@@ -13,7 +14,7 @@ let
   ops = lib.optionals;
   opString = lib.optionalString;
   config = import ./config.nix { inherit fetchFromSavannah; };
-  rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
+  rubygems = import ./rubygems { inherit stdenv lib fetchurl gitUpdater; };
 
   # Contains the ruby version heuristics
   rubyVersion = import ./ruby-version.nix { inherit lib; };
@@ -57,6 +58,7 @@ let
           rubygemsSupport = false;
         }
       , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform
+      , gitUpdater
       }:
       stdenv.mkDerivation ( finalAttrs: {
         pname = "ruby";
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index f2d0c84223f0..b7b3f8814252 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, lib, fetchurl }:
+{
+  fetchurl,
+  gitUpdater,
+  lib,
+  stdenv,
+}:
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
@@ -21,6 +26,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/rubygems/rubygems.git";
+    rev-prefix = "v";
+    ignoredVersions = "(pre|alpha|beta|rc|bundler).*";
+  };
+
   meta = with lib; {
     description = "Package management framework for Ruby";
     changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md";

From a1a29bd6f4564eb88d05310642c0989feedf3e81 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 12 Jul 2024 19:03:21 +0200
Subject: [PATCH 216/319] ruby_3_3: 3.3.3 -> 3.3.4

Changelog: https://github.com/ruby/ruby/releases/tag/v3_3_4

Release Notes: https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/
---
 pkgs/development/interpreters/ruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 10906bd67be1..afde882211b1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -310,8 +310,8 @@ in {
   };
 
   ruby_3_3 = generic {
-    version = rubyVersion "3" "3" "3" "";
-    hash = "sha256-g8BbIXfunDNbYxspuMB3tHcBZtAvpSfzqfakDRPzzOI=";
+    version = rubyVersion "3" "3" "4" "";
+    hash = "sha256-/mow+X1U4Cl2jy3fSSNpnEFs28Om6W2z4tVxbH25ajQ=";
     cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
   };
 

From 62a46e824bb9d1059223d2918fb7e4f6acad31b2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 12 Jul 2024 11:16:51 -0400
Subject: [PATCH 217/319] llvm_18, lld_18: Patch to support more OpenBSD
 sections

Without these backports (I've ensured everything has landed upstream)
the OpenBSD binaries we build will not run.
---
 .../compilers/llvm/common/default.nix         | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 7e8e65b51c1e..a9e64b9faf0f 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -225,7 +225,24 @@ let
                   stripLen = 1;
                   hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8=";
                 }
-              );
+              )
+          ++ lib.optionals (lib.versions.major metadata.release_version == "18") [
+            # Reorgs one test so the next patch applies
+            (fetchpatch {
+              name = "osabi-test-reorg.patch";
+              url = "https://github.com/llvm/llvm-project/commit/06cecdc60ec9ebfdd4d8cdb2586d201272bdf6bd.patch";
+              stripLen = 1;
+              hash = "sha256-s9GZTNgzLS511Pzh6Wb1hEV68lxhmLWXjlybHBDMhvM=";
+            })
+            # Sets the OSABI for OpenBSD, needed for an LLD patch for OpenBSD.
+            # https://github.com/llvm/llvm-project/pull/98553
+            (fetchpatch {
+              name = "mc-set-openbsd-osabi.patch";
+              url = "https://github.com/llvm/llvm-project/commit/b64c1de714c50bec7493530446ebf5e540d5f96a.patch";
+              stripLen = 1;
+              hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg=";
+            })
+          ];
         pollyPatches =
           [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]
           ++ lib.optional (lib.versionAtLeast metadata.release_version "15")
@@ -327,7 +344,16 @@ let
           )
           ++ lib.optional (
             lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "18"
-          ) (metadata.getVersionFile "lld/add-table-base.patch");
+          ) (metadata.getVersionFile "lld/add-table-base.patch")
+          ++ lib.optional (lib.versions.major metadata.release_version == "18") (
+            # https://github.com/llvm/llvm-project/pull/97122
+            fetchpatch {
+              name = "more-openbsd-program-headers.patch";
+              url = "https://github.com/llvm/llvm-project/commit/d7fd8b19e560fbb613159625acd8046d0df75115.patch";
+              stripLen = 1;
+              hash = "sha256-7wTy7XDTx0+fhWQpW1KEuz7xJvpl42qMTUfd20KGOfA=";
+            }
+          );
       };
 
       lldb = callPackage ./lldb.nix (

From 25bc618215a72f681678bf58300f72b1a6f920c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 4 Jul 2024 19:06:20 +0200
Subject: [PATCH 218/319] =?UTF-8?q?libxml2:=202.12.7=20=E2=86=92=202.13.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- new API with per-context error handlers
- remove HTTP POST support
- zlib, lzma and HTTP disabled by default → removed `zlib`
- Meson support added → cycle, not switching right now
- docs no longer install examples and tutorial was removed → since only `xmllint` and `xmlcatalog` HTML docs remain, move them to `out`
- FTP and `xpointer()` XPath extensions deprecated

https://discourse.gnome.org/t/libxml2-2-12-8-released/21528
https://discourse.gnome.org/t/libxml2-2-13-0-released/21529
https://discourse.gnome.org/t/libxml2-2-13-1-released/21778
https://discourse.gnome.org/t/libxml2-2-13-2-released/22000

Also clean up the expression a bit and install DevHelp files to `devdoc` (previously deleted by multiple-outputs hook).
---
 .../development/libraries/libxml2/default.nix | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 79fe8c9f52da..92f45907397b 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchurl
-, zlib
 , pkg-config
 , autoreconfHook
 , libintl
@@ -22,25 +21,20 @@
 , testers
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxml2";
-  version = "2.12.7";
+  version = "2.13.2";
 
-  outputs = [ "bin" "dev" "out" "doc" ]
+  outputs = [ "bin" "dev" "out" "devdoc" ]
     ++ lib.optional pythonSupport "py"
     ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-    hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y=";
+    url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz";
+    hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM=";
   };
 
-  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/725
-  postPatch = if stdenv.hostPlatform.isFreeBSD then ''
-    substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create
-  '' else null;
-
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -59,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   propagatedBuildInputs = [
-    zlib
     findXMLCatalogs
   ] ++ lib.optionals stdenv.isDarwin [
     libiconv
@@ -95,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   '';
 
   preInstall = lib.optionalString pythonSupport ''
-    substituteInPlace python/libxml2mod.la --replace "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
+    substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
   '';
 
   postFixup = ''
@@ -106,11 +99,10 @@ stdenv.mkDerivation (finalAttrs: rec {
   '';
 
   passthru = {
-    inherit version;
-    pythonSupport = pythonSupport;
+    inherit pythonSupport;
 
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libxml2";
       versionPolicy = "none";
     };
     tests = {

From 9634d9c6399e3f21968cd00f105fbaffd8f85aed Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 4 Jul 2024 19:32:02 +0200
Subject: [PATCH 219/319] =?UTF-8?q?libxslt:=201.1.41=20=E2=86=92=201.1.42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://discourse.gnome.org/t/libxslt-1-1-42-released/22001
---
 pkgs/development/libraries/libxslt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index df04c749d07e..10ee52a027a3 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxslt";
-  version = "1.1.41";
+  version = "1.1.42";
 
   outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py";
   outputMan = "bin";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OtOSr5ERW3dA97UNIozBxfwTr8HafxbLAhORejf3G9o=";
+    hash = "sha256-hcpiysDUH8d9P2Az2p32/XPSDqL8GLCjYJ/7QRDhuus=";
   };
 
   strictDeps = true;

From f6f5b1fde533c28780adad9144177b0626f1568b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 13 Jul 2024 11:46:37 +0200
Subject: [PATCH 220/319] gss: drop a crashing test

https://hydra.nixos.org/build/266280498/nixlog/1/tail

In the test sources I see lines hinting at the moment it started failing
  name:endtime  type:GENERALIZED_TIME  value:20240711155558Z
but I was unable to find a fix quickly.
---
 pkgs/development/libraries/gss/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 883d68d42c6a..7dde1fc835c3 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/gss/gss-${version}.tar.gz";
     hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM=";
   };
+  # This test crashes now.  Most likely triggered by expiration on 20240711.
+  postPatch = ''
+    rm tests/krb5context.c
+  '';
 
   buildInputs = lib.optional withShishi shishi;
 

From 5a56b5dfb19b1b2db9360a3bc1dd98c7cc42b331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 13 Jul 2024 13:02:03 +0200
Subject: [PATCH 221/319] mesa: 24.1.2 -> 24.1.3

https://docs.mesa3d.org/relnotes/24.1.3.html
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index b42403d10aee..5f56aac26700 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -1,14 +1,14 @@
 { lib, fetchurl }:
 rec {
   pname = "mesa";
-  version = "24.1.2";
+  version = "24.1.3";
 
   src = fetchurl {
     urls = [
       "https://archive.mesa3d.org/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    hash = "sha256-osWEyNV9O9i6EXkKbprjcT+IId+WwFm3ivsp3Zdcn0U=";
+    hash = "sha256-YyNkJrJadFumqi1tr4zXadXqAYh7B0WrcSTS7zOpAg0=";
   };
 
   meta = {

From 1cb1853573de833ff506579c8ece3d1f896e15d8 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 14 Apr 2024 08:53:41 -0400
Subject: [PATCH 222/319] ld-wrapper: use a temporary file for reponse file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This changes ld-wrapper to use a temporary file for the response file
passed to ld instead of using process substitution.

ld64 does not handle long command-lines when reading from the response
file, which defeats the point of using a response file to handle long
command-lines. cctools-port was patched to work around this, but nixpkgs
is now using Apple’s source release directly instead of the port.

Since it’s preferable not to patch Apple’s release heavily (to reduce
the difficulty of updating to new versions and to match upstream’s
behavior), use the approach that was adopted in cc-wrapper to work
around issues with response files in newer versions of clang.

Related PRs (cctools-port):
- https://github.com/NixOS/nixpkgs/pull/213831
- https://github.com/tpoechtrager/cctools-port/pull/132

Related PRs (cc-wrapper):
- https://github.com/NixOS/nixpkgs/pull/245282
- https://github.com/NixOS/nixpkgs/pull/258608
---
 pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index dcbe8a4c2494..3bd9c68f2336 100644
--- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
@@ -257,10 +257,13 @@ PATH="$path_backup"
 # Old bash workaround, see above.
 
 if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
-    @prog@ @<(printf "%q\n" \
-        ${extraBefore+"${extraBefore[@]}"} \
-        ${params+"${params[@]}"} \
-        ${extraAfter+"${extraAfter[@]}"})
+    responseFile=$(mktemp "${TMPDIR:-/tmp}/ld-params.XXXXXX")
+    trap 'rm -f -- "$responseFile"' EXIT
+    printf "%q\n" \
+       ${extraBefore+"${extraBefore[@]}"} \
+       ${params+"${params[@]}"} \
+       ${extraAfter+"${extraAfter[@]}"} > "$responseFile"
+    @prog@ "@$responseFile"
 else
     @prog@ \
         ${extraBefore+"${extraBefore[@]}"} \

From 4712e8fe80f44c6fd12a79b1f279461135ac838a Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 15 Apr 2024 20:02:07 -0400
Subject: [PATCH 223/319] libredirect: use llvmPackages unconditionally

Darwin and its bootstrap tools both use LLVM 16, which is sufficient for
arm64e support in LLVM. Thsi change removes an unnecessary LLVM 13 build
from the stdenv bootstrap.
---
 pkgs/build-support/libredirect/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix
index c4399189b7a2..999824167388 100644
--- a/pkgs/build-support/libredirect/default.nix
+++ b/pkgs/build-support/libredirect/default.nix
@@ -1,12 +1,5 @@
-{ lib, stdenv, bintools-unwrapped, llvmPackages, llvmPackages_13, coreutils }:
+{ lib, stdenv, bintools-unwrapped, llvmPackages, coreutils }:
 
-let
-  # aarch64-darwin needs a clang that can build arm64e binaries, so make sure a version of LLVM
-  # is used that can do that, but prefer the stdenv one if it is new enough.
-  llvmPkgs = if (lib.versionAtLeast (lib.getVersion llvmPackages.clang) "13")
-    then llvmPackages
-    else llvmPackages_13;
-  in
 if stdenv.hostPlatform.isStatic
 then throw ''
   libredirect is not available on static builds.
@@ -46,11 +39,11 @@ else stdenv.mkDerivation rec {
     # and the library search directory for libdl.
     # We can't build this on x86_64, because the libSystem we point to doesn't
     # like arm64(e).
-    PATH=${bintools-unwrapped}/bin:${llvmPkgs.clang-unwrapped}/bin:$PATH \
+    PATH=${bintools-unwrapped}/bin:${llvmPackages.clang-unwrapped}/bin:$PATH \
       clang -arch x86_64 -arch arm64 -arch arm64e \
-      -isystem ${llvmPkgs.clang.libc}/include \
-      -isystem ${llvmPkgs.libclang.lib}/lib/clang/*/include \
-      -L${llvmPkgs.clang.libc}/lib \
+      -isystem ${llvmPackages.clang.libc}/include \
+      -isystem ${llvmPackages.libclang.lib}/lib/clang/*/include \
+      -L${llvmPackages.clang.libc}/lib \
       -Wl,-install_name,$libName \
       -Wall -std=c99 -O3 -fPIC libredirect.c \
       -shared -o "$libName"

From 91d8dd928fff9f2626d3359fcb2e63bd6b075b1e Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 2 Jul 2024 23:13:28 -0400
Subject: [PATCH 224/319] darwin.apple_sdk_10_12.sdkRoot: specify exact SDK
 version

---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 7298eba6c50a..30081c824378 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -363,7 +363,7 @@ in rec {
 
   objc4 = pkgs.darwin.libobjc;
 
-  sdkRoot = pkgs.callPackage ./sdkRoot.nix { sdkVersion = "10.12"; };
+  sdkRoot = pkgs.callPackage ./sdkRoot.nix { sdkVersion = "10.12.4"; };
 
   inherit (pkgs.darwin) Libsystem;
 

From 3a545f673ecba345ee6bd2d33f0e52b58efd77a8 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 18 Apr 2024 20:11:31 -0400
Subject: [PATCH 225/319] darwin.AvailabilityVersions: init at 140.1

---
 ...t-setting-an-upper-bound-on-versions.patch | 244 ++++++++++++++++++
 .../AvailabilityVersions/default.nix          |  99 +++++++
 .../darwin/apple-source-releases/default.nix  |   4 +
 3 files changed, 347 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch
new file mode 100644
index 000000000000..6dcf8eef3619
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch
@@ -0,0 +1,244 @@
+From dd3a2378cca465ec783fd792158b2fc11f83722c Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Tue, 2 Jul 2024 20:04:56 -0400
+Subject: [PATCH] Support setting an upper bound on versions
+
+---
+ availability | 94 ++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 61 insertions(+), 33 deletions(-)
+
+diff --git a/availability b/availability
+index 8ebd250..5bb9edb 100755
+--- a/availability
++++ b/availability
+@@ -17,12 +17,34 @@ MIN_PYTHON = (3, 7) #Required for ordered dictionaries as default
+ if sys.version_info < MIN_PYTHON:
+     sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)
+ 
++
++def parse_version(ver):
++    if hasattr(ver, "string"):
++        ver = ver.string()
++
++    return (tuple(map(int, ver.split("."))) + (0, 0))[:3]
++
++
++def version_older_or_equal(lhs, rhs):
++    if not rhs:
++        return True
++
++    lhs_major, lhs_minor, lhs_patch = parse_version(lhs)
++    rhs_major, rhs_minor, rhs_patch = parse_version(rhs)
++
++    return (
++        lhs_major < rhs_major
++        or (lhs_major == rhs_major and lhs_minor < rhs_minor)
++        or (lhs_major == rhs_major and lhs_minor == rhs_minor and lhs_patch <= rhs_patch)
++    )  
++     
++
+ # The build script will embed the DSL content here, otherwise we build it at runtime
+ dslContent = None
+ # @@INSERT_DSL_CONTENT()@@
+ 
+ class VersionSetDSL:
+-    def __init__(self, data):   self.parsedDSL = self.Parser(data)
++    def __init__(self, data, threshold):   self.parsedDSL = self.Parser(data, threshold)
+     def sets(self):             return self.parsedDSL.version_sets
+     def platforms(self):        return self.parsedDSL.platforms
+ 
+@@ -104,12 +126,15 @@ class VersionSetDSL:
+                 self.availability_deprecation_define_name = optionals["availability_deprecation_define_name"]
+             if "version_define_name" in optionals:
+                 self.availability_define_prefix = f"__{optionals['version_define_name']}_"
+-        def add_version(self, version): return self.versions.append(version);
++        def add_version(self, version, threshold):
++            if version_older_or_equal(version, threshold):
++                self.versions.append(version)
+         def add_variant(self, variant): return self.variants.append(variant);
+     class Parser:
+         platforms       = {}
+         version_sets    = []
+-        def __init__(self, data):
++        def __init__(self, data, threshold):
++            self.threshold = threshold
+             for line in data.splitlines():
+                 line = line.strip().split('#',1)[0]
+                 if not line:
+@@ -129,7 +154,7 @@ class VersionSetDSL:
+         def set(self, name, version, uversion):
+             platforms = {}
+             for (platformName, platform) in self.platforms.items():
+-                if platform.versioned:
++                if platform.versioned and platform.versions:
+                     platforms[platformName] = platform.versions[-1]
+             version_set                 = {}
+             version_set["name"]         = name
+@@ -138,7 +163,7 @@ class VersionSetDSL:
+             self.version_sets.append(version_set)
+             # TODO add error checking for version decrease
+         def version(self, platform, version):
+-            if platform in self.platforms: self.platforms[platform].add_version(VersionSetDSL.Version(version))
++            if platform in self.platforms: self.platforms[platform].add_version(VersionSetDSL.Version(version), self.threshold)
+             else:
+                 print(f"Unknown platform \"{platform}\"")
+                 exit(-1)
+@@ -165,9 +190,8 @@ if not dslContent:
+             parts = line.split()
+             if uversion and parts and parts[0] == "set" and parts[3] == uversion:
+                 break
+-versions = VersionSetDSL(dslContent)
+ 
+-def print_sets():
++def print_sets(versions):
+     print("---")
+     for set in versions.sets():
+         print(f'{set["name"]}:')
+@@ -178,7 +202,8 @@ def print_versions(platform):
+     print(" ".join([version.string() for version in versions.platforms()[platform].versions]))
+ 
+ class Preprocessor:
+-    def __init__(self, inputFile, outputFile):
++    def __init__(self, versions, inputFile, outputFile):
++        self.versions = versions
+         bufferedOutput = ""
+         with tempfile.NamedTemporaryFile('w') as tmp:
+             with open(inputFile, 'r') as input:
+@@ -207,10 +232,10 @@ class Preprocessor:
+         output.write("\"\"\"\n")
+     def VERSION_MAP(self, output):
+         sets = []
+-        for set in versions.sets():
++        for set in self.versions.sets():
+             set_string = ", ".join(sorted({".{} = {}".format(os,osVersion.hex()) for (os,osVersion) in set["platforms"].items()}))
+             sets.append("\t{{ .set = {}, {} }}".format(set["version"].hex(), set_string))
+-        platform_string = "\n".join(["    uint32_t {} = 0;".format(name) for name in versions.platforms().keys()])  
++        platform_string = "\n".join(["    uint32_t {} = 0;".format(name) for name in self.versions.platforms().keys()])
+         output.write("""
+ #include <set>
+ #include <array>
+@@ -229,16 +254,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+ }};
+ """.format(platform_string, len(sets), ",\n".join(sets)))
+     def DYLD_HEADER_VERSIONS(self, output):
+-        for (name,platform) in versions.platforms().items():
++        for (name,platform) in self.versions.platforms().items():
+             for version in platform.versions:
+                 output.write(f"#define {platform.dyld_version_define_name + version.symbol() : <48}{version.hex()}\n");
+             output.write("\n")
+-        for set in versions.sets():
++        for set in self.versions.sets():
+             set_string = " / ".join(sorted({"{} {}".format(os,osVersion.string()) for(os,osVersion) in set["platforms"].items()}))
+             output.write("// dyld_{}_os_versions => {}\n".format(set["name"], set_string))
+             output.write("#define dyld_{}_os_versions".format(set["name"]).ljust(56, ' '))
+             output.write("({{ (dyld_build_version_t){{0xffffffff, {}}}; }})\n\n".format(set["version"].hex()))
+-        for (name,platform) in versions.platforms().items():
++        for (name,platform) in self.versions.platforms().items():
+             for version in platform.versions:
+                 output.write("#define dyld_platform_version_{}_{}".format(platform.stylized_name, version.symbol()).ljust(56, ' '))
+                 output.write("({{ (dyld_build_version_t){{{}, {}{}}}; }})\n".format(platform.platform_define, platform.dyld_version_define_name, version.symbol()))
+@@ -247,14 +272,14 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+     def ALIAS_VERSION_MACROS(self, output, platformString, newName, oldName, **optionals):
+         minVersion =  literal_eval(optionals.get("minVersion", "0x00000000"))
+         maxVersion =  literal_eval(optionals.get("maxVersion", "0xFFFFFFFF"))
+-        platform = versions.platforms()[platformString];
++        platform = self.versions.platforms()[platformString];
+         for version in platform.versions:
+             if literal_eval(version.hex()) < minVersion: continue
+             if literal_eval(version.hex()) >= maxVersion: continue
+             output.write(f'#define {newName + version.symbol() : <48} {oldName + version.symbol()}\n')
+     def AVAILABILITY_DEFINES(self, output):
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString];
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString];
+             if platform.bleached:
+                 output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
+             output.write(f"#ifndef __API_TO_BE_DEPRECATED_{platform.availability_deprecation_define_name}\n")
+@@ -268,16 +293,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+                 output.write(f"#endif /* __APPLE_BLEACH_SDK__ */\n")
+             output.write(f"\n");
+     def AVAILABILITY_VERSION_DEFINES(self, output):
+-        for platformString in versions.platforms():
+-            short = platform = versions.platforms()[platformString].short_version_numbers
+-            platform = versions.platforms()[platformString];
++        for platformString in self.versions.platforms():
++            short = platform = self.versions.platforms()[platformString].short_version_numbers
++            platform = self.versions.platforms()[platformString];
+             for version in platform.versions:
+                 output.write(f"#define {platform.availability_define_prefix + version.symbol() : <48}{version.decimal(short)}\n")
+             output.write(f"/* {platform.availability_define_prefix}_NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */\n\n")
+     def AVAILABILITY_MIN_MAX_DEFINES(self, output):
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString];
+-            if not platform.versioned:
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString];
++            if not platform.versioned or not platform.versions:
+                 continue
+             if platform.bleached:
+                 output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
+@@ -310,8 +335,8 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+             output.write(f"   #define __API_UNAVAILABLE_PLATFORM_{displayName} {realName},unavailable\n")
+         output.write(f"#if defined(__has_feature) && defined(__has_attribute)\n")
+         output.write(f" #if __has_attribute(availability)\n")
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString];
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString];
+             if platform.bleached:
+                 output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
+             writeDefines(platformString, platformString, platform.versioned)
+@@ -326,9 +351,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+         output.write(f" #endif /* __has_attribute(availability) */\n")
+         output.write(f"#endif /* defined(__has_feature) && defined(__has_attribute) */\n")
+     def AVAILABILITY_MACRO_IMPL(self, output, prefix, dispatcher, **optionals):
+-        count = len(versions.platforms())
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString]
++        count = len(self.versions.platforms())
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString]
+             count = count + len(platform.variants)
+         platformList    = []
+         argList         = []
+@@ -344,9 +369,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+         scoped_availablity = False
+         if "scoped_availablity" in optionals and optionals["scoped_availablity"] == "TRUE":
+             scoped_availablity=True
+-        count = len(versions.platforms())
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString]
++        count = len(self.versions.platforms())
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString]
+             count = count + len(platform.variants)
+         argList = ','.join([f'{macroName}{x}' for x in reversed(range(0, count))])
+         if "argCount" in optionals:
+@@ -358,8 +383,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+             output.write(f"    #define {name}(...) {macroName}_GET_MACRO(__VA_ARGS__,{argList},0)(__VA_ARGS__)\n")
+ 
+ parser = argparse.ArgumentParser()
++parser.add_argument("--threshold",                          default=False,                      help='Specifies the maximum version (inclusive) included in pre-processed headers')
+ group = parser.add_mutually_exclusive_group()
+-for (name, platform) in versions.platforms().items():
++for (name, platform) in VersionSetDSL(dslContent, threshold=None).platforms().items():
+     group.add_argument("--{}".format(name), default=False, action='store_true', help="Prints all SDK versions defined for {}".format(name))
+     for alias in platform.cmd_aliases:
+         group.add_argument("--{}".format(alias), dest=name, default=False, action='store_true', help="Alias for --{}".format(name))
+@@ -367,8 +393,10 @@ group.add_argument("--sets",                                default=False, actio
+ group.add_argument("--preprocess",                          nargs=2,                            help=argparse.SUPPRESS)
+ args = parser.parse_args()
+ 
+-if args.sets:                                   print_sets();
+-elif args.preprocess:                           Preprocessor(args.preprocess[0], args.preprocess[1]);
++versions = VersionSetDSL(dslContent, threshold=args.threshold)
++
++if args.sets:                                   print_sets(versions);
++elif args.preprocess:                           Preprocessor(versions, args.preprocess[0], args.preprocess[1]);
+ else:
+     for platform in versions.platforms().keys():
+         if getattr(args, platform, None):
+-- 
+2.45.2
+
diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix
new file mode 100644
index 000000000000..c80dd6235e41
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix
@@ -0,0 +1,99 @@
+{
+  lib,
+  stdenvNoCC,
+  appleDerivation',
+  gnused,
+  python3,
+  unifdef,
+}:
+
+appleDerivation' stdenvNoCC {
+  nativeBuildInputs = [ unifdef ];
+
+  patches = [ ./0001-Support-setting-an-upper-bound-on-versions.patch ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    declare -a unifdef_sources=(
+      os_availability.modulemap
+      os_availability_private.modulemap
+      AvailabilityPrivate.modulemap
+    )
+    unifdef -x2 -UBUILD_FOR_DRIVERKIT -m $(for x in "''${unifdef_sources[@]}"; do echo templates/$x; done)
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/bin" "$out/libexec" "$out/share/availability"
+
+    cp -r availability.dsl templates "$out/share/availability/"
+
+    substitute availability "$out/libexec/availability" \
+      --replace-fail '/usr/bin/env python3' '${lib.getBin python3}/bin/python3' \
+      --replace-fail 'f"{os.path.abspath(os.path.dirname(sys.argv[0]))}/' "\"$out/share/availability/"
+    chmod a+x "$out/libexec/availability"
+
+    cat <<SCRIPT > "$out/bin/gen-headers"
+    #!/usr/bin/env bash
+    set -eu
+
+    declare -a headers=(
+      Availability.h
+      AvailabilityInternal.h
+      AvailabilityInternalLegacy.h
+      AvailabilityMacros.h
+      AvailabilityVersions.h
+      os/availability.h
+    )
+
+    dest=\$2
+    threshold=\$1
+
+    for header in "\''${headers[@]}"; do
+      header_src=\''${header/\//_}
+      mkdir -p "\$(dirname "\$dest/include/\$header")"
+      "$out/libexec/availability" \\
+        --threshold "\$threshold" \\
+        --preprocess "$out/share/availability/templates/\$header_src" "\$dest/include/\$header"
+    done
+
+    # `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` is only defined by clang 17+, so define it for older versions.
+    ${lib.getExe gnused} -E '/#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED/{
+        i#ifndef __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
+        i#define __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+        i#endif
+      }' \\
+      -i "\$dest/include/AvailabilityInternal.h"
+
+    # Remove macros from newer SDKs because they can confuse some programs about the SDK version.
+    declare -a versionParts=(\''${threshold//./ })
+    if [ "\''${versionParts[0]}" == "10" ]; then
+      sdkMajor=\''${versionParts[1]}
+      sdkMinor=\''${versionParts[2]:-0}
+      for minor in \$(seq \$(("\$sdkMinor" + 1)) 9); do
+        ${lib.getExe gnused} \\
+          -E "/VERSION_10_\''${sdkMajor}_\$minor/,/#endif/c\\ */" \\
+          -i "\$dest/include/AvailabilityMacros.h"
+      done
+      for major in \$(seq \$(("\$sdkMajor" + 1)) 15); do
+        ${lib.getExe gnused} \\
+          -E "/VERSION_10_\$major/,/#endif/c\\ */" \\
+          -i "\$dest/include/AvailabilityMacros.h"
+      done
+    fi
+
+    cp "$out/share/availability/templates/os_availability.modulemap" "\$dest/include/"
+    SCRIPT
+    chmod a+x "$out/bin/gen-headers"
+
+    patchShebangs "$out/bin"
+
+    runHook postInstall
+  '';
+
+  meta.mainProgram = "gen-headers";
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index aae3d515a6f9..6692e149d420 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -10,6 +10,9 @@ let
   # a stdenv out of something like this. With some care we can probably get rid of this, but for
   # now it's staying here.
   versions = {
+    "macos-14.4" = {
+      AvailabilityVersions = "140.1";
+    };
     "macos-14.3" = {
       system_cmds   = "970.0.4";
     };
@@ -248,6 +251,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
 
     inherit (adv_cmds-boot) ps locale;
     architecture    = applePackage "architecture"      "osx-10.11.6"     "sha256-cUKeMx6mOAxBSRHIdfzsrR65Qv86m7+20XvpKqVfwVI=" {};
+    AvailabilityVersions = applePackage "AvailabilityVersions" "macos-14.4" "sha256-O9/EOsbK5ZXxh6iDSTwGWWrY5GX/viUwdfG3tdvZwcQ=" {};
     bsdmake         = applePackage "bsdmake"           "dev-tools-3.2.6" "sha256-CW8zP5QZMhWTGp+rhrm8oHE/vSLsRlv1VRAGe1OUDmI=" {};
     CarbonHeaders   = applePackage "CarbonHeaders"     "osx-10.6.2"      "sha256-UNaHvxzYzEBnYYuoMLqWUVprZa6Wqn/3XleoSCco050=" {};
     CommonCrypto    = applePackage "CommonCrypto"      "osx-10.12.6"     "sha256-FLgODBrfv+XsGaAjddncYAm/BIJJYw6LcwX/z7ncKFM=" {};

From 7f45223beaaf264b5dfd20c88a58237143258947 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 13 Jul 2024 08:42:23 -0400
Subject: [PATCH 226/319] darwin.binutils: add dwarfdump and fix typo

---
 pkgs/os-specific/darwin/binutils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index ee9a80518acd..122c6322065f 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -17,6 +17,7 @@ let
     "addr2line"
     "ar"
     "c++filt"
+    "dwarfdump"
     "dsymutil"
     "nm"
     "objcopy"
@@ -90,7 +91,7 @@ stdenvNoCC.mkDerivation {
       ${linkManPages (lib.getMan cctools) "$tool" "$tool"}
     done
     ${
-      # These unprefixed because some tools expect to invoke them without it when cross-compiling to Darwin:
+      # These are unprefixed because some tools expect to invoke them without it when cross-compiling to Darwin:
       # - clang needs `dsymutil` when building with debug information;
       # - meson needs `lipo` when cross-compiling to Darwin; and
       # - meson also needs `install_name_tool` and `otool` when performing rpath cleanup on installation.

From b7952b4729a1fe67c06c8323771403b7a371624b Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 18 Apr 2024 20:13:00 -0400
Subject: [PATCH 227/319] darwin.Libsystem: get headers from
 AvailabilityVersions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While these headers correspond to a newer SDK, they’re compatible with the 10.12 SDK and more compatible with GCC.
---
 .../Libsystem/default.nix                     | 27 +++----------------
 .../Libsystem/headers.txt                     |  3 +++
 .../darwin/apple-source-releases/default.nix  |  2 +-
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index af37143835c5..960c7ab377a3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPackages, fetchzip, fetchFromGitHub
-, appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo
+, appleDerivation', AvailabilityVersions, sdkRoot, xnu, Libc, Libm, libdispatch, Libinfo
 , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
 , copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libmalloc, libplatform, libpthread
 , mDNSResponder, launchd, libutilHeaders, hfsHeaders, darwin-stubs
@@ -48,9 +48,11 @@ appleDerivation' stdenv {
 
     # Set up our include directories
     (cd ${xnu}/include && find . -name '*.h' -or -name '*.defs' | copyHierarchy $out/include)
-    cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h        $out/include
 
+    # These headers are from a newer SDK, but they’re more compatible with GCC (and still work with older SDKs).
+    ${lib.getExe AvailabilityVersions} ${lib.getVersion sdkRoot} "$out"
+
     for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} \
                ${libclosure} ${CarbonHeaders} ${libdispatch} ${ncurses.dev} \
                ${CommonCrypto} ${copyfile} ${removefile} ${libresolvHeaders} \
@@ -74,27 +76,6 @@ appleDerivation' stdenv {
     cp ${darling.src}/src/libc/os/log.h $out/include/os
     cp ${darling.src}/src/duct/include/os/trace.h $out/include/os
 
-    cat <<EOF > $out/include/os/availability.h
-    #ifndef __OS_AVAILABILITY__
-    #define __OS_AVAILABILITY__
-    #include <AvailabilityInternal.h>
-
-    #if defined(__has_feature) && defined(__has_attribute) && __has_attribute(availability)
-      #define API_AVAILABLE(...) __API_AVAILABLE_GET_MACRO(__VA_ARGS__, __API_AVAILABLE4, __API_AVAILABLE3, __API_AVAILABLE2, __API_AVAILABLE1)(__VA_ARGS__)
-      #define API_DEPRECATED(...) __API_DEPRECATED_MSG_GET_MACRO(__VA_ARGS__, __API_DEPRECATED_MSG5, __API_DEPRECATED_MSG4, __API_DEPRECATED_MSG3, __API_DEPRECATED_MSG2, __API_DEPRECATED_MSG1)(__VA_ARGS__)
-      #define API_DEPRECATED_WITH_REPLACEMENT(...) __API_DEPRECATED_REP_GET_MACRO(__VA_ARGS__, __API_DEPRECATED_REP5, __API_DEPRECATED_REP4, __API_DEPRECATED_REP3, __API_DEPRECATED_REP2, __API_DEPRECATED_REP1)(__VA_ARGS__)
-      #define API_UNAVAILABLE(...) __API_UNAVAILABLE_GET_MACRO(__VA_ARGS__, __API_UNAVAILABLE3, __API_UNAVAILABLE2, __API_UNAVAILABLE1)(__VA_ARGS__)
-    #else
-
-      #define API_AVAILABLE(...)
-      #define API_DEPRECATED(...)
-      #define API_DEPRECATED_WITH_REPLACEMENT(...)
-      #define API_UNAVAILABLE(...)
-
-    #endif
-    #endif
-    EOF
-
     cat <<EOF > $out/include/TargetConditionals.h
     #ifndef __TARGETCONDITIONALS__
     #define __TARGETCONDITIONALS__
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
index b6e608f81ebf..d6398c6ba464 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
@@ -1,7 +1,9 @@
 AssertMacros.h
 Availability.h
 AvailabilityInternal.h
+AvailabilityInternalLegacy.h
 AvailabilityMacros.h
+AvailabilityVersions.h
 Block.h
 Block_private.h
 CommonCrypto/CommonBaseXX.h
@@ -1050,6 +1052,7 @@ os/overflow.h
 os/semaphore_private.h
 os/trace.h
 os/tsd.h
+os_availability.modulemap
 os/voucher_activity_private.h
 os/voucher_private.h
 osfmk/UserNotification/KUNCUserNotifications.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 6692e149d420..dfe4a7f19a69 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -287,7 +287,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
     else macosPackages_11_0_1.libplatform;
     libpthread      = applePackage "libpthread"        "osx-10.12.6"     "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {};
     libresolv       = applePackage "libresolv"         "osx-10.12.6"     "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {};
-    Libsystem       = applePackage "Libsystem"         "osx-10.12.6"     "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {};
+    Libsystem       = applePackage "Libsystem"         "osx-10.12.6"     "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" { inherit (pkgs.darwin.apple_sdk) sdkRoot; };
     libutil         = applePackage "libutil"           "osx-10.12.6"     "sha256-4PFuk+CTLwvd/Ll9GLBkiIM0Sh/CVaiKwh5m1noheRs=" {};
     libunwind       = applePackage "libunwind"         "osx-10.12.6"     "sha256-CC0sndP/mKYe3dZu3v7fjuDASV4V4w7dAcnWMvpoquE=" {};
     mDNSResponder   = applePackage "mDNSResponder"     "osx-10.12.6"     "sha256-ddZr6tropkpdMJhq/kUlm3OwO8b0yxtkrMpwec8R4FY=" {};

From 4ee4fe5fe75f8243e8885eb58c65b80fde92a6c4 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 14 Apr 2024 08:56:47 -0400
Subject: [PATCH 228/319] darwin.configd: remove dependency on CF for private
 headers

---
 .../apple-source-releases/configd/default.nix | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 998bc867e757..b46cf7628c8c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
@@ -1,13 +1,29 @@
-{ lib, stdenv, runCommand, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security
+{ lib, stdenv, stdenvNoCC, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security
 , headersOnly ? false }:
 
 let
-  privateHeaders = runCommand "swift-corelibs-foundation-private" { } ''
-    mkdir -p $out/include/CoreFoundation
+  # Copy the headers out of CF instead of building it to avoid an infinite recursion.
+  privateHeaders = stdenvNoCC.mkDerivation {
+    pname = "swift-corelibs-foundation-private";
+    inherit (swift-corelibs-foundation) version src;
 
-    cp ${swift-corelibs-foundation}/Library/Frameworks/CoreFoundation.framework/PrivateHeaders/* \
-      $out/include/CoreFoundation
-  '';
+    buildCommand = ''
+      unpackFile "$src"
+
+      mkdir -p "$out/include/CoreFoundation"
+
+      declare -a privateHeaders=(
+        Base.subproj/CFRuntime.h
+        PlugIn.subproj/CFBundlePriv.h
+        RunLoop.subproj/CFRunLoop.h
+        String.subproj/CFStringDefaultEncoding.h
+      )
+
+      for header in "''${privateHeaders[@]}"; do
+        cp source/CoreFoundation/$header $out/include/CoreFoundation
+      done
+    '';
+  };
 in
 appleDerivation' stdenv {
   meta.broken = stdenv.cc.nativeLibc;

From baf3568fb28809041f3efa6956194f4c82fc3e45 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 9 Apr 2024 07:50:27 -0400
Subject: [PATCH 229/319] darwin.libdispatch: 442.1.4 -> 703.50.37

---
 .../Libsystem/headers.txt                      |  2 --
 .../darwin/apple-source-releases/default.nix   |  5 ++++-
 .../libdispatch/default.nix                    | 18 +++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
index d6398c6ba464..e5547ece2c8d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
@@ -1053,8 +1053,6 @@ os/semaphore_private.h
 os/trace.h
 os/tsd.h
 os_availability.modulemap
-os/voucher_activity_private.h
-os/voucher_private.h
 osfmk/UserNotification/KUNCUserNotifications.h
 osfmk/UserNotification/UNDReply.defs
 osfmk/UserNotification/UNDRequest.defs
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index dfe4a7f19a69..491f2b6675d5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -39,6 +39,9 @@ let
       libpthread    = "218.60.3";
       hfs           = "366.70.1";
     };
+    "osx-10.12.4" = {
+      libdispatch = "703.50.37";
+    };
     "osx-10.11.6" = {
       PowerManagement = "572.50.1";
       dtrace        = "168";
@@ -275,7 +278,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
       };
     };
     libclosure      = applePackage "libclosure"        "osx-10.11.6"     "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {};
-    libdispatch     = applePackage "libdispatch"       "osx-10.10.5"     "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {};
+    libdispatch     = applePackage "libdispatch"       "osx-10.12.4"     "sha256-xUqoG5JK4P3nXeoVUOBzodVK9fjH/I3xJ6WRtM39bdw=" {};
     Libinfo         = applePackage "Libinfo"           "osx-10.11.6"     "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {};
     Libm            = applePackage "Libm"              "osx-10.7.4"      "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {};
     Libnotify       = applePackage "Libnotify"         "osx-10.12.6"     "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index 176cb8646f1e..335115f8fea6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -1,13 +1,12 @@
-{ appleDerivation', stdenvNoCC }:
+{ lib, appleDerivation', stdenvNoCC }:
 
-appleDerivation' stdenvNoCC {
+appleDerivation' stdenvNoCC (finalAttrs: {
   dontConfigure = true;
   dontBuild = true;
   installPhase = ''
     mkdir -p $out/include/dispatch $out/include/os
 
     # Move these headers so CF can find <os/voucher_private.h>
-    mv private/voucher*.h  $out/include/os
     cp -r private/*.h  $out/include/dispatch
 
     cp -r dispatch/*.h $out/include/dispatch
@@ -15,7 +14,7 @@ appleDerivation' stdenvNoCC {
 
     # gcc compatibility. Source: https://stackoverflow.com/a/28014302/3714556
     substituteInPlace $out/include/dispatch/object.h \
-      --replace 'typedef void (^dispatch_block_t)(void);' \
+      --replace-fail 'typedef void (^dispatch_block_t)(void);' \
                 '#ifdef __clang__
                  typedef void (^dispatch_block_t)(void);
                  #else
@@ -46,9 +45,14 @@ appleDerivation' stdenvNoCC {
     dispatch/source.h
     dispatch/source_private.h
     dispatch/time.h
+  ''
+  + lib.optionalString (lib.versionAtLeast "1271.40.12" finalAttrs.version) ''
+    dispatch/time_private.h
+    dispatch/workloop.h
+    dispatch/workloop_private.h
+  ''
+  + ''
     os/object.h
     os/object_private.h
-    os/voucher_activity_private.h
-    os/voucher_private.h
   '';
-}
+})

From cdf968c68d603d1a0188ab7e84718bf739d9f5ef Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 6 Apr 2024 10:30:24 -0400
Subject: [PATCH 230/319] libtapi: 1100.0.11 -> 1500.0.12.3

---
 ...r-no_exported_symbols-linker-support.patch |  37 ++++
 .../0002-Pass-fileType-to-writeToStream.patch |  25 +++
 ...ignator-order-with-declaration-order.patch |  28 +++
 pkgs/by-name/li/libtapi/package.nix           | 184 ++++++++++++++++++
 4 files changed, 274 insertions(+)
 create mode 100644 pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch
 create mode 100644 pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch
 create mode 100644 pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch
 create mode 100644 pkgs/by-name/li/libtapi/package.nix

diff --git a/pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch b/pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch
new file mode 100644
index 000000000000..1a1c77e6ce9e
--- /dev/null
+++ b/pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch
@@ -0,0 +1,37 @@
+From e954aacbc075355419f5fc99db61f68aca1fcfe4 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 5 Apr 2024 14:16:40 -0400
+Subject: [PATCH 1/3] Check for -no_exported_symbols linker support
+
+---
+ CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tapi/CMakeLists.txt b/tapi/CMakeLists.txt
+index 62affdf..82426de 100644
+--- a/tapi/CMakeLists.txt
++++ b/tapi/CMakeLists.txt
+@@ -73,6 +73,9 @@ llvm_check_linker_flag(CXX "-Wl,-no_inits" LINKER_SUPPORTS_NO_INITS)
+ llvm_check_linker_flag(CXX "-Wl,-iosmac_version_min,13.0" LINKER_SUPPORTS_IOSMAC)
+ # MARZIPAN RENAME
+ 
++# Older versions of ld64 (e.g., in the Darwin bootstrap) do not support this flag.
++llvm_check_linker_flag(CXX "-Wl,-no_exported_symbols" LINKER_SUPPORTS_NO_EXPORTED_SYMBOLS)
++
+ # Check if i386 is supported.
+ SET(CMAKE_OLD_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+ SET(CMAKE_OLD_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+@@ -160,7 +163,9 @@ endmacro(add_tapi_library)
+ macro(add_tapi_executable name)
+   add_llvm_executable(${name} ${ARGN})
+   set_target_properties(${name} PROPERTIES FOLDER "Tapi executables")
+-  target_link_options(${name} PRIVATE "-Wl,-no_exported_symbols")
++  if(LINKER_SUPPORTS_NO_EXPORTED_SYMBOLS)
++    target_link_options(${name} PRIVATE "-Wl,-no_exported_symbols")
++  endif()
+ endmacro(add_tapi_executable)
+ 
+ function(tapi_clang_tablegen)
+-- 
+2.42.0
+
diff --git a/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch b/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch
new file mode 100644
index 000000000000..ffcedb0c6f6e
--- /dev/null
+++ b/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch
@@ -0,0 +1,25 @@
+From 77ca537cfc61765f2109c626757f2da8de602ce0 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 5 Apr 2024 23:20:32 -0400
+Subject: [PATCH 2/3] Pass fileType to writeToStream
+
+---
+ lib/Core/JSONReaderWriter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tapi/lib/Core/JSONReaderWriter.cpp b/tapi/lib/Core/JSONReaderWriter.cpp
+index c040670..c1be85f 100644
+--- a/tapi/lib/Core/JSONReaderWriter.cpp
++++ b/tapi/lib/Core/JSONReaderWriter.cpp
+@@ -57,7 +57,7 @@ Error JSONWriter::writeFile(raw_ostream &os, const InterfaceFile *file,
+   if (file == nullptr)
+     return errorCodeToError(std::make_error_code(std::errc::invalid_argument));
+ 
+-  return TextAPIWriter::writeToStream(os, *file, /*Compact=*/false);
++  return TextAPIWriter::writeToStream(os, *file, fileType, /*Compact=*/false);
+ }
+ 
+ TAPI_NAMESPACE_INTERNAL_END
+-- 
+2.42.0
+
diff --git a/pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch b/pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch
new file mode 100644
index 000000000000..2883af0a5228
--- /dev/null
+++ b/pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch
@@ -0,0 +1,28 @@
+From b69038edb2e0ace9128407ab3ee7bc1001ffd751 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Sun, 7 Apr 2024 19:23:24 -0400
+Subject: [PATCH 3/3] Match designator order with declaration order
+
+---
+ lib/Core/Demangler.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tapi/lib/Core/Demangler.cpp b/tapi/lib/Core/Demangler.cpp
+index d85899a..f5c485a 100644
+--- a/tapi/lib/Core/Demangler.cpp
++++ b/tapi/lib/Core/Demangler.cpp
+@@ -30,9 +30,10 @@ bool Demangler::isItaniumEncoding(StringRef mangledName) {
+   return mangledName.startswith("_Z") || mangledName.startswith("___Z");
+ }
+ 
++
+ DemangledName Demangler::demangle(StringRef mangledName) {
+   DemangledName result{
+-      .str = mangledName.str(), .isSwift = false, .isItanium = false};
++      .str = mangledName.str(), .isItanium = false, .isSwift = false};
+   char *demangled = nullptr;
+ 
+   if (isItaniumEncoding(mangledName)) {
+-- 
+2.42.0
+
diff --git a/pkgs/by-name/li/libtapi/package.nix b/pkgs/by-name/li/libtapi/package.nix
new file mode 100644
index 000000000000..b11de1756c90
--- /dev/null
+++ b/pkgs/by-name/li/libtapi/package.nix
@@ -0,0 +1,184 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  ninja,
+  python3,
+  zlib,
+}:
+
+let
+  # libtapi is only supported building against Apple’s LLVM fork pinned to a specific revision.
+  # It can’t be built against upstream LLVM because it uses APIs that are specific to Apple’s fork.
+  # See: https://github.com/apple-oss-distributions/tapi/blob/main/Readme.md
+
+  # Apple’s LLVM fork uses its own versioning scheme.
+  # See: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions
+  # Note: Can’t use a sparse checkout because the Darwin stdenv bootstrap can’t depend on fetchgit.
+  appleLlvm = {
+    version = "15.0.0"; # As reported by upstream’s `tapi --version`.
+    rev = "2b5ff47e44b059c03de5779479d01a133ab4d581"; # Per the TAPI repo.
+    hash = "sha256-X37zBbpSEWmqtdTXsd1t++gp+0ggA8YtB73fGKNaiR0=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtapi";
+  version = "1500.0.12.3";
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
+
+  srcs = [
+    (fetchFromGitHub {
+      name = "tapi-src";
+      owner = "apple-oss-distributions";
+      repo = "tapi";
+      rev = "tapi-${finalAttrs.version}";
+      hash = "sha256-YeaA2OeSY1fXYJHPJJ0TrVC1brspSvutBtPMPGX6Y1o=";
+    })
+    # libtapi can’t avoid pulling the whole repo even though it needs only a couple of folders because
+    # `fetchgit` can’t be used in the Darwin bootstrap.
+    (fetchFromGitHub {
+      name = "apple-llvm-src";
+      owner = "apple";
+      repo = "llvm-project";
+      inherit (appleLlvm) rev hash;
+    })
+  ];
+
+  patches = [
+    # Older versions of ld64 may not support `-no_exported_symbols`, so use it only
+    # when the linker supports it.
+    # Note: This can be dropped once the bootstrap tools are updated after the ld64 update.
+    ./0001-Check-for-no_exported_symbols-linker-support.patch
+    # The recommended upstream revision of Apple’s LLVM fork needs this patch, or
+    # `tapi stubify` will crash when generating stubs.
+    (fetchpatch {
+      url = "https://github.com/apple/llvm-project/commit/455bf3d1ccd6a52df5e38103532c1b8f49924edc.patch";
+      hash = "sha256-ujZcfdAls20JPIvjvO2Xv8st8cNTY/XTEQusICKBKSA";
+    })
+    # Updates `JSONReaderWriter` to work with the API change in the above patch.
+    ./0002-Pass-fileType-to-writeToStream.patch
+    # Fix build on Linux. GCC is more picky than clang about the field order.
+    ./0003-Match-designator-order-with-declaration-order.patch
+  ];
+
+  postPatch =
+    ''
+      # Enable building on non-Darwin platforms
+      substituteInPlace tapi/CMakeLists.txt \
+        --replace-fail 'message(FATAL_ERROR "Unsupported configuration.")' ""
+
+      # Remove the client limitation on linking to libtapi.dylib.
+      substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
+        --replace-fail '-allowable_client ld' ""
+      # Replace hard-coded installation paths with standard ones.
+      declare -A installdirs=(
+        [bin]=BINDIR
+        [include]=INCLUDEDIR
+        [lib]=LIBDIR
+        [local/bin]=BINDIR
+        [local/share/man]=MANDIR
+        [share/man]=MANDIR
+      )
+      for dir in "''${!installdirs[@]}"; do
+        cmakevar=CMAKE_INSTALL_''${installdirs[$dir]}
+        for cmakelist in $(grep -rl "DESTINATION $dir" tapi); do
+          substituteInPlace "$cmakelist" \
+            --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}"
+        done
+      done
+      # Doesn’t seem to exist publically.
+      substituteInPlace tapi/test/CMakeLists.txt \
+        --replace-fail tapi-configs ""
+    ''
+    + lib.optionalString stdenv.isLinux ''
+      # Remove Darwin-specific versioning flags.
+      substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
+          --replace-fail '-current_version ''${DYLIB_VERSION} -compatibility_version 1' ""
+    '';
+
+  preUnpack = ''
+    mkdir source
+  '';
+
+  sourceRoot = "source";
+
+  postUnpack = ''
+    chmod -R u+w apple-llvm-src tapi-src
+    mv apple-llvm-src/{clang,cmake,llvm,utils} source
+    mv tapi-src source/tapi
+  '';
+
+  strictDeps = true;
+
+  buildInputs = [ zlib ]; # Upstream links against zlib in their distribution.
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    python3
+  ];
+
+  cmakeDir = "../llvm";
+
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" "clang;tapi")
+    (lib.cmakeFeature "LLVM_EXTERNAL_PROJECTS" "tapi")
+    (lib.cmakeBool "TAPI_INCLUDE_DOCS" true)
+    # Matches the version string format reported by upstream `tapi`.
+    (lib.cmakeFeature "TAPI_REPOSITORY_STRING" "tapi-${finalAttrs.version}")
+    (lib.cmakeFeature "TAPI_FULL_VERSION" appleLlvm.version)
+    # Match the versioning used by Apple’s LLVM fork (primarily used for .so versioning).
+    (lib.cmakeFeature "LLVM_VERSION_MAJOR" (lib.versions.major appleLlvm.version))
+    (lib.cmakeFeature "LLVM_VERSION_MINOR" (lib.versions.minor appleLlvm.version))
+    (lib.cmakeFeature "LLVM_VERSION_PATCH" (lib.versions.patch appleLlvm.version))
+    (lib.cmakeFeature "LLVM_VERSION_SUFFIX" "")
+    # Upstream `tapi` does not link against ncurses. Disable it explicitly to make sure
+    # it is not detected incorrectly from the bootstrap tools tarball.
+    (lib.cmakeBool "LLVM_ENABLE_TERMINFO" false)
+    # Disabling the benchmarks avoids a failure during the configure phase because
+    # the sparse checkout does not include the benchmarks.
+    (lib.cmakeBool "LLVM_INCLUDE_BENCHMARKS" false)
+    # tapi’s tests expect to target macOS 13.0 and build both x86_64 and universal
+    # binaries regardless of the host platform.
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
+    (lib.cmakeBool "TAPI_INCLUDE_TESTS" false)
+  ];
+
+  ninjaFlags = [
+    "libtapi"
+    "tapi-sdkdb"
+    "tapi"
+  ];
+
+  installTargets = [
+    "install-libtapi"
+    "install-tapi-docs"
+    "install-tapi-headers"
+    "install-tapi-sdkdb"
+    "install-tapi"
+  ];
+
+  postInstall = ''
+    # The man page is installed for these, but they’re not included in the source release.
+    rm $bin/share/man/man1/tapi-analyze.1 $bin/share/man/man1/tapi-api-verify.1
+  '';
+
+  meta = {
+    description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size";
+    homepage = "https://github.com/apple-oss-distributions/tapi/";
+    license = lib.licenses.ncsa;
+    mainProgram = "tapi";
+    maintainers = with lib.maintainers; [
+      matthewbauer
+      reckenrode
+    ];
+    platforms = lib.platforms.unix;
+  };
+})

From f02b50ba18e55e389501414228d5581472026f99 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 9 Apr 2024 07:48:23 -0400
Subject: [PATCH 231/319] ld64: init at 951.9

---
 .../0004-Use-std-atomics-and-std-mutex.patch  | 181 ++++++++++
 .../ld/ld64/0005-Support-LTO-in-nixpkgs.patch |  48 +++
 ...ob_a_linker_signature-implementation.patch | 113 +++++++
 ...SL-based-CoreCrypto-digest-functions.patch | 311 ++++++++++++++++++
 ...rching-in-standard-library-locations.patch |  25 ++
 pkgs/by-name/ld/ld64/gen_compile_stubs.py     |   8 +
 pkgs/by-name/ld/ld64/meson.build              | 249 ++++++++++++++
 pkgs/by-name/ld/ld64/meson.options            |   6 +
 pkgs/by-name/ld/ld64/package.nix              | 202 ++++++++++++
 9 files changed, 1143 insertions(+)
 create mode 100644 pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch
 create mode 100644 pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch
 create mode 100644 pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
 create mode 100644 pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
 create mode 100644 pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch
 create mode 100644 pkgs/by-name/ld/ld64/gen_compile_stubs.py
 create mode 100644 pkgs/by-name/ld/ld64/meson.build
 create mode 100644 pkgs/by-name/ld/ld64/meson.options
 create mode 100644 pkgs/by-name/ld/ld64/package.nix

diff --git a/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch b/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch
new file mode 100644
index 000000000000..8c414fcb51d8
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch
@@ -0,0 +1,181 @@
+From 5e92d65ef2b5cc07dc25b5b1bf645b314599f5d1 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Sat, 6 Apr 2024 20:29:25 -0400
+Subject: [PATCH 4/8] Use std::atomics and std::mutex
+
+---
+ src/ld/InputFiles.cpp | 13 ++++++-------
+ src/ld/InputFiles.h   |  9 +++++----
+ src/ld/OutputFile.cpp | 13 ++++++-------
+ src/ld/ld.cpp         | 11 +++++------
+ 4 files changed, 22 insertions(+), 24 deletions(-)
+
+diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp
+index ec53a60..427ab09 100644
+--- a/src/ld/InputFiles.cpp
++++ b/src/ld/InputFiles.cpp
+@@ -42,7 +42,6 @@
+ #include <mach-o/dyld.h>
+ #include <mach-o/fat.h>
+ #include <sys/sysctl.h>
+-#include <libkern/OSAtomic.h>
+ #if HAVE_LIBDISPATCH
+ #include <dispatch/dispatch.h>
+ #endif
+@@ -387,16 +386,16 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
+ 
+ 	ld::relocatable::File* objResult = mach_o::relocatable::parse(p, len, info.path, info.modTime, info.ordinal, objOpts);
+ 	if ( objResult != NULL ) {
+-		OSAtomicAdd64(len, &_totalObjectSize);
+-		OSAtomicIncrement32(&_totalObjectLoaded);
++		_totalObjectSize += len;
++		++_totalObjectLoaded;
+ 		return objResult;
+ 	}
+ 
+ 	// see if it is an llvm object file
+ 	objResult = lto::parse(p, len, info.path, info.modTime, info.ordinal, _options.architecture(), _options.subArchitecture(), _options.logAllFiles(), _options.verboseOptimizationHints());
+ 	if ( objResult != NULL ) {
+-		OSAtomicAdd64(len, &_totalObjectSize);
+-		OSAtomicIncrement32(&_totalObjectLoaded);
++		_totalObjectSize += len;
++		++_totalObjectLoaded;
+ 		return objResult;
+ 	}
+ 
+@@ -444,8 +443,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
+ 	ld::archive::File* archiveResult = ::archive::parse(p, len, info.path, info.modTime, info.ordinal, archOpts);
+ 	if ( archiveResult != NULL ) {
+ 	
+-		OSAtomicAdd64(len, &_totalArchiveSize);
+-		OSAtomicIncrement32(&_totalArchivesLoaded);
++		_totalArchiveSize += len;
++		++_totalArchivesLoaded;
+ 		return archiveResult;
+ 	}
+ 	
+diff --git a/src/ld/InputFiles.h b/src/ld/InputFiles.h
+index c18ccf8..ffff26b 100644
+--- a/src/ld/InputFiles.h
++++ b/src/ld/InputFiles.h
+@@ -46,6 +46,7 @@
+ #include <pthread.h>
+ #endif
+ 
++#include <atomic>
+ #include <vector>
+ 
+ #include "Options.h"
+@@ -78,10 +79,10 @@ public:
+ 	size_t						count() const { return _inputFiles.size(); }
+ 
+ 	// for -print_statistics
+-	volatile int64_t			_totalObjectSize;
+-	volatile int64_t			_totalArchiveSize;
+-	volatile int32_t			_totalObjectLoaded;
+-	volatile int32_t			_totalArchivesLoaded;
++	std::atomic<int64_t>			_totalObjectSize;
++	std::atomic<int64_t>			_totalArchiveSize;
++	std::atomic<int32_t>			_totalObjectLoaded;
++	std::atomic<int32_t>			_totalArchivesLoaded;
+ 	         int32_t			_totalDylibsLoaded;
+ 	
+ 	
+diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp
+index e2c0397..15912a2 100644
+--- a/src/ld/OutputFile.cpp
++++ b/src/ld/OutputFile.cpp
+@@ -43,11 +43,10 @@
+ #include <mach-o/dyld.h>
+ #include <mach-o/fat.h>
+ #include <dispatch/dispatch.h>
+-#include <os/lock_private.h>
+ extern "C" {
+     #include <corecrypto/ccsha2.h>
+ }
+-#include <string>
++#include <mutex>
+ #include <string>
+ #include <list>
+ #include <algorithm>
+@@ -1362,7 +1361,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta
+ 
+ 
+ #if SUPPORT_ARCH_arm64e
+-static os_lock_unfair_s  sAuthenticatedFixupDataLock = OS_LOCK_UNFAIR_INIT; // to serialize building of _authenticatedFixupData
++static std::mutex sAuthenticatedFixupDataLock; // to serialize building of _authenticatedFixupData
+ #endif
+ 
+ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::Atom* atom, uint8_t* buffer)
+@@ -1737,11 +1736,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::
+ 					}
+ 					else {
+ 						auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress);
+-						os_lock_lock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.lock();
+ 							assert(_authenticatedFixupData.find(fixupOffset) == _authenticatedFixupData.end());
+ 							auto authneticatedData = std::make_pair(authData, accumulator);
+ 							_authenticatedFixupData[fixupOffset] = authneticatedData;
+-						os_lock_unlock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.unlock();
+ 						// Zero out this entry which we will expect later.
+ 						set64LE(fixUpLocation, 0);
+ 					}
+@@ -1768,11 +1767,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::
+ 					}
+ 					else {
+ 						auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress);
+-						os_lock_lock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.lock();
+ 							assert(_authenticatedFixupData.find(fixupOffset) == _authenticatedFixupData.end());
+ 							auto authneticatedData = std::make_pair(authData, accumulator);
+ 							_authenticatedFixupData[fixupOffset] = authneticatedData;
+-						os_lock_unlock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.unlock();
+ 						// Zero out this entry which we will expect later.
+ 						set64LE(fixUpLocation, 0);
+ 					}
+diff --git a/src/ld/ld.cpp b/src/ld/ld.cpp
+index b7590a3..f1bf9df 100644
+--- a/src/ld/ld.cpp
++++ b/src/ld/ld.cpp
+@@ -47,9 +47,8 @@ extern "C" double log2 ( double );
+ #include <mach-o/dyld.h>
+ #include <dlfcn.h>
+ #include <AvailabilityMacros.h>
+-#include <os/lock_private.h>
+ 
+-#include <string>
++#include <mutex>
+ #include <map>
+ #include <set>
+ #include <string>
+@@ -1603,8 +1602,8 @@ int main(int argc, const char* argv[])
+ 								statistics.vmEnd.faults-statistics.vmStart.faults);
+ 			fprintf(stderr, "memory active: %lu, wired: %lu\n", statistics.vmEnd.active_count * vm_page_size, statistics.vmEnd.wire_count * vm_page_size);
+ 			char temp[40];
+-			fprintf(stderr, "processed %3u object files,  totaling %15s bytes\n", inputFiles._totalObjectLoaded, commatize(inputFiles._totalObjectSize, temp));
+-			fprintf(stderr, "processed %3u archive files, totaling %15s bytes\n", inputFiles._totalArchivesLoaded, commatize(inputFiles._totalArchiveSize, temp));
++			fprintf(stderr, "processed %3u object files,  totaling %15s bytes\n", inputFiles._totalObjectLoaded.load(), commatize(inputFiles._totalObjectSize.load(), temp));
++			fprintf(stderr, "processed %3u archive files, totaling %15s bytes\n", inputFiles._totalArchivesLoaded.load(), commatize(inputFiles._totalArchiveSize.load(), temp));
+ 			fprintf(stderr, "processed %3u dylib files\n", inputFiles._totalDylibsLoaded);
+ 			fprintf(stderr, "wrote output file            totaling %15s bytes\n", commatize(out.fileSize(), temp));
+ 		}
+@@ -1634,12 +1633,12 @@ int main(int argc, const char* argv[])
+ #ifndef NDEBUG
+ 
+ //  now that the linker is multi-threaded, only allow one assert() to be processed 
+-static os_lock_unfair_s  sAssertLock = OS_LOCK_UNFAIR_INIT;
++static std::mutex sAssertLock;
+ 
+ // implement assert() function to print out a backtrace before aborting
+ void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr)
+ {
+-	os_lock_lock(&sAssertLock);
++    sAssertLock.lock();
+ 
+     Snapshot *snapshot = Snapshot::globalSnapshot;
+     
+-- 
+2.45.1
+
diff --git a/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch b/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch
new file mode 100644
index 000000000000..fec7e31b5cdf
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch
@@ -0,0 +1,48 @@
+From faa5ab7c6e8d9a6c6157a2b681edad592ce78555 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Sun, 7 Apr 2024 15:33:36 -0400
+Subject: [PATCH 5/8] Support LTO in nixpkgs
+
+---
+ src/ld/InputFiles.cpp       | 11 ++---------
+ src/ld/parsers/lto_file.cpp |  2 +-
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp
+index 427ab09..b8a9870 100644
+--- a/src/ld/InputFiles.cpp
++++ b/src/ld/InputFiles.cpp
+@@ -464,15 +464,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
+ 			if ( _options.overridePathlibLTO() != NULL ) {
+ 				libLTO = _options.overridePathlibLTO();
+ 			}
+-			else if ( _NSGetExecutablePath(ldPath, &bufSize) != -1 ) {
+-				if ( realpath(ldPath, tmpPath) != NULL ) {
+-					char* lastSlash = strrchr(tmpPath, '/');
+-					if ( lastSlash != NULL )
+-						strcpy(lastSlash, "/../lib/libLTO.dylib");
+-					libLTO = tmpPath;
+-					if ( realpath(tmpPath, libLTOPath) != NULL ) 
+-						libLTO = libLTOPath;
+-				}
++			else {
++				libLTO = "@libllvm@/lib/libLTO.dylib";
+ 			}
+ 			throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO);
+ 		}
+diff --git a/src/ld/parsers/lto_file.cpp b/src/ld/parsers/lto_file.cpp
+index 5318212..e18e974 100644
+--- a/src/ld/parsers/lto_file.cpp
++++ b/src/ld/parsers/lto_file.cpp
+@@ -1807,7 +1807,7 @@ bool optimize(  const std::vector<const ld::Atom*>&	allAtoms,
+ 
+ }; // namespace lto
+ 
+-static const char *sLTODylib = "@rpath/libLTO.dylib";
++static const char *sLTODylib = "@libllvm@/lib/libLTO.dylib";
+ static std::atomic<bool> sLTOIsLoaded(false);
+ 
+ static void *getHandle() {
+-- 
+2.45.1
+
diff --git a/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch b/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
new file mode 100644
index 000000000000..e5485ab4cadc
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
@@ -0,0 +1,113 @@
+From add8bae5577ebe1c98cf7a711f87a3578a51d313 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Mon, 8 Apr 2024 22:42:40 -0400
+Subject: [PATCH 6/8] Add libcd_is_blob_a_linker_signature implementation
+
+---
+ compat/libcodedirectory.c | 74 +++++++++++++++++++++++++++++++++++++++
+ src/ld/libcodedirectory.h |  8 +++++
+ 2 files changed, 82 insertions(+)
+ create mode 100644 compat/libcodedirectory.c
+
+diff --git a/compat/libcodedirectory.c b/compat/libcodedirectory.c
+new file mode 100644
+index 0000000..e584dfc
+--- /dev/null
++++ b/compat/libcodedirectory.c
+@@ -0,0 +1,74 @@
++// SPDX-License-Identifier: APSL-2.0
++// libcd_is_blob_a_linker_signature implementation written by Randy Eckenrode © 2024
++
++#include <libcodedirectory.h>
++
++#include <stdbool.h>
++
++// References:
++// - https://forums.developer.apple.com/forums/thread/702351
++// - https://redmaple.tech/blogs/macho-files/#codedirectory-blob
++
++static inline uint32_t read32be(const uint8_t* data)
++{
++    return (data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3];
++}
++
++static inline bool is_embedded_signature(uint32_t magic) {
++    switch (magic) {
++    case CSMAGIC_EMBEDDED_SIGNATURE:
++    case CSMAGIC_EMBEDDED_SIGNATURE_OLD:
++        return true;
++    default:
++        return false;
++    }
++}
++
++static inline const uint8_t* find_code_directory(const uint8_t* data, size_t size) {
++    const uint8_t* index_ptr = data + offsetof(CS_SuperBlob, index);
++    
++    // There also needs to be space for the actual blobs, but there must be at least enough space
++    // for the blob indexes. If there’s not, then something’s wrong, and the blob is invalid.
++    uint32_t count = read32be(data + offsetof(CS_SuperBlob, count));
++    if (count > ((data + size) - index_ptr) / sizeof(CS_BlobIndex)) {
++        return NULL;
++    }
++
++    for (uint32_t n = 0; n < count; ++n) {
++        const uint8_t* current_index_ptr = index_ptr + n * sizeof(CS_BlobIndex);
++        uint32_t type = read32be(current_index_ptr + offsetof(CS_BlobIndex, type));
++        if (type == CSSLOT_CODEDIRECTORY) {
++            uint32_t offset = read32be(current_index_ptr + offsetof(CS_BlobIndex, offset));
++            if (offset > size - sizeof(CS_CodeDirectory)) {
++                return NULL;
++            } else {
++                return data + offset;
++            }
++        }
++    }
++    return NULL;
++}
++
++enum libcd_signature_query_ret
++libcd_is_blob_a_linker_signature(const uint8_t* data, size_t size, int* linker_signed)
++{
++    if (size < sizeof(CS_SuperBlob) + sizeof(CS_BlobIndex) + sizeof(CS_CodeDirectory)) {
++        return LIBCD_SIGNATURE_QUERY_INVALID_ARGUMENT;
++    }
++
++    if (!is_embedded_signature(read32be(data + offsetof(CS_SuperBlob, magic)))) {
++        return LIBCD_SIGNATURE_QUERY_NOT_A_SIGNATURE;
++    }
++
++    const uint8_t* cd = find_code_directory(data, size);
++    if (!cd) {
++        return LIBCD_SIGNATURE_QUERY_INVALID_ARGUMENT;
++    }
++
++    uint32_t flags = read32be(cd + offsetof(CS_CodeDirectory, flags));
++    if ((flags & CS_LINKER_SIGNED) == CS_LINKER_SIGNED) {
++        *linker_signed = 1;
++    }
++
++    return LIBCD_SIGNATURE_QUERY_SUCCESS;
++}
+diff --git a/src/ld/libcodedirectory.h b/src/ld/libcodedirectory.h
+index 0e989a9..7532648 100644
+--- a/src/ld/libcodedirectory.h
++++ b/src/ld/libcodedirectory.h
+@@ -116,6 +116,14 @@ enum libcd_set_linkage_ret {
+ 
+ enum libcd_set_linkage_ret libcd_set_linkage(libcd *s, int linkage_hash_type, uint8_t *linkage_hash);
+ 
++enum libcd_signature_query_ret {
++    LIBCD_SIGNATURE_QUERY_SUCCESS,
++    LIBCD_SIGNATURE_QUERY_INVALID_ARGUMENT,
++    LIBCD_SIGNATURE_QUERY_NOT_A_SIGNATURE,
++};
++
++enum libcd_signature_query_ret libcd_is_blob_a_linker_signature(const uint8_t* data, size_t size, int* linker_signed);
++
+ __END_DECLS
+ 
+ #endif // H_LIBCODEDIRECTORY
+-- 
+2.45.1
+
diff --git a/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch b/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
new file mode 100644
index 000000000000..16879634338a
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
@@ -0,0 +1,311 @@
+From 36767c7345161baf0ab125f95c8557f8e24f25db Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Tue, 9 Apr 2024 19:28:17 -0400
+Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
+
+---
+ compat/CommonCrypto/CommonDigest.h    |  6 +++
+ compat/CommonCrypto/CommonDigestSPI.c | 21 +++++++++++
+ compat/CommonCrypto/CommonDigestSPI.h | 14 +++++++
+ compat/corecrypto/api_defines.h       | 10 +++++
+ compat/corecrypto/ccdigest.c          | 53 +++++++++++++++++++++++++++
+ compat/corecrypto/ccdigest.h          | 27 ++++++++++++++
+ compat/corecrypto/ccdigest_private.h  | 19 ++++++++++
+ compat/corecrypto/ccsha1.c            | 22 +++++++++++
+ compat/corecrypto/ccsha1.h            |  9 +++++
+ compat/corecrypto/ccsha2.c            | 22 +++++++++++
+ compat/corecrypto/ccsha2.h            |  9 +++++
+ 11 files changed, 212 insertions(+)
+ create mode 100644 compat/CommonCrypto/CommonDigest.h
+ create mode 100644 compat/CommonCrypto/CommonDigestSPI.c
+ create mode 100644 compat/CommonCrypto/CommonDigestSPI.h
+ create mode 100644 compat/corecrypto/api_defines.h
+ create mode 100644 compat/corecrypto/ccdigest.c
+ create mode 100644 compat/corecrypto/ccdigest.h
+ create mode 100644 compat/corecrypto/ccdigest_private.h
+ create mode 100644 compat/corecrypto/ccsha1.c
+ create mode 100644 compat/corecrypto/ccsha1.h
+ create mode 100644 compat/corecrypto/ccsha2.c
+ create mode 100644 compat/corecrypto/ccsha2.h
+
+diff --git a/compat/CommonCrypto/CommonDigest.h b/compat/CommonCrypto/CommonDigest.h
+new file mode 100644
+index 0000000..a60eba7
+--- /dev/null
++++ b/compat/CommonCrypto/CommonDigest.h
+@@ -0,0 +1,6 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#define CCSHA256_OUTPUT_SIZE 32
+diff --git a/compat/CommonCrypto/CommonDigestSPI.c b/compat/CommonCrypto/CommonDigestSPI.c
+new file mode 100644
+index 0000000..41269fc
+--- /dev/null
++++ b/compat/CommonCrypto/CommonDigestSPI.c
+@@ -0,0 +1,21 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "CommonDigestSPI.h"
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <corecrypto/ccsha2.h>
++
++void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest) {
++    if (type != kCCDigestSHA256) {
++        abort();
++    }
++    const struct ccdigest_info* di = ccsha256_di();
++
++    ccdigest_di_decl(_di, ctx);
++    ccdigest_init(di, ctx);
++    ccdigest_update(di, ctx, count, bytes);
++    ccdigest_final(di, ctx, digest);
++}
+diff --git a/compat/CommonCrypto/CommonDigestSPI.h b/compat/CommonCrypto/CommonDigestSPI.h
+new file mode 100644
+index 0000000..172742a
+--- /dev/null
++++ b/compat/CommonCrypto/CommonDigestSPI.h
+@@ -0,0 +1,14 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <stdint.h>
++
++#include <corecrypto/ccdigest.h>
++#include <cs_blobs.h>
++
++
++#define kCCDigestSHA256 10
++
++EXTERN_C void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest);
+diff --git a/compat/corecrypto/api_defines.h b/compat/corecrypto/api_defines.h
+new file mode 100644
+index 0000000..13d1e7a
+--- /dev/null
++++ b/compat/corecrypto/api_defines.h
+@@ -0,0 +1,10 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#ifdef __cplusplus
++#define EXTERN_C extern "C"
++#else
++#define EXTERN_C
++#endif
+diff --git a/compat/corecrypto/ccdigest.c b/compat/corecrypto/ccdigest.c
+new file mode 100644
+index 0000000..e29dcb8
+--- /dev/null
++++ b/compat/corecrypto/ccdigest.c
+@@ -0,0 +1,53 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "ccdigest.h"
++#include "ccdigest_private.h"
++
++#include <stdlib.h>
++
++#include <openssl/err.h>
++
++
++struct ccdigest_context* _ccdigest_context_new(void)
++{
++    struct ccdigest_context* ctx = malloc(sizeof(struct ccdigest_context));
++    ctx->context = EVP_MD_CTX_new();
++    return ctx;
++}
++
++struct ccdigest_info* _ccdigest_newprovider(const char* name)
++{
++    struct ccdigest_info* di = malloc(sizeof(struct ccdigest_info));
++    di->provider = EVP_MD_fetch(NULL, name, NULL);
++    return di;
++}
++
++void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx)
++{
++    if (!EVP_DigestInit_ex2(ctx->context, di->provider, NULL)) {
++        ERR_print_errors_fp(stderr);
++        abort();
++    }
++}
++
++void ccdigest_update(
++    const struct ccdigest_info* _di,
++    struct ccdigest_context* ctx,
++    size_t count,
++    const void* bytes
++)
++{
++    if (!EVP_DigestUpdate(ctx->context, bytes, count)) {
++        ERR_print_errors_fp(stderr);
++        abort();
++    }
++}
++
++void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest)
++{
++    if (!EVP_DigestFinal_ex(ctx->context, digest, NULL)) {
++        ERR_print_errors_fp(stderr);
++        abort();
++    }
++}
+diff --git a/compat/corecrypto/ccdigest.h b/compat/corecrypto/ccdigest.h
+new file mode 100644
+index 0000000..9af2394
+--- /dev/null
++++ b/compat/corecrypto/ccdigest.h
+@@ -0,0 +1,27 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <stddef.h>
++#include <stdint.h>
++
++#include "api_defines.h"
++
++
++struct ccdigest_info;
++struct ccdigest_context;
++
++EXTERN_C struct ccdigest_context* _ccdigest_context_new(void);
++
++#define ccdigest_di_decl(_di, ctxvar) \
++    struct ccdigest_context* (ctxvar) = _ccdigest_context_new()
++
++EXTERN_C void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx);
++EXTERN_C void ccdigest_update(
++    const struct ccdigest_info* _di,
++    struct ccdigest_context* ctx,
++    size_t count,
++    const void* bytes
++);
++EXTERN_C void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest);
+diff --git a/compat/corecrypto/ccdigest_private.h b/compat/corecrypto/ccdigest_private.h
+new file mode 100644
+index 0000000..0ea9759
+--- /dev/null
++++ b/compat/corecrypto/ccdigest_private.h
+@@ -0,0 +1,19 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include "api_defines.h"
++
++#include <openssl/evp.h>
++
++
++struct ccdigest_info {
++    EVP_MD* provider;
++};
++
++struct ccdigest_context {
++    EVP_MD_CTX* context;
++};
++
++EXTERN_C struct ccdigest_info* _ccdigest_newprovider(const char* name);
+diff --git a/compat/corecrypto/ccsha1.c b/compat/corecrypto/ccsha1.c
+new file mode 100644
+index 0000000..e02b2b6
+--- /dev/null
++++ b/compat/corecrypto/ccsha1.c
+@@ -0,0 +1,22 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "ccsha1.h"
++
++#include <assert.h>
++
++#include <cs_blobs.h>
++
++#include "ccdigest_private.h"
++
++
++static struct ccdigest_info* di = NULL;
++
++const struct ccdigest_info* ccsha1_di(void)
++{
++    if (!di) {
++        di = _ccdigest_newprovider("SHA-1");
++        assert(EVP_MD_get_size(di->provider) == CS_SHA1_LEN);
++    }
++    return di;
++}
+diff --git a/compat/corecrypto/ccsha1.h b/compat/corecrypto/ccsha1.h
+new file mode 100644
+index 0000000..8e3f85f
+--- /dev/null
++++ b/compat/corecrypto/ccsha1.h
+@@ -0,0 +1,9 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <corecrypto/ccdigest.h>
++
++
++EXTERN_C const struct ccdigest_info* ccsha1_di(void);
+diff --git a/compat/corecrypto/ccsha2.c b/compat/corecrypto/ccsha2.c
+new file mode 100644
+index 0000000..6504503
+--- /dev/null
++++ b/compat/corecrypto/ccsha2.c
+@@ -0,0 +1,22 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "ccsha2.h"
++
++#include <assert.h>
++
++#include <cs_blobs.h>
++
++#include "ccdigest_private.h"
++
++
++static struct ccdigest_info* di = NULL;
++
++const struct ccdigest_info* ccsha256_di(void)
++{
++    if (!di) {
++        di = _ccdigest_newprovider("SHA-256");
++        assert(EVP_MD_get_size(di->provider) == CS_SHA256_LEN);
++    }
++    return di;
++}
+diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h
+new file mode 100644
+index 0000000..9f30e03
+--- /dev/null
++++ b/compat/corecrypto/ccsha2.h
+@@ -0,0 +1,9 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <corecrypto/ccdigest.h>
++
++
++EXTERN_C const struct ccdigest_info* ccsha256_di(void);
+-- 
+2.45.1
+
diff --git a/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch b/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch
new file mode 100644
index 000000000000..ddda588c6aaf
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch
@@ -0,0 +1,25 @@
+From 3e80d438e2a3ec50d666f2b6e32007c275d4a08a Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Thu, 11 Apr 2024 23:13:29 -0400
+Subject: [PATCH 8/8] Disable searching in standard library locations
+
+---
+ src/ld/Options.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp
+index 67a9f53..611b583 100644
+--- a/src/ld/Options.cpp
++++ b/src/ld/Options.cpp
+@@ -4320,7 +4320,7 @@ bool Options::shouldUseBuildVersion(ld::Platform plat, uint32_t minOSvers) const
+ 
+ void Options::buildSearchPaths(int argc, const char* argv[])
+ {
+-	bool addStandardLibraryDirectories = true;
++	bool addStandardLibraryDirectories = false;
+ 	ld::Platform platform = ld::Platform::unknown;
+ 	std::vector<const char*> libraryPaths;
+ 	std::vector<const char*> frameworkPaths;
+-- 
+2.45.1
+
diff --git a/pkgs/by-name/ld/ld64/gen_compile_stubs.py b/pkgs/by-name/ld/ld64/gen_compile_stubs.py
new file mode 100644
index 000000000000..30fe30789a10
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/gen_compile_stubs.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+import sys
+from pathlib import Path
+
+byteseq = (str(int(x)) for x in Path(sys.argv[1]).read_bytes())
+
+print("#pragma once")
+print(f"static const char compile_stubs[] = {{ {', '.join(byteseq)} }};")
diff --git a/pkgs/by-name/ld/ld64/meson.build b/pkgs/by-name/ld/ld64/meson.build
new file mode 100644
index 000000000000..0de64797c4aa
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/meson.build
@@ -0,0 +1,249 @@
+# Build settings based on the upstream Xcode project.
+# See: https://github.com/apple-oss-distributions/ld64/blob/main/ld64.xcodeproj/project.pbxproj
+
+# Project settings
+project(
+    'ld64',
+    'c', 'cpp',
+    version : '@version@',
+    default_options : {'cpp_std': 'c++20'},
+)
+
+fs = import('fs')
+
+# Options
+target_prefix = get_option('target_prefix')
+
+
+# Dependencies
+cc = meson.get_compiler('c')
+cxx = meson.get_compiler('cpp')
+python = find_program('python3')
+
+libtapi = cxx.find_library('tapi')
+openssl = dependency('openssl', version : '>=3.0')
+xar = cc.find_library('xar')
+
+
+# Feature tests
+
+# macOS 10.12 does not support `DISPATCH_APPLY_AUTO`. Fortunately, `DISPATCH_APPLY_CURRENT_ROOT_QUEUE` has the
+# same value and was repurposed in subsequent releases as `DISPATCH_APPLY_AUTO`.
+dispatch_apply_auto_test = '''
+#include <dispatch/dispatch.h>
+int main(int argc, char* argv[]) {
+    dispatch_queue_t queue = DISPATCH_APPLY_AUTO;
+    return 0;
+}
+'''
+if not cc.compiles(
+    dispatch_apply_auto_test,
+    args : '-Wno-unused-command-line-argument',
+    name : 'supports DISPATCH_APPLY_AUTO',
+)
+    add_project_arguments(
+        '-include', 'dispatch/private.h',
+        '-DDISPATCH_APPLY_AUTO=DISPATCH_APPLY_CURRENT_ROOT_QUEUE',
+        '-DPRIVATE', # The required API is private on the 10.12 SDK.
+        language: ['c', 'cpp'],
+    )
+endif
+
+# The return type of `dispatch_get_global_queue` was changed in 10.14.
+# Use the older type if the SDK does not support it.
+dispatch_queue_global_test = '''
+#include <dispatch/dispatch.h>
+int main(int argc, char* argv[]) {
+    dispatch_queue_global_t queue = dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0);
+    return 0;
+}
+'''
+if not cc.compiles(
+    dispatch_queue_global_test,
+    args : '-Wno-unused-command-line-argument',
+    name : 'supports dispatch_queue_global_t',
+)
+    add_project_arguments('-Ddispatch_queue_global_t=dispatch_queue_t', language : ['c', 'cpp'])
+endif
+
+
+# Generated files
+
+compile_stubs_h = custom_target(
+    'compile_stubs.h',
+    capture : true,
+    command : [python, '@INPUT0@', '@INPUT1@'],
+    input : ['gen_compile_stubs.py', 'compile_stubs'],
+    output : ['compile_stubs.h'],
+)
+
+configure_h = custom_target(
+    'configure_h',
+    command : ['bash', '@INPUT@'],
+    env : {
+        'DERIVED_FILE_DIR' : meson.current_build_dir(),
+        'RC_ProjectSourceVersion': '@version@'
+    },
+    input : ['src/create_configure'],
+    output : ['configure.h'],
+)
+
+incdirs = include_directories(
+    'compat',
+    'include',
+    'src/abstraction',
+    'src/ld',
+    'src/ld/code-sign-blobs',
+    'src/ld/parsers',
+    'src/ld/passes',
+    'src/mach_o',
+)
+
+# Dynamic libraries
+libcodedirectory = library(
+    'codedirectory',
+    dependencies : [openssl],
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        'compat/corecrypto/ccdigest.c',
+        'compat/corecrypto/ccsha1.c',
+        'compat/corecrypto/ccsha2.c',
+        'compat/libcodedirectory.c',
+        'src/ld/libcodedirectory.c'
+    ],
+    soversion : 1,
+)
+install_headers(
+    'src/ld/cs_blobs.h',
+    'src/ld/libcodedirectory.h',
+)
+
+
+# Static libraries
+libprunetrie = static_library(
+    'prunetrie',
+    include_directories : incdirs,
+    install : true,
+    override_options : {'b_lto': false},
+    sources : [
+        'src/mach_o/Error.cpp',
+        'src/mach_o/ExportsTrie.cpp',
+        'src/other/PruneTrie.cpp',
+    ],
+)
+install_headers(
+    'src/other/prune_trie.h',
+    subdir : 'mach-o',
+)
+
+
+# Binaries
+ld64 = executable(
+    f'@target_prefix@ld',
+    dependencies : [libtapi, openssl, xar],
+    include_directories : incdirs,
+    install : true,
+    # These linker flags mirror those used in a release build of the Xcode project.
+    # See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299.
+    link_args : [
+        '-Wl,-exported_symbol,__mh_execute_header',
+        '-Wl,-stack_size,0x02000000',
+        '-Wl,-client_name,ld',
+    ],
+    link_with : [libcodedirectory],
+    sources : [
+        compile_stubs_h,
+        configure_h,
+        'compat/CommonCrypto/CommonDigestSPI.c',
+        'compat/corecrypto/ccdigest.c',
+        'compat/corecrypto/ccsha1.c',
+        'compat/corecrypto/ccsha2.c',
+        'src/ld/FatFile.cpp',
+        'src/ld/InputFiles.cpp',
+        'src/ld/Mangling.cpp',
+        'src/ld/Options.cpp',
+        'src/ld/OutputFile.cpp',
+        'src/ld/PlatformSupport.cpp',
+        'src/ld/Resolver.cpp',
+        'src/ld/ResponseFiles.cpp',
+        'src/ld/Snapshot.cpp',
+        'src/ld/SymbolTable.cpp',
+        'src/ld/code-sign-blobs/blob.cpp',
+        'src/ld/code-sign-blobs/blob.h',
+        'src/ld/debugline.c',
+        'src/ld/ld.cpp',
+        'src/ld/parsers/archive_file.cpp',
+        'src/ld/parsers/generic_dylib_file.cpp',
+        'src/ld/parsers/lto_file.cpp',
+        'src/ld/parsers/macho_dylib_file.cpp',
+        'src/ld/parsers/macho_relocatable_file.cpp',
+        'src/ld/parsers/opaque_section_file.cpp',
+        'src/ld/parsers/textstub_dylib_file.cpp',
+        'src/ld/passes/bitcode_bundle.cpp',
+        'src/ld/passes/branch_island.cpp',
+        'src/ld/passes/branch_shim.cpp',
+        'src/ld/passes/code_dedup.cpp',
+        'src/ld/passes/compact_unwind.cpp',
+        'src/ld/passes/dtrace_dof.cpp',
+        'src/ld/passes/dylibs.cpp',
+        'src/ld/passes/got.cpp',
+        'src/ld/passes/huge.cpp',
+        'src/ld/passes/inits.cpp',
+        'src/ld/passes/objc.cpp',
+        'src/ld/passes/objc_constants.cpp',
+        'src/ld/passes/objc_stubs.cpp',
+        'src/ld/passes/order.cpp',
+        'src/ld/passes/stubs/stubs.cpp',
+        'src/ld/passes/thread_starts.cpp',
+        'src/ld/passes/tlvp.cpp',
+        'src/mach_o/Error.cpp',
+        'src/mach_o/ExportsTrie.cpp',
+    ],
+)
+install_man('doc/man/man1/ld-classic.1')
+
+# Extra tools
+unwinddump = executable(
+    f'@target_prefix@unwinddump',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/other/UnwindDump.cpp',
+    ],
+)
+install_man('doc/man/man1/unwinddump.1')
+
+machocheck = executable(
+    f'@target_prefix@machocheck',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/other/machochecker.cpp',
+    ],
+)
+
+objectdump = executable(
+    f'@target_prefix@ObjectDump',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/ld/PlatformSupport.cpp',
+        'src/ld/debugline.c',
+        'src/ld/parsers/macho_relocatable_file.cpp',
+        'src/other/ObjectDump.cpp',
+    ],
+)
+
+objcimageinfo = executable(
+    f'@target_prefix@objcimageinfo',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/other/objcimageinfo.cpp',
+    ],
+)
diff --git a/pkgs/by-name/ld/ld64/meson.options b/pkgs/by-name/ld/ld64/meson.options
new file mode 100644
index 000000000000..2417b81f0401
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/meson.options
@@ -0,0 +1,6 @@
+option(
+    'target_prefix',
+    type : 'string',
+    value : '',
+    description: 'Specifies the prefix to use when building for cross-compilation (e.g., `aarch64-apple-darwin`)'
+)
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
new file mode 100644
index 000000000000..ee773bacf3a5
--- /dev/null
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -0,0 +1,202 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  darwin,
+  libtapi,
+  libunwind,
+  llvm,
+  meson,
+  ninja,
+  openssl,
+  pkg-config,
+  python3,
+  swiftPackages,
+  xar,
+  gitUpdater,
+}:
+
+let
+  # The targetPrefix is prepended to binary names to allow multiple binutils on the PATH to be usable.
+  targetPrefix = lib.optionalString (
+    stdenv.targetPlatform != stdenv.hostPlatform
+  ) "${stdenv.targetPlatform.config}-";
+
+  # ld64 needs CrashReporterClient.h, which is hard to find, but WebKit2 has it.
+  # Fetch it directly because the Darwin stdenv bootstrap can’t depend on fetchgit.
+  crashreporter_h = fetchurl {
+    url = "https://raw.githubusercontent.com/apple-oss-distributions/WebKit2/WebKit2-7605.1.33.0.2/Platform/spi/Cocoa/CrashReporterClientSPI.h";
+    hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk=";
+  };
+
+  # First version with all the required definitions. This is used in preference to darwin.xnu to make it easier
+  # to support Linux and because the version of darwin.xnu available on x86_64-darwin in the 10.12 SDK is too old.
+  xnu = fetchFromGitHub {
+    name = "xnu-src";
+    owner = "apple-oss-distributions";
+    repo = "xnu";
+    rev = "xnu-6153.11.26";
+    hash = "sha256-dcnGcp7bIjQxeAn5pXt+mHSYEXb2Ad9Smhd/WUG4kb4=";
+  };
+
+  # Avoid pulling in all of Swift just to build libdispatch
+  libdispatch = swiftPackages.Dispatch.override { useSwift = false; };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ld64";
+  version = "951.9";
+
+  outputs = [
+    "out"
+    "dev"
+    "lib"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "apple-oss-distributions";
+    repo = "ld64";
+    rev = "ld64-${finalAttrs.version}";
+    hash = "sha256-hLkfqgBwVPlO4gfriYOawTO5E1zSD63ZcNetm1E5I70";
+  };
+
+  xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM=";
+
+  postUnpack = ''
+    unpackFile '${xnu}'
+
+    # Verify that the Xcode project has not changed unexpectedly.
+    hashType=$(echo $xcodeHash | cut -d- -f1)
+    expectedHash=$(echo $xcodeHash | cut -d- -f2)
+    hash=$(openssl "$hashType" -binary "$sourceRoot/ld64.xcodeproj/project.pbxproj" | base64)
+
+    if [ "$hash" != "$expectedHash" ]; then
+      echo 'error: hash mismatch in ld64.xcodeproj/project.pbxproj'
+      echo "        specified: $xcodeHash"
+      echo "           got:    $hashType-$hash"
+      echo
+      echo 'Upstream Xcode project has changed. Update `meson.build` with any changes, then update `xcodeHash`.'
+      echo 'Use `nix-hash --flat --sri --type sha256 ld64.xcodeproj/project.pbxproj` to regenerate it.'
+      exit 1
+    fi
+  '';
+
+  patches = [
+    # Use std::atomic for atomics. Replaces private APIs (`os/lock_private.h`) with standard APIs.
+    ./0004-Use-std-atomics-and-std-mutex.patch
+    # ld64 assumes the default libLTO.dylib can be found relative to its bindir, which is
+    # not the case in nixpkgs. Override it to default to `stdenv.cc`’s libLTO.dylib.
+    ./0005-Support-LTO-in-nixpkgs.patch
+    # Add implementation of missing function required for code directory support.
+    ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
+    # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs.
+    ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+    # ld64 will search `/usr/lib`, `/Library/Frameworks`, etc by default. Disable that.
+    ./0008-Disable-searching-in-standard-library-locations.patch
+  ];
+
+  postPatch = ''
+    substitute ${./meson.build} meson.build \
+      --subst-var version
+    cp ${./meson.options} meson.options
+
+    # Copy headers for certain private APIs
+    mkdir -p include
+    substitute ${crashreporter_h} include/CrashReporterClient.h \
+      --replace-fail 'USE(APPLE_INTERNAL_SDK)' '0'
+
+    # Copy from the source so the headers can be used on Linux and x86_64-darwin
+    mkdir -p include/System
+    for dir in arm i386 machine; do
+      cp -r ../xnu-src/osfmk/$dir include/System/$dir
+    done
+    mkdir -p include/sys
+    cp ../xnu-src/bsd/sys/commpage.h include/sys
+
+    # Match the version format used by upstream.
+    sed -i src/ld/Options.cpp \
+      -e '1iconst char ld_classicVersionString[] = "@(#)PROGRAM:ld PROJECT:ld64-${finalAttrs.version}\\n";'
+
+    # Instead of messing around with trying to extract and run the script from the Xcode project,
+    # just use our own Python script to generate `compile_stubs.h`
+    cp ${./gen_compile_stubs.py} gen_compile_stubs.py
+
+    # Enable LTO support using LLVM’s libLTO.dylib by default.
+    substituteInPlace src/ld/InputFiles.cpp \
+      --subst-var-by libllvm '${lib.getLib llvm}'
+    substituteInPlace src/ld/parsers/lto_file.cpp \
+      --subst-var-by libllvm '${lib.getLib llvm}'
+
+    # Use portable includes
+    substituteInPlace src/ld/code-sign-blobs/endian.h \
+      --replace-fail '#include <machine/endian.h>' '#include <sys/types.h>'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    openssl
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    libtapi
+    llvm
+    libunwind
+    openssl
+    xar
+  ] ++ lib.optionals stdenv.isDarwin [ darwin.dyld ] ++ lib.optionals stdenv.isLinux [ libdispatch ];
+
+  # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations,
+  # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector.
+  mesonBuildType = "release";
+
+  mesonFlags = [
+    (lib.mesonOption "b_ndebug" "if-release")
+    (lib.mesonOption "default_library" (if stdenv.hostPlatform.isStatic then "static" else "shared"))
+  ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ];
+
+  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  # ld64 has a test suite, but many of the tests fail (even with ld from Xcode). Instead
+  # of running the test suite, rebuild ld64 using itself to link itself as a check.
+  # LTO is enabled only to confirm that it is set up and working properly in nixpkgs.
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    cd "$NIX_BUILD_TOP/$sourceRoot"
+
+    export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/${targetPrefix}ld"
+    meson setup build-install-check -Db_lto=true --buildtype=$mesonBuildType
+
+    cd build-install-check
+    ninja ${targetPrefix}ld "-j$NIX_BUILD_CORES"
+
+    # Confirm that ld found the LTO library and reports it.
+    ./${targetPrefix}ld -v 2>&1 | grep -q 'LTO support'
+
+    runHook postInstallCheck
+  '';
+
+  postInstall = ''
+    ln -s ld-classic.1 "$out/share/man/man1/ld.1"
+    ln -s ld.1 "$out/share/man/man1/ld64.1"
+    moveToOutput lib/libprunetrie.a "$dev"
+  '';
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = gitUpdater { rev-prefix = "ld64-"; };
+
+  meta = {
+    description = "The classic linker for Darwin";
+    homepage = "https://opensource.apple.com/releases/";
+    license = lib.licenses.apple-psl20;
+    mainProgram = "ld";
+    maintainers = with lib.maintainers; [ reckenrode ];
+    platforms = lib.platforms.darwin; # Porting to other platforms is incomplete. Support only Darwin for now.
+  };
+})

From 9f68d60b5c2a3052efb5bac97557a94a75fba2a7 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 8 Apr 2024 17:00:35 -0400
Subject: [PATCH 232/319] cctools: 973.0.1 -> 1010.6

---
 ...d-issues-with-misc-redo_prebinding.c.patch |  53 ++
 ...-on-libcd_is_blob_a_linker_signature.patch |  25 +
 ...sat-compatability-with-the-10.12-SDK.patch |  50 ++
 ...pkgs-clang-with-the-assembler-driver.patch |  57 ++
 .../cctools/0005-Find-ld64-in-the-store.patch |  28 +
 ...-target-prefixes-in-ranlib-detection.patch |  30 +
 pkgs/by-name/cc/cctools/meson.build           | 657 ++++++++++++++++++
 pkgs/by-name/cc/cctools/meson.options         |   6 +
 pkgs/by-name/cc/cctools/package.nix           | 175 +++++
 9 files changed, 1081 insertions(+)
 create mode 100644 pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
 create mode 100644 pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch
 create mode 100644 pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
 create mode 100644 pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
 create mode 100644 pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch
 create mode 100644 pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch
 create mode 100644 pkgs/by-name/cc/cctools/meson.build
 create mode 100644 pkgs/by-name/cc/cctools/meson.options
 create mode 100644 pkgs/by-name/cc/cctools/package.nix

diff --git a/pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch b/pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
new file mode 100644
index 000000000000..5908d030dbfd
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
@@ -0,0 +1,53 @@
+From 55b2a5fcc38eb62f53e155bd8c741481690f1c73 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Wed, 10 Apr 2024 19:08:39 -0400
+Subject: [PATCH 1/6] Fix build issues with misc/redo_prebinding.c
+
+- Add missing headers; and
+- Add missing arguments to `writeout`.
+---
+ misc/redo_prebinding.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/misc/redo_prebinding.c b/misc/redo_prebinding.c
+index a5a3c81..9d0f4c8 100644
+--- a/misc/redo_prebinding.c
++++ b/misc/redo_prebinding.c
+@@ -83,6 +83,7 @@
+ #include <mach-o/redo_prebinding.h>
+ #endif /* defined(LIBRARY_API) */
+ 
++#import <stdint.h>
+ #import <stdio.h>
+ #import <stdlib.h>
+ #import <string.h>
+@@ -106,7 +107,7 @@
+ #import <stuff/hppa.h>
+ #import <stuff/execute.h>
+ #import <stuff/guess_short_name.h>
+-//#import <stuff/seg_addr_table.h>
++#import <stuff/seg_addr_table.h>
+ #import <stuff/macosx_deployment_target.h>
+ 
+ #include <mach-o/dyld.h>
+@@ -918,7 +919,7 @@ char *envp[])
+                 if(write_to_stdout)
+                     output_file = NULL;
+ 		writeout(archs, narchs, output_file, mode, TRUE, FALSE, FALSE,
+-		         FALSE, NULL);
++		         FALSE, FALSE, NULL);
+ 		if(errors){
+                     if(write_to_stdout == FALSE)
+                         unlink(output_file);
+@@ -928,7 +929,7 @@ char *envp[])
+ 	    else{
+ 		output_file = makestr(input_file, ".redo_prebinding", NULL);
+ 		writeout(archs, narchs, output_file, mode, TRUE, FALSE, FALSE,
+-			 FALSE, NULL);
++			 FALSE, FALSE, NULL);
+ 		if(errors){
+ 		    unlink(output_file);
+ 		    return(2);
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch b/pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch
new file mode 100644
index 000000000000..014281039ae8
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch
@@ -0,0 +1,25 @@
+From 419c469634891d09f6688d56da9e26431018f342 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Wed, 10 Apr 2024 20:36:53 -0400
+Subject: [PATCH 2/6] Rely on libcd_is_blob_a_linker_signature
+
+---
+ libstuff/code_directory.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libstuff/code_directory.c b/libstuff/code_directory.c
+index 7c158fa..3b8eb77 100644
+--- a/libstuff/code_directory.c
++++ b/libstuff/code_directory.c
+@@ -146,7 +146,7 @@ static const char* format_version_xyz(uint32_t version)
+  */
+ int codedir_is_linker_signed(const char* data, uint32_t size)
+ {
+-#if 1
++#if 0
+     // HACK: libcodedirectory.h is in both the macOS SDK in /usr/local/include, and in the tool chain at /usr/include.
+     // but there is no way to control clang's search path to look in the toolchain first.
+     // So, declare newer API locally. Once this new header is in all SDKs we can remove this.
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch b/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
new file mode 100644
index 000000000000..4abe9ee863aa
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
@@ -0,0 +1,50 @@
+From 989ba5e30cefa0dd8990da158661713c4a21c0fe Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Thu, 11 Apr 2024 18:05:34 -0400
+Subject: [PATCH 3/6] Fix utimensat compatability with the 10.12 SDK
+
+---
+ include/compat.h    | 3 +++
+ libstuff/writeout.c | 2 +-
+ misc/lipo.c         | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+ create mode 100644 include/compat.h
+
+diff --git a/include/compat.h b/include/compat.h
+new file mode 100644
+index 0000000..8b1b866
+--- /dev/null
++++ b/include/compat.h
+@@ -0,0 +1,3 @@
++#pragma once
++#include <time.h>
++extern int utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
+diff --git a/libstuff/writeout.c b/libstuff/writeout.c
+index f904caa..03fa535 100644
+--- a/libstuff/writeout.c
++++ b/libstuff/writeout.c
+@@ -297,7 +297,7 @@ no_throttle:
+ 	     * have been zeroed out when the library was created. writeout
+ 	     * will not zero out the modification time in the filesystem.
+ 	     */
+-	    if (__builtin_available(macOS 10.12, *)) {
++	    if (__builtin_available(macOS 10.13, *)) {
+ 		struct timespec times[2] = {0};
+ 		memcpy(&times[0], &toc_timespec, sizeof(struct timespec));
+ 		memcpy(&times[1], &toc_timespec, sizeof(struct timespec));
+diff --git a/misc/lipo.c b/misc/lipo.c
+index 04a3eca..887c049 100644
+--- a/misc/lipo.c
++++ b/misc/lipo.c
+@@ -607,7 +607,7 @@ unknown_flag:
+ 		    if(close(fd) == -1)
+ 			system_fatal("can't close output file: %s",output_file);
+ #ifndef __OPENSTEP__
+-		    if (__builtin_available(macOS 10.12, *)) {
++		    if (__builtin_available(macOS 10.13, *)) {
+ 			time_result = utimensat(AT_FDCWD, output_file,
+ 						output_times, 0);
+ 		    }
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch b/pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
new file mode 100644
index 000000000000..058cfcdf0c49
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
@@ -0,0 +1,57 @@
+From 86b5ad551ef0ffc7ca4da24b7619937bec738522 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Mon, 15 Apr 2024 20:47:59 -0400
+Subject: [PATCH 4/6] Use nixpkgs clang with the assembler driver
+
+---
+ as/driver.c | 20 +++-----------------
+ 1 file changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/as/driver.c b/as/driver.c
+index a0d49ad..c15dcbf 100644
+--- a/as/driver.c
++++ b/as/driver.c
+@@ -36,7 +36,7 @@ char **envp)
+     char *p, c, *arch_name, *as, *as_local;
+     char **new_argv;
+     const char *CLANG = "clang";
+-    char *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX];
++    char *prefix = "@clang-unwrapped@/bin/";
+     uint32_t bufsize;
+     struct arch_flag arch_flag;
+     const struct arch_flag *arch_flags, *family_arch_flag;
+@@ -50,22 +50,6 @@ char **envp)
+ 	qflag = FALSE;
+ 	Qflag = FALSE;
+ 	some_input_files = FALSE;
+-	/*
+-	 * Construct the prefix to the assembler driver.
+-	 */
+-	bufsize = MAXPATHLEN;
+-	p = buf;
+-	i = _NSGetExecutablePath(p, &bufsize);
+-	if(i == -1){
+-	    p = allocate(bufsize);
+-	    _NSGetExecutablePath(p, &bufsize);
+-	}
+-	prefix = realpath(p, resolved_name);
+-	if(prefix == NULL)
+-	    system_fatal("realpath(3) for %s failed", p);
+-	p = rindex(prefix, '/');
+-	if(p != NULL)
+-	    p[1] = '\0';
+ 	/*
+ 	 * Process the assembler flags exactly like the assembler would (except
+ 	 * let the assembler complain about multiple flags, bad combinations of
+@@ -362,6 +346,8 @@ char **envp)
+ 		exit(1);
+ 	}
+ 
++	prefix = "@gas@/bin/"; /* `libexec` is found relative to the assembler driver’s path. */
++
+ 	/*
+ 	 * If this assembler exist try to run it else print an error message.
+ 	 */
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch b/pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch
new file mode 100644
index 000000000000..8f51b38a9ca6
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch
@@ -0,0 +1,28 @@
+From e62f7d75380540937f24f896c82736a1e653cc75 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Mon, 22 Apr 2024 18:15:53 -0400
+Subject: [PATCH 5/6] Find ld64 in the store
+
+---
+ libstuff/execute.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libstuff/execute.c b/libstuff/execute.c
+index 8526ab7..abbbf1b 100644
+--- a/libstuff/execute.c
++++ b/libstuff/execute.c
+@@ -149,6 +149,11 @@ char *
+ cmd_with_prefix(
+ char *str)
+ {
++	// Return the path to ld64 in the store.
++	if (strcmp(str, "ld") == 0) {
++	    return "@ld64_path@";
++	}
++
+ 	int i;
+ 	char *p;
+ 	char *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX];
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch b/pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch
new file mode 100644
index 000000000000..1189d2074984
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch
@@ -0,0 +1,30 @@
+From e25de788260051892b9e34177ea957cbafe6c415 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Thu, 2 May 2024 07:55:05 -0400
+Subject: [PATCH 6/6] Support target prefixes in ranlib detection
+
+---
+ misc/libtool.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/misc/libtool.c b/misc/libtool.c
+index 289ec4d..8265d53 100644
+--- a/misc/libtool.c
++++ b/misc/libtool.c
+@@ -426,11 +426,11 @@ char **envp)
+ 	    p++;
+ 	else
+ 	    p = argv[0];
+-	if(strncmp(p, "ranlib", sizeof("ranlib") - 1) == 0) {
++	if(strncmp(p, "@targetPrefix@ranlib", sizeof("@targetPrefix@ranlib") - 1) == 0) {
+ 	    cmd_flags.ranlib = TRUE;
+ 	}
+ 	else if (getenv("LIBTOOL_FORCE_RANLIB")) {
+-	    progname = "ranlib";
++	    progname = "@targetPrefix@ranlib";
+ 	    cmd_flags.ranlib = TRUE;
+ 	}
+ 
+-- 
+2.45.2
+
diff --git a/pkgs/by-name/cc/cctools/meson.build b/pkgs/by-name/cc/cctools/meson.build
new file mode 100644
index 000000000000..c2261d98c958
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/meson.build
@@ -0,0 +1,657 @@
+# Build settings based on the upstream Xcode project.
+# See: https://github.com/apple-oss-distributions/cctools/blob/main/cctools.xcodeproj/project.pbxproj
+
+# Project settings
+project(
+    'cctools',
+    'c',
+    version : '@version@',
+    default_options : {
+        'c_args': [
+            '-DCCTB_MACOS=YES',
+            '-DCCTB_PROJECT=cctools',
+            '-DCCTB_PROJVERS=cctools-@version@',
+            '-DCCTB_VERSION=@version@',
+            '-DCURRENT_PROJECT_VERSION="@version@"',
+            '-DCODEDIRECTORY_SUPPORT',
+            '-DLTO_SUPPORT',
+        ],
+    },
+)
+
+fs = import('fs')
+
+# Options
+target_prefix = get_option('target_prefix')
+
+
+# Dependencies
+cc = meson.get_compiler('c')
+
+libcodedirectory = cc.find_library('codedirectory')
+libprunetrie = cc.find_library('prunetrie')
+
+
+# Feature tests
+# Add compatibility header for Darwin SDKs that don’t define `utimensat`.
+utimensat_test = '''
+#include <fcntl.h>
+#include <sys/stat.h>
+int main(int argc, char* argv[]) {
+    utimensat(AT_FDCWD, NULL, NULL, 0);
+    return 0;
+}
+'''
+if host_machine.system() == 'darwin' and not cc.compiles(utimensat_test, name : 'supports utimensat')
+    add_project_arguments('-include', 'compat.h', language : 'c')
+    add_project_link_arguments('-undefined', 'dynamic_lookup', language : 'c')
+endif
+
+
+incdirs = include_directories('include')
+
+# Static libraries
+libstuff = static_library(
+    'stuff',
+    c_args : [
+        '-DCPU_TYPE_RISCV32=24', # Per src/abstraction/MachOFileAbstraction.hpp from ld64
+    ],
+    include_directories : [incdirs, 'include/stuff'],
+    sources : [
+        'libstuff/SymLoc.c',
+        'libstuff/align.c',
+        'libstuff/allocate.c',
+        'libstuff/apple_version.c',
+        'libstuff/arch.c',
+        'libstuff/arch_usage.c',
+        'libstuff/args.c',
+        'libstuff/best_arch.c',
+        'libstuff/breakout.c',
+        'libstuff/bytesex.c',
+        'libstuff/checkout.c',
+        'libstuff/code_directory.c',
+        'libstuff/coff_bytesex.c',
+        'libstuff/crc32.c',
+        'libstuff/depinfo.c',
+        'libstuff/diagnostics.c',
+        'libstuff/dylib_roots.c',
+        'libstuff/dylib_table.c',
+        'libstuff/errors.c',
+        'libstuff/execute.c',
+        'libstuff/fatal_arch.c',
+        'libstuff/fatals.c',
+        'libstuff/get_arch_from_host.c',
+        'libstuff/get_toc_byte_sex.c',
+        'libstuff/guess_short_name.c',
+        'libstuff/hash_string.c',
+        'libstuff/hppa.c',
+        'libstuff/llvm.c',
+        'libstuff/lto.c',
+        'libstuff/macosx_deployment_target.c',
+        'libstuff/ofile.c',
+        'libstuff/ofile_error.c',
+        'libstuff/ofile_get_word.c',
+        'libstuff/print.c',
+        'libstuff/reloc.c',
+        'libstuff/rnd.c',
+        'libstuff/seg_addr_table.c',
+        'libstuff/set_arch_flag_name.c',
+        'libstuff/swap_headers.c',
+        'libstuff/symbol_list.c',
+        'libstuff/unix_standard_mode.c',
+        'libstuff/version_number.c',
+        'libstuff/vm_flush_cache.c',
+        'libstuff/write64.c',
+        'libstuff/writeout.c',
+        'libstuff/xcode.c',
+    ],
+)
+
+libstuff_otool = static_library(
+    'stuff_otool',
+    c_args : [
+        '-DCPU_TYPE_RISCV32=24', # Per src/abstraction/MachOFileAbstraction.hpp from ld64
+    ],
+    include_directories : [incdirs, 'include/stuff', 'otool'],
+    sources : [
+        'libstuff/SymLoc.c',
+        'libstuff/align.c',
+        'libstuff/allocate.c',
+        'libstuff/apple_version.c',
+        'libstuff/arch.c',
+        'libstuff/arch_usage.c',
+        'libstuff/args.c',
+        'libstuff/best_arch.c',
+        'libstuff/breakout.c',
+        'libstuff/bytesex.c',
+        'libstuff/checkout.c',
+        'libstuff/code_directory.c',
+        'libstuff/coff_bytesex.c',
+        'libstuff/crc32.c',
+        'libstuff/depinfo.c',
+        'libstuff/diagnostics.c',
+        'libstuff/dylib_roots.c',
+        'libstuff/dylib_table.c',
+        'libstuff/errors.c',
+        'libstuff/execute.c',
+        'libstuff/fatal_arch.c',
+        'libstuff/fatals.c',
+        'libstuff/get_arch_from_host.c',
+        'libstuff/get_toc_byte_sex.c',
+        'libstuff/guess_short_name.c',
+        'libstuff/hash_string.c',
+        'libstuff/hppa.c',
+        'libstuff/llvm.c',
+        'libstuff/lto.c',
+        'libstuff/macosx_deployment_target.c',
+        'libstuff/ofile.c',
+        'libstuff/ofile_error.c',
+        'libstuff/ofile_get_word.c',
+        'libstuff/print.c',
+        'libstuff/reloc.c',
+        'libstuff/rnd.c',
+        'libstuff/seg_addr_table.c',
+        'libstuff/set_arch_flag_name.c',
+        'libstuff/swap_headers.c',
+        'libstuff/symbol_list.c',
+        'libstuff/unix_standard_mode.c',
+        'libstuff/version_number.c',
+        'libstuff/vm_flush_cache.c',
+        'libstuff/write64.c',
+        'libstuff/writeout.c',
+        'libstuff/xcode.c',
+    ],
+)
+
+
+# Binaries
+ar = executable(
+    f'@target_prefix@ar',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : [
+        'ar/append.c',
+        'ar/ar.c',
+        'ar/archive.c',
+        'ar/contents.c',
+        'ar/delete.c',
+        'ar/extract.c',
+        'ar/misc.c',
+        'ar/move.c',
+        'ar/print.c',
+        'ar/replace.c',
+    ],
+)
+install_man(
+    'ar/ar.1',
+    'ar/ar.5',
+)
+
+as = executable(
+    f'@target_prefix@gas',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['as/driver.c'],
+)
+
+as_common = files(
+    'as/app.c',
+    'as/as.c',
+    'as/atof-generic.c',
+    'as/atof-ieee.c',
+    'as/dwarf2dbg.c',
+    'as/expr.c',
+    'as/fixes.c',
+    'as/flonum-const.c',
+    'as/flonum-copy.c',
+    'as/flonum-mult.c',
+    'as/frags.c',
+    'as/hash.c',
+    'as/hex-value.c',
+    'as/input-file.c',
+    'as/input-scrub.c',
+    'as/layout.c',
+    'as/messages.c',
+    'as/obstack.c',
+    'as/read.c',
+    'as/sections.c',
+    'as/symbols.c',
+    'as/write_object.c',
+    'as/xmalloc.c',
+)
+
+as_arm = executable(
+    'as-arm',
+    c_args : [
+        '-DARM',
+        '-DNeXT_MOD',
+    ],
+    include_directories : [
+        incdirs,
+        'as',
+        'include/gnu',
+    ],
+    install : true,
+    install_dir : 'libexec/as/arm',
+    link_with : [libstuff],
+    sources : [as_common, 'as/arm.c'],
+)
+
+as_i386 = executable(
+    'as-i386',
+    c_args : [
+        '-DI386',
+        '-Di486',
+        '-Di586',
+        '-Di686',
+        '-DNeXT_MOD',
+    ],
+    include_directories : [
+        incdirs,
+        'as',
+        'include/gnu',
+    ],
+    install : true,
+    install_dir : 'libexec/as/i386',
+    link_with : [libstuff],
+    sources : [as_common, 'as/i386.c'],
+)
+
+as_x86_64 = executable(
+    'as-x86_64',
+    c_args : [
+        '-DI386',
+        '-Di486',
+        '-Di586',
+        '-Di686',
+        '-DARCH64',
+        '-DNeXT_MOD',
+    ],
+    include_directories : [
+        incdirs,
+        'as',
+        'include/gnu'
+    ],
+    install : true,
+    install_dir : 'libexec/as/x86_64',
+    link_with : [libstuff],
+    sources : [as_common, 'as/i386.c'],
+)
+
+# # ld # excluded because ld64 is built separately
+
+bitcode_strip = executable(
+    f'@target_prefix@bitcode_strip',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/bitcode_strip.c'],
+)
+install_man('man/bitcode_strip.1')
+
+check_dylib = executable(
+    f'@target_prefix@check_dylib',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/check_dylib.c'],
+)
+install_man('man/check_dylib.1')
+
+checksyms = executable(
+    f'@target_prefix@checksyms',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/checksyms.c'],
+)
+install_man('man/checksyms.1')
+
+cmpdylib = executable(
+    f'@target_prefix@cmpdylib',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/cmpdylib.c'],
+)
+install_man('man/cmpdylib.1')
+
+codesign_allocate = executable(
+    f'@target_prefix@codesign_allocate',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/codesign_allocate.c'],
+)
+install_man('man/codesign_allocate.1')
+
+ctf_insert = executable(
+    f'@target_prefix@ctf_insert',
+    dependencies : [libcodedirectory],
+    include_directories : [incdirs, 'include/stuff'],
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/ctf_insert.c'],
+)
+install_man('man/ctf_insert.1')
+
+depinfo = executable(
+    f'@target_prefix@depinfo',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/depinfo.c'],
+)
+install_man('man/depinfo.1')
+
+diagtest = executable(
+    f'@target_prefix@diagtest',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/diagtest.c'],
+)
+install_man('man/diagtest.1')
+
+gprof = executable(
+    f'@target_prefix@gprof',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : [
+        'gprof/arcs.c',
+        'gprof/calls.c',
+        'gprof/dfn.c',
+        'gprof/getnfile.c',
+        'gprof/gprof.c',
+        'gprof/hertz.c',
+        'gprof/lookup.c',
+        'gprof/printgprof.c',
+        'gprof/printlist.c',
+        'gprof/scatter.c',
+    ],
+)
+install_man('man/gprof.1')
+
+# Not supported on 64-bit architectures
+# indr = executable(
+#     f'@target_prefix@indr',
+#     include_directories : incdirs,
+#     sources : ['misc/indr.c'],
+# )
+# install_man('man/indr.1')
+
+install_name_tool = executable(
+    f'@target_prefix@install_name_tool',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/install_name_tool.c'],
+)
+install_man('man/install_name_tool.1')
+
+libtool = executable(
+    f'@target_prefix@libtool',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/libtool.c'],
+)
+install_man('man/libtool.1')
+
+lipo = executable(
+    f'@target_prefix@lipo',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/lipo.c'],
+)
+install_man('man/lipo.1')
+
+mtoc = executable(
+    f'@target_prefix@mtoc',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['efitools/mtoc.c'],
+)
+install_man('man/mtoc.1')
+
+mtor = executable(
+    f'@target_prefix@mtor',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['efitools/mtor.c'],
+)
+install_man('man/mtor.1')
+
+nm = executable(
+    f'@target_prefix@nm',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/nm.c'],
+)
+install_man('man/nm-classic.1')
+
+nmedit = executable(
+    f'@target_prefix@nmedit',
+    c_args : ['-DNMEDIT'],
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/strip.c'],
+)
+install_man('man/nmedit.1')
+
+otool = executable(
+    f'@target_prefix@otool',
+    c_args : ['-DEFI_SUPPORT'],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : [
+        'otool/arm64_disasm.c',
+        'otool/arm_disasm.c',
+        'otool/coff_print.c',
+        'otool/dyld_bind_info.c',
+        'otool/hppa_disasm.c',
+        'otool/i386_disasm.c',
+        'otool/i860_disasm.c',
+        'otool/m68k_disasm.c',
+        'otool/m88k_disasm.c',
+        'otool/main.c',
+        'otool/ofile_print.c',
+        'otool/ppc_disasm.c',
+        'otool/print_bitcode.c',
+        'otool/print_objc.c',
+        'otool/print_objc2_32bit.c',
+        'otool/print_objc2_64bit.c',
+        'otool/print_objc2_util.c',
+        'otool/sparc_disasm.c',
+    ],
+)
+install_man('man/otool-classic.1')
+
+pagestuff = executable(
+    f'@target_prefix@pagestuff',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/pagestuff.c'],
+)
+install_man('man/pagestuff.1')
+
+# ranlib is a symlink to libtool
+install_man(
+    'man/ranlib.1',
+    'man/ranlib.5',
+)
+
+redo_prebinding = executable(
+    f'@target_prefix@redo_prebinding',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/redo_prebinding.c'],
+)
+install_man('man/redo_prebinding.1')
+
+seg_addr_table = executable(
+    f'@target_prefix@seg_addr_table',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/seg_addr_table.c'],
+)
+install_man('man/seg_addr_table.1')
+
+seg_hack = executable(
+    f'@target_prefix@seg_hack',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/seg_hack.c'],
+)
+
+segedit = executable(
+    f'@target_prefix@segedit',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/segedit.c'],
+)
+install_man('man/segedit.1',)
+
+size = executable(
+    f'@target_prefix@size',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/size.c'],
+)
+install_man('man/size-classic.1')
+
+strings = executable(
+    f'@target_prefix@strings',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/strings.c'],
+)
+install_man('man/strings.1')
+
+strip = executable(
+    f'@target_prefix@strip',
+    c_args : ['-DTRIE_SUPPORT'],
+    dependencies : [libcodedirectory, libprunetrie],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/strip.c'],
+)
+install_man('man/strip.1')
+
+vtool = executable(
+    f'@target_prefix@vtool',
+    dependencies : [libcodedirectory],
+    include_directories : [incdirs, 'include/stuff'],
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/vtool.c'],
+)
+install_man('man/vtool.1')
+
+
+# Development files
+# Static libraries
+libmacho = static_library(
+    'macho',
+    include_directories : incdirs,
+    sources : [
+        'libmacho/arch.c',
+        'libmacho/get_end.c',
+        'libmacho/getsecbyname.c',
+        'libmacho/getsegbyname.c',
+        'libmacho/hppa_swap.c',
+        'libmacho/i386_swap.c',
+        'libmacho/i860_swap.c',
+        'libmacho/m68k_swap.c',
+        'libmacho/m88k_swap.c',
+        'libmacho/ppc_swap.c',
+        'libmacho/slot_name.c',
+        'libmacho/sparc_swap.c',
+        'libmacho/swap.c',
+    ],
+)
+
+libredo_prebinding = static_library(
+    'redo_prebinding',
+    c_args : ['-DLIBRARY_API'],
+    include_directories : incdirs,
+    sources : ['misc/redo_prebinding.c'],
+)
+install_man('man/redo_prebinding.3')
+
+
+# Development files
+# Based on the contents of the upstream SDK.
+install_headers(
+    'include/mach-o/arch.h',
+    'include/mach-o/fat.h',
+    'include/mach-o/getsect.h',
+    'include/mach-o/ldsyms.h',
+    'include/mach-o/loader.h',
+    'include/mach-o/nlist.h',
+    'include/mach-o/ranlib.h',
+    'include/mach-o/reloc.h',
+    'include/mach-o/stab.h',
+    'include/mach-o/swap.h',
+    subdir : 'mach-o',
+)
+
+# Some of these architectures are irrelevant, but the Libsystem derivation expects their headers to be present.
+# Not every arch has both headers, so tailor the lists for each that does.
+foreach arch : ['arm', 'arm64', 'hppa', 'i860', 'm88k', 'ppc', 'sparc', 'x86_64']
+    install_headers(
+        f'include/mach-o/@arch@/reloc.h',
+        subdir : f'mach-o/@arch@',
+    )
+endforeach
+foreach arch : ['hppa', 'i386', 'i860', 'm68k', 'm88k', 'ppc', 'sparc']
+    install_headers(
+        f'include/mach-o/@arch@/swap.h',
+        subdir : f'mach-o/@arch@',
+    )
+endforeach
+
+install_data(
+    'include/modules/mach-o.modulemap',
+    install_dir : get_option('includedir'),
+    rename : 'mach-o/module.map',
+)
+install_man(
+    'man/Mach-O.5',
+    'man/NSModule.3',
+    'man/NSObjectFileImage.3',
+    'man/NSObjectFileImage_priv.3',
+    'man/arch.3',
+    'man/dyld.3',
+    'man/end.3',
+    'man/get_end.3',
+    'man/getsectbyname.3',
+    'man/getsectbynamefromheader.3',
+    'man/getsectdata.3',
+    'man/getsectdatafromheader.3',
+    'man/getsegbyname.3',
+    'man/stab.5',
+)
diff --git a/pkgs/by-name/cc/cctools/meson.options b/pkgs/by-name/cc/cctools/meson.options
new file mode 100644
index 000000000000..2417b81f0401
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/meson.options
@@ -0,0 +1,6 @@
+option(
+    'target_prefix',
+    type : 'string',
+    value : '',
+    description: 'Specifies the prefix to use when building for cross-compilation (e.g., `aarch64-apple-darwin`)'
+)
diff --git a/pkgs/by-name/cc/cctools/package.nix b/pkgs/by-name/cc/cctools/package.nix
new file mode 100644
index 000000000000..2ab074def674
--- /dev/null
+++ b/pkgs/by-name/cc/cctools/package.nix
@@ -0,0 +1,175 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPackages,
+  darwin,
+  ld64,
+  llvm,
+  memstreamHook,
+  meson,
+  ninja,
+  openssl,
+  xar,
+  gitUpdater,
+}:
+
+let
+  # The targetPrefix is prepended to binary names to allow multiple binuntils on the PATH to both be usable.
+  targetPrefix = lib.optionalString (
+    stdenv.targetPlatform != stdenv.hostPlatform
+  ) "${stdenv.targetPlatform.config}-";
+
+  # First version with all the required files
+  xnu = fetchFromGitHub {
+    name = "xnu-src";
+    owner = "apple-oss-distributions";
+    repo = "xnu";
+    rev = "xnu-7195.50.7.100.1";
+    hash = "sha256-uHmAOm6k9ZXWfyqHiDSpm+tZqUbERlr6rXSJ4xNACkM=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "${targetPrefix}cctools";
+  version = "1010.6";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "gas"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "apple-oss-distributions";
+    repo = "cctools";
+    rev = "cctools-${finalAttrs.version}";
+    hash = "sha256-JiKCP6U+xxR4mk4TXWv/mEo9Idg+QQqUYmB/EeRksCE=";
+  };
+
+  xcodeHash = "sha256-5RBbGrz1UKV0wt2Uk7RIHdfgWH8sgw/jy7hfTVrtVuM=";
+
+  postUnpack = ''
+    unpackFile '${xnu}'
+
+    # Verify that the Xcode project has not changed unexpectedly.
+    hashType=$(echo $xcodeHash | cut -d- -f1)
+    expectedHash=$(echo $xcodeHash | cut -d- -f2)
+    hash=$(openssl "$hashType" -binary "$sourceRoot/cctools.xcodeproj/project.pbxproj" | base64)
+
+    if [ "$hash" != "$expectedHash" ]; then
+      echo 'error: hash mismatch in cctools.xcodeproj/project.pbxproj'
+      echo "        specified: $xcodeHash"
+      echo "           got:    $hashType-$hash"
+      echo
+      echo 'Upstream Xcode project has changed. Update `meson.build` with any changes, then update `xcodeHash`.'
+      echo 'Use `nix-hash --flat --sri --type sha256 cctools.xcodeproj/project.pbxproj` to regenerate it.'
+      exit 1
+    fi
+  '';
+
+  patches = [
+    # Fix compile errors in redo_prebinding.c
+    ./0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
+    # Use libcd_is_blob_a_linker_signature as defined in the libcodedirectory.h header
+    ./0002-Rely-on-libcd_is_blob_a_linker_signature.patch
+    # cctools uses availability checks for `utimensat`, but it checks the wrong version.
+    # Also, provide a definition to avoid implicit function definition errors.
+    ./0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
+    # Use the nixpkgs clang’s path as the prefix.
+    ./0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
+    # Make sure cctools can find ld64 in the store
+    ./0005-Find-ld64-in-the-store.patch
+    # `ranlib` is a symlink to `libtool`. Make sure its detection works when it is used in cross-compilation.
+    ./0006-Support-target-prefixes-in-ranlib-detection.patch
+  ];
+
+  postPatch = ''
+    substitute ${./meson.build} meson.build \
+      --subst-var version
+    cp ${./meson.options} meson.options
+
+    # Make sure as’s clang driver uses clang from nixpkgs and finds the drivers in the store.
+    substituteInPlace as/driver.c \
+      --subst-var-by clang-unwrapped '${lib.getBin buildPackages.clang.cc}' \
+      --subst-var-by gas '${placeholder "gas"}'
+
+    # Need to set the path to make sure cctools can find ld64 in the store.
+    substituteInPlace libstuff/execute.c \
+      --subst-var-by ld64_path '${lib.getBin ld64}/bin/ld'
+
+    # Set the target prefix for `ranlib`
+    substituteInPlace misc/libtool.c \
+      --subst-var-by targetPrefix '${targetPrefix}'
+
+    # The version of this file distributed with cctools defines several CPU types missing from the 10.12 SDK.
+    ln -s machine-cctools.h include/mach/machine.h
+
+    # Use libxar from nixpkgs
+    for cctool_src in misc/nm.c otool/print_bitcode.c; do
+      substituteInPlace $cctool_src \
+        --replace-fail 'makestr(prefix, "../lib/libxar.dylib", NULL)' '"${lib.getLib xar}/lib/libxar.dylib"' \
+        --replace-fail '/usr/lib/libxar.dylib' '${lib.getLib xar}/lib/libxar.dylib'
+    done
+
+    # Use libLTO.dylib from nixpkgs LLVM
+    substituteInPlace libstuff/llvm.c \
+      --replace-fail 'getenv("LIBLTO_PATH")' '"${lib.getLib llvm}/lib/libLTO.dylib"'
+
+    cp ../xnu-src/EXTERNAL_HEADERS/mach-o/fixup-chains.h include/mach-o/fixup-chains.h
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    openssl
+  ];
+
+  buildInputs =
+    [
+      ld64
+      llvm
+    ]
+    ++ lib.optionals stdenv.isDarwin [ darwin.objc4 ]
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ];
+
+  mesonBuildType = "release";
+
+  mesonFlags = [
+    (lib.mesonOption "b_ndebug" "if-release")
+  ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ];
+
+  postInstall = ''
+    ln -s ${targetPrefix}libtool "$out/bin/${targetPrefix}ranlib"
+    ln -s nm-classic.1 "''${!outputMan}/share/man/man1/nm.1"
+    ln -s otool-classic.1 "''${!outputMan}/share/man/man1/otool.1"
+    ln -s size-classic.1 "''${!outputMan}/share/man/man1/size.1"
+
+    # Move GNU as to its own output to prevent it from being used accidentally.
+    moveToOutput bin/gas "$gas"
+    moveToOutput libexec "$gas"
+    for arch in arm i386 x86_64; do
+      mv "$gas/libexec/as/$arch/as-$arch" "$gas/libexec/as/$arch/as"
+    done
+  '';
+
+  __structuredAttrs = true;
+
+  passthru = {
+    inherit targetPrefix;
+    updateScript = gitUpdater { rev-prefix = "cctools-"; };
+  };
+
+  meta = {
+    description = "The classic linker for Darwin";
+    homepage = "https://opensource.apple.com/releases/";
+    license = with lib.licenses; [
+      apple-psl20
+      gpl2 # GNU as
+    ];
+    maintainers = with lib.maintainers; [ reckenrode ];
+    platforms = lib.platforms.darwin;
+  };
+})

From 65a37e7b14db909adf9c7a74d713425ba590d301 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 14 Apr 2024 09:20:26 -0400
Subject: [PATCH 233/319] darwin.stdenv: make sure curl cannot be used

Fetchers can use the `curl` binary from the bootstrap tools. Allowing packages in the Darwin bootstrap to link curl makes any curl update cause a full rebuild on Darwin, which is undesirable.
---
 pkgs/stdenv/darwin/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5e5f2be12ba6..c4679c394f19 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -174,9 +174,6 @@ let
         overrides = self: super: (overrides self super) // {
           fetchurl = thisStdenv.fetchurlBoot;
           fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; };
-          fetchgit = super.fetchgit.override {
-            git = super.git.override { curl = bootstrapTools; };
-          };
           fetchzip = super.fetchzip.override { inherit (self) fetchurl; };
         };
       };
@@ -505,7 +502,8 @@ in
       inherit (prevStage) ccWrapperStdenv
         coreutils gnugrep;
 
-      binutils-unwrapped = builtins.throw "nothing in the bootstrap should depend on GNU binutils";
+      binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils";
+      curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl";
 
       # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv.
       cmake = self.cmakeMinimal;
@@ -634,7 +632,7 @@ in
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
         autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
-        coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu
+        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu
         libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4
         ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config
         python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz
@@ -727,7 +725,7 @@ in
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
         atf autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
-        cpio cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv
+        cpio curl cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv
         libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja
         openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal
         scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd;
@@ -830,7 +828,7 @@ in
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
         atf autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils
-        cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libffi
+        cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libffi
         libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2
         ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config
         python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz
@@ -931,7 +929,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake bash bison brotli cmake cmakeMinimal coreutils cpio
+        atf autoconf automake bash bison brotli cmake cmakeMinimal coreutils cpio curl
         cyrus_sasl db ed expat flex gettext gmp gnugrep groff kyua libedit libidn2 libkrb5
         libssh2 libtool libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam
         openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons serf
@@ -1048,7 +1046,7 @@ in
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
         autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
-        coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
+        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
         libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap
         openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons
         sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd
@@ -1129,7 +1127,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff
+        autoconf automake bash bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff
         libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 scons
         serf sqlite subversion sysctl texinfo unzip which
 
@@ -1457,6 +1455,7 @@ in
     # Make sure these evaluate since they were disabled explicitly in the bootstrap.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert            isFromNixpkgs prevStage.binutils-unwrapped.src;
+    assert isBuiltByNixpkgsCompiler prevStage.curl;
 
     { inherit (prevStage) config overlays stdenv; })
 ]

From 8559d6466beed15d731248b37ec3d926578ff98b Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 17:14:51 -0400
Subject: [PATCH 234/319] darwin.stdenv: always use a response file

The bootstrap tools have been updated, so it is no longer necessary to suppress using a response file in the Darwin stdenv bootstrap.
---
 pkgs/stdenv/darwin/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index c4679c394f19..684672254e3a 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -591,9 +591,6 @@ in
     extraPreHook = ''
       stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
       stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
-
-      # Don’t assume the ld64 in bootstrap tools supports response files. Only recent versions do.
-      export NIX_LD_USE_RESPONSE_FILE=0
     '';
   })
 

From 78da51cdb0caffa84a7976bc87527bd640460f9e Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 17:17:55 -0400
Subject: [PATCH 235/319] darwin.stdenv: adjust flags for llvm-strip in
 bootstrap tools

---
 pkgs/stdenv/darwin/default.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 684672254e3a..27100ca8f4a3 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -465,11 +465,8 @@ in
       );
     };
 
-    # The bootstrap tools may use `strip` from cctools, so use a compatible set of flags until LLVM
-    # is rebuilt, and darwin.binutils can use its implementation instead.
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
@@ -586,11 +583,9 @@ in
       prevStage.gnu-config
     ];
 
-    # The bootstrap tools may use `strip` from cctools, so use a compatible set of flags until LLVM
-    # is rebuilt, and darwin.binutils can use its implementation instead.
+
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
@@ -678,10 +673,8 @@ in
       prevStage.gnu-config
     ];
 
-    # Until LLVM is rebuilt, assume `strip` is the one from cctools.
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
@@ -782,8 +775,7 @@ in
     ];
 
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 

From 7f1bc0d5c1d0d669990cd59c2c8cf5a8b58e8cf2 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 18:11:10 -0400
Subject: [PATCH 236/319] binutils: drop Darwin hack

Darwin no longer uses GNU binutils and prevents it from being used in the bootstrap. This hack is no longer necessary.
---
 pkgs/development/tools/misc/binutils/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 308ac9d5913f..610f04fd35a5 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -58,10 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = targetPrefix + "binutils";
   inherit version;
 
-  # HACK: Ensure that we preserve source from bootstrap binutils to not rebuild LLVM
-  src = stdenv.__bootPackages.binutils-unwrapped.src
-    or srcs.${targetPlatform.system}
-    or srcs.normal;
+  src = srcs.${targetPlatform.system} or srcs.normal;
 
   # WARN: this package is used for bootstrapping fetchurl, and thus cannot use
   # fetchpatch! All mutable patches (generated by GitHub or cgit) that are

From 05e5d7f73e4fc30cf8b702adb358993d3bf1b927 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 17:37:09 -0400
Subject: [PATCH 237/319] darwin.stdenv: clean up GNU binutils ban

- Only propagate binutils-unwrapped; and
- Clarify in the `throw` that it cannot be used in the Darwin bootstrap.
---
 pkgs/stdenv/darwin/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 27100ca8f4a3..e5aa2154986d 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -623,7 +623,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
+        autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
         coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu
         libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4
         ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config
@@ -645,7 +645,7 @@ in
 
       darwin = super.darwin.overrideScope (_: superDarwin: {
         inherit (prevStage.darwin)
-          CF sdkRoot Libsystem binutils-unwrapped cctools cctools-port configd darwin-stubs dyld
+          CF sdkRoot Libsystem binutils binutils-unwrapped cctools cctools-port configd darwin-stubs dyld
           launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook
           print-reexports rewrite-tbd signingUtils sigtool;
 
@@ -714,7 +714,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
+        atf autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
         cpio curl cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv
         libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja
         openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal
@@ -1034,7 +1034,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
+        autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
         coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
         libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap
         openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons
@@ -1116,7 +1116,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff
+        autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff
         libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 scons
         serf sqlite subversion sysctl texinfo unzip which
 
@@ -1390,7 +1390,7 @@ in
 
       overrides = self: super: {
         inherit (prevStage)
-          bash binutils brotli bzip2 coreutils cpio diffutils ed file findutils gawk
+          bash brotli bzip2 coreutils cpio diffutils ed file findutils gawk
           gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libiconv-darwin
           libidn2 libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam
           openssl patch pbzx pcre python3Minimal xar xz zlib zstd;

From 9403fdc4a615e0f3301621cc63b5dee83513b649 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 18:15:55 -0400
Subject: [PATCH 238/319] darwin.stdenv: consolidate stage 2 into one stage

Separate stages are no longer necessary because CF is not built from source and will not be built in the future.
---
 pkgs/stdenv/darwin/default.nix | 168 +++++++--------------------------
 1 file changed, 32 insertions(+), 136 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index e5aa2154986d..9ddf5e6ced62 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -812,7 +812,7 @@ in
 
     stageFun prevStage {
 
-    name = "bootstrap-stage2-Libsystem";
+    name = "bootstrap-stage2";
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
@@ -831,22 +831,39 @@ in
 
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
-          CF binutils-unwrapped cctools configd darwin-stubs launchd libobjc libtapi locale
-          objc4 print-reexports rewrite-tbd signingUtils sigtool;
+          binutils-unwrapped configd darwin-stubs launchd locale postLinkSignHook
+          print-reexports rewrite-tbd signingUtils sigtool;
 
         apple_sdk = superDarwin.apple_sdk // {
           inherit (prevStage.darwin.apple_sdk) sdkRoot;
         };
+
+        # Rewrap binutils so it uses the rebuilt Libsystem.
+        binutils = superDarwin.binutils.override {
+          inherit (prevStage) expand-response-params;
+          libc = selfDarwin.Libsystem;
+        } // {
+          passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; };
+        };
       });
 
       llvmPackages = super.llvmPackages // (
         let
           tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang libllvm llvm;
+            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm;
           });
 
           libraries = super.llvmPackages.libraries.extend (selfLib: superLib: {
-            inherit (prevStage.llvmPackages) compiler-rt libcxx;
+            inherit (prevStage.llvmPackages) libcxx;
+
+            # Make sure compiler-rt is linked against the CF from this stage, which can be
+            # propagated to the final stdenv. CF is required by ASAN.
+            compiler-rt = superLib.compiler-rt.override ({
+              inherit (self.llvmPackages) libllvm;
+              stdenv = self.stdenv.override {
+                extraBuildInputs = [ self.darwin.CF ];
+              };
+            });
           });
         in
         { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
@@ -875,140 +892,19 @@ in
     '';
   })
 
-  # This stage rebuilds CF, compiler-rt, and the sdkRoot derivation.
-  #
-  # CF requires:
-  # - aarch64-darwin: libobjc (due to being apple_sdk.frameworks.CoreFoundation instead of swift-corefoundation)
-  # - x86_64-darwin: libiconv libxml2 icu zlib
-  (prevStage:
-    # previous stage2-Libsystem stdenv:
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      atf autoconf automake bison brotli cmake cmakeMinimal coreutils
-      cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libidn2
-      libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh
-      openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf
-      sqlite subversion sysctl.provider texinfo unzip which xz zstd
-    ]);
-
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      libffi libiconv libxml2 ncurses zlib zstd
-    ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      cctools locale libtapi print-reexports rewrite-tbd sigtool
-    ]);
-
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
-    assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped  dyld launchd libclosure libdispatch xnu ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm
-    ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]);
-    assert prevStage.llvmPackages.compiler-rt == null;
-
-    stageFun prevStage {
-
-    name = "bootstrap-stage2-CF";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake bash bison brotli cmake cmakeMinimal coreutils cpio curl
-        cyrus_sasl db ed expat flex gettext gmp gnugrep groff kyua libedit libidn2 libkrb5
-        libssh2 libtool libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam
-        openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons serf
-        sqlite subversion sysctl texinfo unzip which xz zstd;
-
-      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
-      libxml2 = super.libxml2.override { pythonSupport = false; };
-
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin)
-          Libsystem configd darwin-stubs launchd locale print-reexports rewrite-tbd
-          signingUtils sigtool;
-
-        # Rewrap binutils so it uses the rebuilt Libsystem.
-        binutils = superDarwin.binutils.override {
-          inherit (prevStage) expand-response-params;
-          libc = selfDarwin.Libsystem;
-        } // {
-          passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; };
-        };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm;
-            clang = prevStage.stdenv.cc;
-          });
-
-          libraries = super.llvmPackages.libraries.extend (selfLib: superLib: {
-            inherit (prevStage.llvmPackages) libcxx;
-
-            # Make sure compiler-rt is linked against the CF from this stage, which can be
-            # propagated to the final stdenv. CF is required by ASAN.
-            compiler-rt = superLib.compiler-rt.override ({
-              inherit (self.llvmPackages) libllvm;
-              stdenv = self.stdenv.override {
-                extraBuildInputs = [ self.darwin.CF ];
-              };
-            });
-          });
-        in
-        { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
-      );
-
-      # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to
-      # the final stdenv, which happens because of the rpath hook. Also don’t use a stdenv with
-      # compiler-rt because it needs to be built in this stage.
-      stdenv =
-        let
-          stdenvNoCF = super.stdenv.override {
-            extraBuildInputs = [ ];
-          };
-        in
-        self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override {
-          inherit (self.llvmPackages) libcxx;
-
-          # Make sure the stdenv is using the Libsystem that will be propagated to the final stdenv.
-          libc = self.darwin.Libsystem;
-          bintools = self.llvmPackages.clangNoCompilerRtWithLibc.bintools.override {
-            libc = self.darwin.Libsystem;
-          };
-        });
-    };
-
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
-
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
-
   # Rebuild LLVM with LLVM. This stage also rebuilds certain dependencies needed by LLVM.
   #
-  # LLVM requires: libcxx libffi libiconv libxml2 ncurses zlib
+  # LLVM requires: libcxx libffi libiconv libxml2 ncurses python3 zlib
   (prevStage:
-    # previous stage2-CF stdenv:
+    # previous stage2 stdenv:
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl
-      db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool
-      libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
+      db ed expat flex gettext gmp gnugrep groff libedit libffi libiconv libidn2 libkrb5 libssh2 libtool
+      libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
       patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
-      subversion sysctl.provider texinfo unzip which xz zstd
-    ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash icu libffi libiconv libxml2 zlib
+      subversion sysctl.provider texinfo unzip which xz zstd zlib
     ]);
+    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
       locale print-reexports rewrite-tbd sigtool
@@ -1038,14 +934,14 @@ in
         coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
         libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap
         openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons
-        sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd
-
-        # CF dependencies - don’t rebuild them.
-        icu libiconv libiconv-darwin libxml2 zlib;
+        sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd;
 
       # Disable tests because they use dejagnu, which fails to run.
       libffi = super.libffi.override { doCheck = false; };
 
+      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
+      libxml2 = super.libxml2.override { pythonSupport = false; };
+
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
           CF Libsystem binutils binutils-unwrapped cctools cctools-port configd

From 10c87ee2c7661b0e699b270744439b2643aaa43b Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 25 Apr 2024 08:43:08 -0400
Subject: [PATCH 239/319] stdenv: set NIX_DONT_SET_RPATH_FOR_TARGET on Darwin

---
 pkgs/stdenv/generic/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 2cda43d5632f..2cbd2636a463 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -114,14 +114,9 @@ let
         export NIX_NO_SELF_RPATH=1
       '' + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
         export MACOSX_DEPLOYMENT_TARGET=${hostPlatform.darwinMinVersion}
-      ''
-      # TODO this should be uncommented, but it causes stupid mass rebuilds. I
-      # think the best solution would just be to fixup linux RPATHs so we don't
-      # need to set `-rpath` anywhere.
-      # + lib.optionalString targetPlatform.isDarwin ''
-      #   export NIX_DONT_SET_RPATH_FOR_TARGET=1
-      # ''
-      ;
+      '' + lib.optionalString targetPlatform.isDarwin ''
+        export NIX_DONT_SET_RPATH_FOR_TARGET=1
+      '';
 
       inherit initialPath shell
         defaultNativeBuildInputs defaultBuildInputs;

From c922cb27b6f52f17a522d3a4940a8fc36fa5c246 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 14 Apr 2024 09:19:48 -0400
Subject: [PATCH 240/319] bintools-wrapper: drop postLinkSignHook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the linker signs a Mach-O binary, it sets a flag in the signature’s code directory indicating that the signature was generated by a linker. Tools such as `strip` and `install_name_tool` read this flag and will
update ad hoc signatures after they perform their modifications.

The updated l64 supports signing binaries automatically. Both the updated cctools and LLVM will check for the linker-signed flag and resign binaries they modify automatically when it’s present. Given that, use of postLinkSignHook is unnecessary and potentially harmful.

In particular, if the hook is used and an unwrapped `strip` or `install_name_tool` is on the user’s path, they will not automatically update an ad hoc signature. Instead, they will issue a warning and create a binary with a broken signature.

It is more robust to let the tools handled this since the only time a signature would not be linker-signed is when the user is manually invoking `codesign` (or another tool such as `sigtool` or `rcodesign`), which by nature of the invocation updates the signature to a valid  one.

Since `strip` no longer needs to be wrapped for code-signing, binutils-wrapper now uses the GNU strip wrapper on Darwin.

Fixes https://github.com/NixOS/nixpkgs/issues/208951.
---
 .../bintools-wrapper/default.nix              | 23 +------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index b7561f1aab55..215dd0f39cd7 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -60,9 +60,6 @@
       (!(targetPlatform.isAarch && targetPlatform.isStatic))
     ])
   ]) "pie"
-
-# Darwin code signing support utilities
-, postLinkSignHook ? null, signingUtils ? null
 }:
 
 assert propagateDoc -> bintools ? man;
@@ -357,7 +354,7 @@ stdenvNoCC.mkDerivation {
     ##
 
     # TODO(@sternenseemann): make a generic strip wrapper?
-    + optionalString (bintools.isGNU or false) ''
+    + optionalString (bintools.isGNU or false || bintools.isCCTools or false) ''
       wrap ${targetPrefix}strip ${./gnu-binutils-strip-wrapper.sh} \
         "${bintools_bin}/bin/${targetPrefix}strip"
     ''
@@ -396,24 +393,6 @@ stdenvNoCC.mkDerivation {
       ''
     )
 
-    ##
-    ## Code signing on Apple Silicon
-    ##
-    + optionalString (targetPlatform.isDarwin && targetPlatform.isAarch64) ''
-      echo 'source ${postLinkSignHook}' >> $out/nix-support/post-link-hook
-
-      export signingUtils=${signingUtils}
-
-      wrap \
-        ${targetPrefix}install_name_tool \
-        ${./darwin-install_name_tool-wrapper.sh} \
-        "${bintools_bin}/bin/${targetPrefix}install_name_tool"
-
-      wrap \
-        ${targetPrefix}strip ${./darwin-strip-wrapper.sh} \
-        "${bintools_bin}/bin/${targetPrefix}strip"
-    ''
-
     ##
     ## Extra custom steps
     ##
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0e24a76b59e..83056ee7e7d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16774,7 +16774,6 @@ with pkgs;
     noLibc = (self.libc == null);
 
     inherit bintools libc;
-    inherit (darwin) postLinkSignHook signingUtils;
   } // extraArgs; in self);
 
   yaml-language-server = callPackage  ../development/tools/language-servers/yaml-language-server { };

From a49dbb2544d8711c965e138d500f4a49dcf59d6a Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 18:33:24 -0400
Subject: [PATCH 241/319] darwin.stdenv: switch to top-level cctools and ld64

---
 pkgs/os-specific/darwin/binutils/default.nix |   9 +-
 pkgs/stdenv/darwin/default.nix               | 322 ++++++++++---------
 pkgs/top-level/darwin-packages.nix           |  16 +-
 3 files changed, 184 insertions(+), 163 deletions(-)

diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index 122c6322065f..f01b8d43a2be 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -3,6 +3,7 @@
   stdenvNoCC,
   cctools,
   clang-unwrapped,
+  ld64,
   llvm,
   llvm-manpages,
   makeWrapper,
@@ -105,10 +106,10 @@ stdenvNoCC.mkDerivation {
     makeWrapper "${lib.getBin clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
       --add-flags "-x assembler -integrated-as -c"
 
-    ln -s '${lib.getBin cctools}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld"
-    ${linkManPages (lib.getMan cctools) "ld" "ld"}
-    # ${linkManPages (lib.getMan cctools) "ld-classic" "ld-classic"}
-    ${linkManPages (lib.getMan cctools) "ld64" "ld64"}
+    ln -s '${lib.getBin ld64}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld"
+    ${linkManPages (lib.getMan ld64) "ld" "ld"}
+    ${linkManPages (lib.getMan ld64) "ld-classic" "ld-classic"}
+    ${linkManPages (lib.getMan ld64) "ld64" "ld64"}
   '';
 
   __structuredAttrs = true;
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 9ddf5e6ced62..bc9ccd1b67aa 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -189,6 +189,9 @@ in
   ({}: {
     __raw = true;
 
+    cctools = true;
+    ld64 = true;
+
     coreutils = null;
     gnugrep = null;
 
@@ -199,7 +202,6 @@ in
       apple_sdk.sdkRoot = null;
       binutils = null;
       binutils-unwrapped = null;
-      cctools = null;
       print-reexports = null;
       rewrite-tbd = null;
       sigtool = null;
@@ -239,6 +241,97 @@ in
       gnugrep = bootstrapTools;
       pbzx = bootstrapTools;
 
+      cctools = super.stdenv.mkDerivation {
+        pname = "bootstrap-stage0-cctools";
+        version = "boot";
+
+        buildCommand = ''
+          declare -a cctools=(
+            ar
+            bitcode_strip
+            check_dylib
+            checksyms
+            cmpdylib
+            codesign_allocate
+            ctf_insert
+            depinfo
+            diagtest
+            gas
+            gprof
+            install_name_tool
+            libtool
+            lipo
+            mtoc
+            mtor
+            nm
+            nmedit
+            otool
+            pagestuff
+            ranlib
+            redo_prebinding
+            seg_addr_table
+            seg_hack
+            segedit
+            size
+            strings
+            strip
+            vtool
+          )
+
+          mkdir -p "$out/bin"
+          for tool in "''${cctools[@]}"; do
+            toolsrc="${bootstrapTools}/bin/$tool"
+            if [ -e "$toolsrc" ]; then
+              ln -s "$toolsrc" "$out/bin"
+            fi
+          done
+
+          # Copy only the required headers to avoid accidentally linking headers that belong to other packages,
+          # which can cause problems when building Libsystem in the source-based SDK.
+          declare -a machohdrs=(
+            arch.h
+            fat.h
+            fixup-chains.h
+            getsect.h
+            ldsyms.h
+            loader.h
+            nlist.h
+            ranlib.h
+            reloc.h
+            stab.h
+            swap.h
+            arm
+            arm64
+            hppa
+            i386
+            i860
+            m68k
+            m88k
+            ppc
+            sparc
+            x86_64
+          )
+
+          mkdir -p "$out/include/mach-o"
+          for header in "''${machohdrs[@]}"; do
+            machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header"
+            if [ -e "$machosrc" ]; then
+              cp -r "$machosrc" "$out/include/mach-o/$header"
+            fi
+          done
+        '';
+
+        passthru = {
+          isFromBootstrapFiles = true;
+          targetPrefix = "";
+        };
+      };
+
+      ld64 = bootstrapTools // {
+        targetPrefix = "";
+        version = "boot";
+      };
+
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         # Prevent CF from being propagated to the initial stdenv. Packages that require it
         # will have to manually add it to their build inputs.
@@ -259,7 +352,21 @@ in
 
           bintools = selfDarwin.binutils-unwrapped;
 
-          inherit (selfDarwin) postLinkSignHook signingUtils;
+          # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly.
+          # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
+          extraBuildCommands = ''
+            echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
+
+            export signingUtils=${selfDarwin.signingUtils}
+
+            wrap \
+              install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+
+            wrap \
+              strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/strip"
+          '';
         };
 
         binutils-unwrapped = (superDarwin.binutils-unwrapped.overrideAttrs (old: {
@@ -269,93 +376,6 @@ in
           };
         })).override { enableManpages = false; };
 
-        cctools = super.stdenv.mkDerivation {
-          pname = "bootstrap-stage0-cctools";
-          version = "boot";
-
-          buildCommand = ''
-            declare -a cctools=(
-              ar
-              bitcode_strip
-              check_dylib
-              checksyms
-              cmpdylib
-              codesign_allocate
-              ctf_insert
-              depinfo
-              diagtest
-              ld
-              gas
-              gprof
-              install_name_tool
-              libtool
-              lipo
-              mtoc
-              mtor
-              nm
-              nmedit
-              otool
-              pagestuff
-              ranlib
-              redo_prebinding
-              seg_addr_table
-              seg_hack
-              segedit
-              size
-              strings
-              strip
-              vtool
-            )
-
-            mkdir -p "$out/bin"
-            for tool in "''${cctools[@]}"; do
-              toolsrc="${bootstrapTools}/bin/$tool"
-              if [ -e "$toolsrc" ]; then
-                ln -s "$toolsrc" "$out/bin"
-              fi
-            done
-
-            # Copy only the required headers to avoid accidentally linking headers that belong to other packages,
-            # which can cause problems when building Libsystem in the source-based SDK.
-            declare -a machohdrs=(
-              arch.h
-              fat.h
-              fixup-chains.h
-              getsect.h
-              ldsyms.h
-              loader.h
-              nlist.h
-              ranlib.h
-              reloc.h
-              stab.h
-              swap.h
-              arm
-              arm64
-              hppa
-              i386
-              i860
-              m68k
-              m88k
-              ppc
-              sparc
-              x86_64
-            )
-
-            mkdir -p "$out/include/mach-o"
-            for header in "''${machohdrs[@]}"; do
-              machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header"
-              if [ -e "$machosrc" ]; then
-                cp -r "$machosrc" "$out/include/mach-o/$header"
-              fi
-            done
-          '';
-
-          passthru = {
-            isFromBootstrapFiles = true;
-            targetPrefix = "";
-          };
-        };
-
         locale = self.stdenv.mkDerivation {
           name = "bootstrap-stage0-locale";
           buildCommand = ''
@@ -476,11 +496,11 @@ in
   (prevStage:
     # previous stage0 stdenv:
     assert lib.all isFromBootstrapFiles (
-      with prevStage; [ bash coreutils cpio gnugrep ] ++ lib.optionals useAppleSDKLibs [ pbzx ]
+      with prevStage; [ bash cctools coreutils cpio gnugrep ld64 ] ++ lib.optionals useAppleSDKLibs [ pbzx ]
     );
 
     assert lib.all isFromBootstrapFiles (with prevStage.darwin; [
-      binutils-unwrapped cctools print-reexports rewrite-tbd sigtool
+      binutils-unwrapped print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]);
@@ -497,7 +517,7 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        coreutils gnugrep;
+        cctools coreutils gnugrep ld64;
 
       binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils";
       curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl";
@@ -528,8 +548,6 @@ in
       });
 
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin) cctools;
-
         apple_sdk = superDarwin.apple_sdk // {
           inherit (prevStage.darwin.apple_sdk) sdkRoot;
         };
@@ -550,17 +568,31 @@ in
         # Rewrap binutils with the real Libsystem
         binutils = superDarwin.binutils.override {
           inherit (self) coreutils;
-          inherit (selfDarwin) postLinkSignHook signingUtils;
-
           bintools = selfDarwin.binutils-unwrapped;
           libc = selfDarwin.Libsystem;
           # TODO(@sternenseemann): can this be removed?
           runtimeShell = "${bootstrapTools}/bin/bash";
+
+          # Bootstrap tools cctools needs the hook to make sure things are signed properly.
+          # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
+          extraBuildCommands = ''
+            echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
+
+            export signingUtils=${selfDarwin.signingUtils}
+
+            wrap \
+              install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+
+            wrap \
+              strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/strip"
+          '';
         };
 
         # Avoid building unnecessary Python dependencies due to building LLVM manpages.
         binutils-unwrapped = superDarwin.binutils-unwrapped.override {
-          inherit (selfDarwin) cctools;
+          inherit (self) cctools ld64;
           enableManpages = false;
         };
       });
@@ -592,7 +624,7 @@ in
   # Build sysctl for use by LLVM’s check phase. It must be built separately to avoid an infinite recursion.
   (prevStage:
     # previous stage1 stdenv:
-    assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]);
+    assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       autoconf automake bash bison brotli cmake cpio cyrus_sasl db
@@ -602,9 +634,8 @@ in
       subversion texinfo unzip which xz zlib zstd
     ]);
 
-    assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ cctools ]);
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale libtapi print-reexports rewrite-tbd sigtool
+      locale print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
@@ -623,8 +654,8 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
-        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu
+        autoconf automake bash binutils-unwrapped bison brotli cctools cmake cmakeMinimal
+        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu ld64
         libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4
         ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config
         python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz
@@ -645,7 +676,7 @@ in
 
       darwin = super.darwin.overrideScope (_: superDarwin: {
         inherit (prevStage.darwin)
-          CF sdkRoot Libsystem binutils binutils-unwrapped cctools cctools-port configd darwin-stubs dyld
+          CF sdkRoot Libsystem binutils binutils-unwrapped configd darwin-stubs dtrace dyld
           launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook
           print-reexports rewrite-tbd signingUtils sigtool;
 
@@ -683,21 +714,23 @@ in
   # but those libraries will be used in the final stdenv.
   #
   # Rebuild coreutils and gnugrep to avoid unwanted references to the bootstrap tools on `PATH`.
+  #
+  # The first build of cctools is deferred until this stage because it depends on LLVM headers
+  # that are not included in the bootstrap tools tarball.
   (prevStage:
     # previous stage-sysctl stdenv:
-    assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]);
+    assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       atf autoconf automake bash bison brotli cmake cpio cyrus_sasl db
       ed expat flex gettext gmp groff icu kyua libedit libffi libiconv libidn2 libkrb5 libssh2
-      libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl
+      libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl
       patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
       subversion sysctl.provider texinfo unzip which xz zlib zstd
     ]);
 
-    assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ cctools ]);
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale libtapi print-reexports rewrite-tbd sigtool
+      locale print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
@@ -720,6 +753,9 @@ in
         openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal
         scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd;
 
+      # Disable ld64’s install check phase because the required LTO libraries are not built yet.
+      ld64 = super.ld64.overrideAttrs { doInstallCheck = false; };
+
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
           CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc
@@ -784,8 +820,8 @@ in
   (prevStage:
     # previous stage-xclang stdenv:
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      atf autoconf automake bash bison cmake cmakeMinimal coreutils cpio
-      cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libtool m4 meson ninja
+      atf autoconf automake bash bison cctools cmake cmakeMinimal coreutils cpio
+      cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libtapi libtool m4 meson ninja
       openbsm openldap openpam openssh patchutils pbzx perl pkg-config.pkg-config python3
       python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz
     ]);
@@ -796,7 +832,7 @@ in
     ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      cctools locale libtapi print-reexports rewrite-tbd sigtool
+      locale print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
@@ -816,9 +852,9 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils
-        cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libffi
-        libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2
+        atf autoconf automake binutils-unwrapped bison brotli cctools cmake cmakeMinimal coreutils
+        cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libffi
+        libiconv libidn2 libkrb5 libssh2 libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2
         ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config
         python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz
         zlib zstd;
@@ -898,9 +934,9 @@ in
   (prevStage:
     # previous stage2 stdenv:
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl
-      db ed expat flex gettext gmp gnugrep groff libedit libffi libiconv libidn2 libkrb5 libssh2 libtool
-      libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
+      autoconf automake bison brotli cctools cmake cmakeMinimal coreutils cpio cyrus_sasl
+      db ed expat flex gettext gmp gnugrep groff icu ld64 libedit libffi libiconv libidn2 libkrb5 libssh2 libtool
+      libtapi libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
       patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
       subversion sysctl.provider texinfo unzip which xz zstd zlib
     ]);
@@ -909,9 +945,6 @@ in
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
       locale print-reexports rewrite-tbd sigtool
     ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [
-      cctools libtapi
-    ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
     assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
@@ -944,8 +977,8 @@ in
 
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
-          CF Libsystem binutils binutils-unwrapped cctools cctools-port configd
-          darwin-stubs dyld launchd libclosure libdispatch libobjc libtapi locale objc4
+          CF Libsystem binutils binutils-unwrapped configd
+          darwin-stubs dyld launchd libclosure libdispatch libobjc locale objc4
           postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool;
 
         apple_sdk = superDarwin.apple_sdk // {
@@ -986,15 +1019,12 @@ in
     ]);
 
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash icu libffi libiconv libxml2 zlib
+      bash cctools icu ld64 libtapi libffi libiconv libxml2 zlib
     ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
       locale print-reexports rewrite-tbd sigtool
     ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [
-      cctools libtapi
-    ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
     assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
@@ -1013,7 +1043,7 @@ in
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
         autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff
-        libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 scons
+        libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 python3Minimal scons
         serf sqlite subversion sysctl texinfo unzip which
 
         # CF dependencies - don’t rebuild them.
@@ -1141,15 +1171,13 @@ in
   (prevStage:
     # previous stage4 stdenv:
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash brotli bzip2 cpio diffutils ed file findutils gawk
-      gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5
-      libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch
-      pbzx pcre python3Minimal xar xz zlib zstd
+      bash brotli bzip2 cctools cpio diffutils ed file findutils gawk
+      gettext gmp gnugrep gnumake gnused gnutar gzip icu ld64 libffi libiconv libidn2 libkrb5
+      libssh2 libtapi libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch
+      pbzx pcre xar xz zlib zstd
     ]);
 
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [
-      cctools libtapi locale print-reexports rewrite-tbd sigtool
-    ]);
+    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ locale print-reexports rewrite-tbd sigtool ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]);
     assert (! useAppleSDKLibs) -> lib.all            isFromNixpkgs (with prevStage.darwin; [ CF ]);
@@ -1162,13 +1190,11 @@ in
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit
-      libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons
+      libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 python3Minimal scons
       serf sqlite subversion sysctl.provider texinfo unzip which
     ]);
 
     let
-      doSign = localSystem.isAarch64;
-
       cc = prevStage.llvmPackages.clang;
     in
     {
@@ -1220,6 +1246,10 @@ in
         bzip2.bin
         bzip2.out
         cc.expand-response-params
+        cctools
+        ld64.out
+        ld64.lib
+        libtapi.out
         coreutils
         darwin.binutils
         darwin.binutils.bintools
@@ -1246,13 +1276,14 @@ in
         ncurses.out
         openbsm
         openpam
+        openssl.out
         patch
+        xar
         xz.bin
         xz.out
         zlib.dev
         zlib.out
-      ]
-      ++ lib.optionals doSign [ openssl.out ])
+      ])
       ++ lib.optionals localSystem.isAarch64 [
         prevStage.updateAutotoolsGnuConfigScriptsHook
         prevStage.gnu-config
@@ -1272,14 +1303,11 @@ in
       ++ (with prevStage.darwin; [
         CF
         Libsystem
-        cctools-port
         dyld
-        libtapi
         locale
         apple_sdk.sdkRoot
       ]
-      ++ lib.optional useAppleSDKLibs [ objc4 ]
-      ++ lib.optionals doSign [ postLinkSignHook sigtool signingUtils ]);
+      ++ lib.optionals useAppleSDKLibs [ objc4 ]);
 
       __stdenvImpureHostDeps = commonImpureHostDeps;
       __extraImpureHostDeps = commonImpureHostDeps;
@@ -1293,15 +1321,16 @@ in
 
         darwin = super.darwin.overrideScope (_: superDarwin: {
           inherit (prevStage.darwin)
-            CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi rewrite-tbd xnu;
+            CF ICU Libsystem darwin-stubs dyld locale libobjc rewrite-tbd xnu;
 
           apple_sdk = superDarwin.apple_sdk // {
             inherit (prevStage.darwin.apple_sdk) sdkRoot;
           };
         } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-          inherit (prevStage.darwin) binutils binutils-unwrapped cctools-port;
+          inherit (prevStage.darwin) binutils binutils-unwrapped;
         });
       } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
+        inherit (prevStage) cctools ld64 libtapi;
         inherit (prevStage.llvmPackages) clang llvm;
 
         # Need to get rid of these when cross-compiling.
@@ -1320,13 +1349,14 @@ in
     };
   })
 
-  # This "no-op" stage is just a place to put the assertions about stage6.
+  # This "no-op" stage is just a place to put the assertions about the final stage.
   (prevStage:
     # previous final stage stdenv:
+    assert isBuiltByNixpkgsCompiler prevStage.cctools;
+    assert isBuiltByNixpkgsCompiler prevStage.ld64;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.print-reexports;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.rewrite-tbd;
-    assert isBuiltByNixpkgsCompiler prevStage.darwin.cctools;
 
     assert            isFromNixpkgs prevStage.darwin.CF;
     assert            isFromNixpkgs prevStage.darwin.Libsystem;
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 486d3964fdd5..3cbe0ec75fd1 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -90,7 +90,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
   };
 
   binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
-    inherit (self) cctools;
+    inherit (pkgs) cctools;
     inherit (pkgs.llvmPackages) clang-unwrapped llvm llvm-manpages;
   };
 
@@ -135,17 +135,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
 
   cctools = self.cctools-port;
 
-  cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix {
-    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
-  };
-
-  cctools-llvm = callPackage ../os-specific/darwin/cctools/llvm.nix {
-    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
-  };
-
-  cctools-port = callPackage ../os-specific/darwin/cctools/port.nix {
-    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
-  };
+  cctools-port = pkgs.cctools;
 
   # TODO(@connorbaker): See https://github.com/NixOS/nixpkgs/issues/229389.
   cf-private = self.apple_sdk.frameworks.CoreFoundation;
@@ -245,7 +235,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
   # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
   # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { };
 
-  libtapi = callPackage ../os-specific/darwin/libtapi {};
+  libtapi = pkgs.libtapi;
 
   ios-deploy = callPackage ../os-specific/darwin/ios-deploy {};
 

From ca92415e874ccd86a312dc83bc0e72a0705d4a33 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 13 Jul 2024 08:42:40 -0400
Subject: [PATCH 242/319] dotnet: use dwarfdump from darwin.binutils

---
 pkgs/development/compilers/dotnet/vmr.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 78f56ca2ead8..8ed67c51b6db 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -41,7 +41,6 @@ let
     isDarwin
     buildPlatform
     targetPlatform;
-  inherit (darwin) cctools-llvm;
   inherit (swiftPackages) apple_sdk swift;
 
   releaseManifest = lib.importJSON releaseManifestFile;
@@ -53,16 +52,6 @@ let
 
   sigtool = callPackage ./sigtool.nix {};
 
-  # we need dwarfdump from cctools, but can't have e.g. 'ar' overriding stdenv
-  dwarfdump = stdenvNoCC.mkDerivation {
-    name = "dwarfdump-wrapper";
-    dontUnpack = true;
-    installPhase = ''
-      mkdir -p "$out/bin"
-      ln -s "${cctools-llvm}/bin/dwarfdump" "$out/bin"
-    '';
-  };
-
   _icu = if isDarwin then darwin.ICU else icu;
 
 in stdenv.mkDerivation rec {
@@ -118,7 +107,6 @@ in stdenv.mkDerivation rec {
       buildInputs = old.buildInputs ++ old.propagatedBuildInputs;
       propagatedBuildInputs = [];
     }))
-    dwarfdump
     sigtool
     Foundation
     CoreFoundation

From 3bc1b22db66346b80a614ad3c2fb0a7b560f3d15 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 6 Jul 2024 10:27:57 -0300
Subject: [PATCH 243/319] emacsPackages: remove enlight from manual-packages

Since it was melpified: https://melpa.org/#/enlight
---
 .../emacs/elisp-packages/manual-packages.nix  |  2 --
 .../manual-packages/enlight/default.nix       | 27 -------------------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 73e7f9a2c672..5bf8b570673f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -35,8 +35,6 @@ in
 
   emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
 
-  enlight = callPackage ./manual-packages/enlight { };
-
   ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
 
   evil-markdown = callPackage ./manual-packages/evil-markdown { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix
deleted file mode 100644
index 6faa3ef8ad93..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  compat,
-  fetchFromGitHub,
-  melpaBuild,
-}:
-
-melpaBuild {
-  pname = "enlight";
-  version = "20240601.1150";
-
-  src = fetchFromGitHub {
-    owner = "ichernyshovvv";
-    repo = "enlight";
-    rev = "76753736da1777c8f9ebbeb08beec15b330a5878";
-    hash = "sha256-Ccfv4Ud5B4L4FfIOI2PDKikV9x8x3a7VeHYDyLV7t4g=";
-  };
-
-  packageRequires = [ compat ];
-
-  meta = {
-    homepage = "https://github.com/ichernyshovvv/enlight";
-    description = "Highly customizable startup screen for Emacs";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}

From 3a522fd765453ab81c96b7a0205c75c74ef08b8a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 12 Jul 2024 17:10:34 -0300
Subject: [PATCH 244/319] emacsPackages: remove beancount from manual-packages

Since it was elpified: https://elpa.nongnu.org/nongnu/beancount.html
---
 .../emacs/elisp-packages/manual-packages.nix  |  2 --
 .../manual-packages/beancount/default.nix     | 35 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 5bf8b570673f..182f2567b834 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -15,8 +15,6 @@ in
 
   agda2-mode = callPackage ./manual-packages/agda2-mode { };
 
-  beancount = callPackage ./manual-packages/beancount { };
-
   cask = callPackage ./manual-packages/cask { };
 
   codeium = callPackage ./manual-packages/codeium { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix
deleted file mode 100644
index 0e3c66e03242..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, melpaBuild
-, fetchFromGitHub
-, emacs
-, writeText
-}:
-
-let
-  rev = "519bfd868f206ed2fc538a57cdb631c4fec3c93e";
-in
-melpaBuild {
-  pname = "beancount";
-  version = "20230205.436";
-
-  src = fetchFromGitHub {
-    owner = "beancount";
-    repo = "beancount-mode";
-    inherit rev;
-    hash = "sha256-nTEXJdPEPZpNm06uYvRxLuiOHmsiIgMLerd//dA0+KQ=";
-  };
-
-  commit = rev;
-
-  recipe = writeText "recipe" ''
-    (beancount :repo "beancount/beancount-mode" :fetcher github)
-  '';
-
-  meta = {
-    homepage = "https://github.com/beancount/beancount-mode";
-    description = "Emacs major-mode to work with Beancount ledger files";
-    maintainers = with lib.maintainers; [ polarmutex ];
-    license = lib.licenses.gpl3Only;
-    inherit (emacs.meta) platforms;
-  };
-}

From ccda691e7c790a5d547ed8e58254d8039e061c16 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 13 Jul 2024 19:11:32 -0300
Subject: [PATCH 245/319] elpa-packages: updated 2024-07-13 (from overlay)

---
 .../emacs/elisp-packages/elpa-generated.nix   | 374 ++++++++++++------
 1 file changed, 254 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index b1145baf3781..af51794d05b6 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -295,10 +295,10 @@
       elpaBuild {
         pname = "auctex";
         ename = "auctex";
-        version = "14.0.5";
+        version = "14.0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-14.0.5.tar";
-          sha256 = "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k";
+          url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar";
+          sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -306,6 +306,44 @@
           license = lib.licenses.free;
         };
       }) {};
+    auctex-cont-latexmk = callPackage ({ auctex
+                                       , elpaBuild
+                                       , emacs
+                                       , fetchurl
+                                       , lib }:
+      elpaBuild {
+        pname = "auctex-cont-latexmk";
+        ename = "auctex-cont-latexmk";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar";
+          sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auctex-label-numbers = callPackage ({ auctex
+                                        , elpaBuild
+                                        , emacs
+                                        , fetchurl
+                                        , lib }:
+      elpaBuild {
+        pname = "auctex-label-numbers";
+        ename = "auctex-label-numbers";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar";
+          sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "aumix-mode";
@@ -824,10 +862,10 @@
       elpaBuild {
         pname = "colorful-mode";
         ename = "colorful-mode";
-        version = "1.0.0";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/colorful-mode-1.0.0.tar";
-          sha256 = "1gmbrb5z3rmw0fjrdymfbcx74szcy963dx53ksykvfd9355azj3x";
+          url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar";
+          sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -937,10 +975,10 @@
       elpaBuild {
         pname = "compat";
         ename = "compat";
-        version = "29.1.4.5";
+        version = "30.0.0.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar";
-          sha256 = "0i57hs3ak5y0fsfdwg87ib64ny0ar1nk67f5dy2qrm8x3i0h086s";
+          url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar";
+          sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -952,10 +990,10 @@
       elpaBuild {
         pname = "consult";
         ename = "consult";
-        version = "1.6";
+        version = "1.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-1.6.tar";
-          sha256 = "00wsv6dvlyf7ygi586pdyhgp7f5ic2qqyqjz3g2g8hmgya5javdb";
+          url = "https://elpa.gnu.org/packages/consult-1.7.tar";
+          sha256 = "02ji5yxa92jj7chs6al5amjdag1waz2sngbbk45mgg9nv81b4d3c";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -972,10 +1010,10 @@
       elpaBuild {
         pname = "consult-denote";
         ename = "consult-denote";
-        version = "0.0.0";
+        version = "0.1.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-denote-0.0.0.tar";
-          sha256 = "191qf8knrmimam98jv8kgrl6mfrnwpdmw160s5qw6wcik7j4z6kv";
+          url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar";
+          sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1";
         };
         packageRequires = [ consult denote emacs ];
         meta = {
@@ -1036,10 +1074,10 @@
       elpaBuild {
         pname = "corfu";
         ename = "corfu";
-        version = "1.3";
+        version = "1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/corfu-1.3.tar";
-          sha256 = "13y0dws1k4682v039ab6b0xxqlg7anknscqs20bmj8lfm2z48znx";
+          url = "https://elpa.gnu.org/packages/corfu-1.4.tar";
+          sha256 = "0jsxrs08zwbwb1mzn8a2ja3wr2w34cx8ca09l4fz05labv7p7i85";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -1156,10 +1194,10 @@
       elpaBuild {
         pname = "csv-mode";
         ename = "csv-mode";
-        version = "1.23";
+        version = "1.25";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.23.tar";
-          sha256 = "0b5qcxdp7y78mfgcvh9plfc0l5qbwsvrj1bswyimrzg210zhk4zm";
+          url = "https://elpa.gnu.org/packages/csv-mode-1.25.tar";
+          sha256 = "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1201,10 +1239,10 @@
       elpaBuild {
         pname = "dape";
         ename = "dape";
-        version = "0.11.1";
+        version = "0.13.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dape-0.11.1.tar";
-          sha256 = "0i04wwklypzxh78gwd9zjxjm3lwi2sn7qpqnlgd6n8hhcigyzhp0";
+          url = "https://elpa.gnu.org/packages/dape-0.13.0.tar";
+          sha256 = "1zzghp73yh1vl9vf3njkqyhh6vmmx6klnd9z37p62467bd19wr8a";
         };
         packageRequires = [ emacs jsonrpc ];
         meta = {
@@ -1291,10 +1329,10 @@
       elpaBuild {
         pname = "denote";
         ename = "denote";
-        version = "2.3.5";
+        version = "3.0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/denote-2.3.5.tar";
-          sha256 = "1l8nlr8q7c51j2f528a0568pa3ywfv8pr47fzpd6pk2scc0y372b";
+          url = "https://elpa.gnu.org/packages/denote-3.0.6.tar";
+          sha256 = "1wq44r4j624hiwpyzkrrbk998321wzj7x45y9rwy4gpi8f6xi1nv";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1537,10 +1575,10 @@
       elpaBuild {
         pname = "do-at-point";
         ename = "do-at-point";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar";
-          sha256 = "1lqnarb9jiig85j3dv37jsqkmmfbcwb52i2akimzf9r57pypiylk";
+          url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar";
+          sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1702,10 +1740,10 @@
       elpaBuild {
         pname = "eev";
         ename = "eev";
-        version = "20240513";
+        version = "20240710";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20240513.tar";
-          sha256 = "133blp5696f2adxqny5kyylr6s3n3vixs0ak1n3i58sqb0krp2pj";
+          url = "https://elpa.gnu.org/packages/eev-20240710.tar";
+          sha256 = "1mia27ilfg4zkkwvwy3m24ypgi1fm8k27rm77xwjpq87pb2wvr02";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1827,16 +1865,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }:
+    ellama = callPackage ({ compat
+                          , elpaBuild
+                          , emacs
+                          , fetchurl
+                          , lib
+                          , llm
+                          , spinner }:
       elpaBuild {
         pname = "ellama";
         ename = "ellama";
-        version = "0.9.4";
+        version = "0.11.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ellama-0.9.4.tar";
-          sha256 = "12l8k7dwcdgndy0zbdgkhx94y46fkzwjrbwlgj9922zbk38nnz46";
+          url = "https://elpa.gnu.org/packages/ellama-0.11.9.tar";
+          sha256 = "0h41hsvz34v0gb9d7d8aw6phc7iyrpbs0r8djsz59yd0ijzbz12j";
         };
-        packageRequires = [ emacs llm spinner ];
+        packageRequires = [ compat emacs llm spinner ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/ellama.html";
           license = lib.licenses.free;
@@ -1907,10 +1951,10 @@
       elpaBuild {
         pname = "ement";
         ename = "ement";
-        version = "0.15";
+        version = "0.15.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ement-0.15.tar";
-          sha256 = "0mphkvmsmrfyr3prr5a2x6ijr27z96ixpaxs9871kn7f1x0brn5r";
+          url = "https://elpa.gnu.org/packages/ement-0.15.1.tar";
+          sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld";
         };
         packageRequires = [
           emacs
@@ -1936,10 +1980,10 @@
       elpaBuild {
         pname = "emms";
         ename = "emms";
-        version = "19";
+        version = "20.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/emms-19.tar";
-          sha256 = "1k0hybw826f2hlw8m0aihkydlkdzjsgvrfibpsqrxxcn9d7zxwjd";
+          url = "https://elpa.gnu.org/packages/emms-20.1.tar";
+          sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx";
         };
         packageRequires = [ cl-lib nadvice seq ];
         meta = {
@@ -1996,10 +2040,10 @@
       elpaBuild {
         pname = "erc";
         ename = "erc";
-        version = "5.5";
+        version = "5.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/erc-5.5.tar";
-          sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
+          url = "https://elpa.gnu.org/packages/erc-5.6.tar";
+          sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -2119,16 +2163,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
+    exwm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, xelb }:
       elpaBuild {
         pname = "exwm";
         ename = "exwm";
-        version = "0.28";
+        version = "0.31";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.28.tar";
-          sha256 = "11j1ciyrnzkbcb7ffgs670mxqd1xbxf41c6jwnwwqjfzmqhsm0m4";
+          url = "https://elpa.gnu.org/packages/exwm-0.31.tar";
+          sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq";
         };
-        packageRequires = [ xelb ];
+        packageRequires = [ compat emacs xelb ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/exwm.html";
           license = lib.licenses.free;
@@ -2168,10 +2212,10 @@
       elpaBuild {
         pname = "filechooser";
         ename = "filechooser";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar";
-          sha256 = "1fjf8bmdrrrgbv4sgx4nry5pl8plg9kyzyfd038985v3dsqasi9q";
+          url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar";
+          sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -2477,10 +2521,10 @@
       elpaBuild {
         pname = "gnu-elpa-keyring-update";
         ename = "gnu-elpa-keyring-update";
-        version = "2022.12";
+        version = "2022.12.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar";
-          sha256 = "0pabqsfw0d9knfigpcsrwfw7qrf2vlg9h0i582212gsqd7snlnxb";
+          url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.1.tar";
+          sha256 = "0yb81ly7y5262fpa0n96yngqmz1rgfwrpm0a6vqghdpr5x0c8z6n";
         };
         packageRequires = [];
         meta = {
@@ -2593,16 +2637,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    greader = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
       elpaBuild {
         pname = "greader";
         ename = "greader";
-        version = "0.9.20";
+        version = "0.11.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/greader-0.9.20.tar";
-          sha256 = "11n88xmr2qa5as5kpy4yy616nlh08nw5rkcbgmf9skgka3g1hmip";
+          url = "https://elpa.gnu.org/packages/greader-0.11.13.tar";
+          sha256 = "0kyfws0b5dahf96b9wx06hmx0a0qsmywx6bay6xl6a5a4lchszsn";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs seq ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/greader.html";
           license = lib.licenses.free;
@@ -2627,10 +2671,10 @@
       elpaBuild {
         pname = "gtags-mode";
         ename = "gtags-mode";
-        version = "1.6";
+        version = "1.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gtags-mode-1.6.tar";
-          sha256 = "1r3ih44kzkrx9bmfl8ri2yv90b7g4nhb0vvdnz1ba3f44x15ppjx";
+          url = "https://elpa.gnu.org/packages/gtags-mode-1.8.tar";
+          sha256 = "1rd0a3q45b5i46hi8snf25cyv65b7699ghbz8c6hrr4991h3ksll";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2780,6 +2824,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    idlwave = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "idlwave";
+        ename = "idlwave";
+        version = "6.5.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/idlwave-6.5.1.tar";
+          sha256 = "0dd0dm92qyin8k4kgavrg82zwjhv6wsjq6gk55rzcspx0s8y2c24";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/idlwave.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ilist = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "ilist";
@@ -2999,10 +3058,10 @@
       elpaBuild {
         pname = "jinx";
         ename = "jinx";
-        version = "1.7";
+        version = "1.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jinx-1.7.tar";
-          sha256 = "13snfsrwdbn23fdwpk42xp24x8bskl8sgsbq51nr896smjp2x3b4";
+          url = "https://elpa.gnu.org/packages/jinx-1.9.tar";
+          sha256 = "0k6km295y5w13kl18v9b6y0szdccf89nbar3zkdincy4iid5z6n1";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -3281,14 +3340,29 @@
           license = lib.licenses.free;
         };
       }) {};
+    literate-scratch = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "literate-scratch";
+        ename = "literate-scratch";
+        version = "1.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar";
+          sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
       elpaBuild {
         pname = "llm";
         ename = "llm";
-        version = "0.15.0";
+        version = "0.16.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/llm-0.15.0.tar";
-          sha256 = "1y3gs8zsng87wmlkx5az396hci4xyn0ww7cbaavisqbrxam51qvj";
+          url = "https://elpa.gnu.org/packages/llm-0.16.1.tar";
+          sha256 = "1fqn4fdxhazpmlh8pf6ihnh132zjqrixry3kyymsmwang6vh2y7s";
         };
         packageRequires = [ emacs plz ];
         meta = {
@@ -3360,10 +3434,10 @@
       elpaBuild {
         pname = "loccur";
         ename = "loccur";
-        version = "1.2.4";
+        version = "1.2.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/loccur-1.2.4.tar";
-          sha256 = "1b8rmbl03k8fdy217ngbxsc0a3jxxmqnwshf72f4iay8ln4hasgk";
+          url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar";
+          sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3645,10 +3719,10 @@
       elpaBuild {
         pname = "mpdired";
         ename = "mpdired";
-        version = "1";
+        version = "2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mpdired-1.tar";
-          sha256 = "08lc0j25kxisykd2l9v4iamalmm5hzsnsm026v808krny28wwbp3";
+          url = "https://elpa.gnu.org/packages/mpdired-2.tar";
+          sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4039,10 +4113,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "9.6.30";
+        version = "9.7.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.6.30.tar";
-          sha256 = "0h2p7gjiys5ch68y35l6bpw9pp852vprmfzi0dk86z1wkilhycip";
+          url = "https://elpa.gnu.org/packages/org-9.7.6.tar";
+          sha256 = "0pxjc2bydnzd31wg71nfh7zzf3mhsnzm2nd7p736bj1w0pvg89ng";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4099,10 +4173,10 @@
       elpaBuild {
         pname = "org-modern";
         ename = "org-modern";
-        version = "1.2";
+        version = "1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-modern-1.2.tar";
-          sha256 = "1bm8kkcrn0glsb69sapj1zmb2ygd4sxksb3gag4hw1v5w3g51jjh";
+          url = "https://elpa.gnu.org/packages/org-modern-1.3.tar";
+          sha256 = "1lpl9q9ijyp6pwb0qap9ydzkq0pd5xkbfpaqy1nvcy5b906jmkdj";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -4189,10 +4263,10 @@
       elpaBuild {
         pname = "orgalist";
         ename = "orgalist";
-        version = "1.14";
+        version = "1.16";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/orgalist-1.14.tar";
-          sha256 = "02diwanqldzr42aaa5kqcj1xgxmf1k6rqhk9zv40psqpzgd1yms5";
+          url = "https://elpa.gnu.org/packages/orgalist-1.16.tar";
+          sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4350,16 +4424,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    persist = callPackage ({ elpaBuild, fetchurl, lib }:
+    persist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "persist";
         ename = "persist";
-        version = "0.6";
+        version = "0.6.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/persist-0.6.tar";
-          sha256 = "1p6h211xk0lrk4zqlm51rsms5lza9ymx6ayh9ij0afqrjqgffw77";
+          url = "https://elpa.gnu.org/packages/persist-0.6.1.tar";
+          sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/persist.html";
           license = lib.licenses.free;
@@ -4399,10 +4473,10 @@
       elpaBuild {
         pname = "plz";
         ename = "plz";
-        version = "0.8";
+        version = "0.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/plz-0.8.tar";
-          sha256 = "0kg275kq5hi83ry0n83w8pi0qn2lmlv9gnxcbwf1dcqk7n9i2v64";
+          url = "https://elpa.gnu.org/packages/plz-0.9.tar";
+          sha256 = "1wgcfwrmbw6bl00midhn99hn3fvbavkibb4r6s99yzmd48vyapr8";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4515,14 +4589,44 @@
           license = lib.licenses.free;
         };
       }) {};
+    preview-auto = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "preview-auto";
+        ename = "preview-auto";
+        version = "0.3";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar";
+          sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/preview-auto.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    preview-tailor = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "preview-tailor";
+        ename = "preview-tailor";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/preview-tailor-0.2.tar";
+          sha256 = "1mqh2myz5w84f4n01ibd695h4mnqwjxmg7rvs7pz3sylz1xqyks7";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
       elpaBuild {
         pname = "project";
         ename = "project";
-        version = "0.10.0";
+        version = "0.11.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/project-0.10.0.tar";
-          sha256 = "07lv41asdah2v3k6nrc73z3pjhsm7viygr12ly9p96g2yw11irg6";
+          url = "https://elpa.gnu.org/packages/project-0.11.1.tar";
+          sha256 = "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0";
         };
         packageRequires = [ emacs xref ];
         meta = {
@@ -4714,10 +4818,10 @@
       elpaBuild {
         pname = "rcirc-sqlite";
         ename = "rcirc-sqlite";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.1.tar";
-          sha256 = "0n0492s500gplmv7l8n8l7s3rpm1nli3n706n9f91qc15z6p6mcv";
+          url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar";
+          sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5725,6 +5829,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    tex-item = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tex-item";
+        ename = "tex-item";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/tex-item-0.1.tar";
+          sha256 = "0ggbn3lk64cv6pnw97ww7vn250jchj80zx3hvkcqlccyw34x6ziy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tex-item.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tex-parens = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tex-parens";
+        ename = "tex-parens";
+        version = "0.4";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar";
+          sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tex-parens.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     theme-buffet = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "theme-buffet";
@@ -5838,10 +5972,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.6.3";
+        version = "2.7.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.6.3.tar";
-          sha256 = "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb";
+          url = "https://elpa.gnu.org/packages/tramp-2.7.1.tar";
+          sha256 = "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5898,10 +6032,10 @@
       elpaBuild {
         pname = "transient";
         ename = "transient";
-        version = "0.6.0";
+        version = "0.7.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transient-0.6.0.tar";
-          sha256 = "0rk4gafx3yylzawiny86ml4jzrs8x6cf2bvmnv36p8l13wgp0w9p";
+          url = "https://elpa.gnu.org/packages/transient-0.7.2.tar";
+          sha256 = "0i68wpwxf729qxjxhafkp098wcmkqn06ka3hcqnlky2p1zl29hby";
         };
         packageRequires = [ compat emacs seq ];
         meta = {
@@ -6484,16 +6618,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-tool-bar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    window-tool-bar = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "window-tool-bar";
         ename = "window-tool-bar";
-        version = "0.2";
+        version = "0.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.tar";
-          sha256 = "191v21rrw1j560512mjn1s1avhirk1awy746xajjra8lb1ywnxw7";
+          url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar";
+          sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
           license = lib.licenses.free;
@@ -6624,16 +6758,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
+    xelb = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "xelb";
         ename = "xelb";
-        version = "0.18";
+        version = "0.20";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.18.tar";
-          sha256 = "1qixb236z01azjbc1xycji99rjkq747hip4gcf0gli1is8ink0bs";
+          url = "https://elpa.gnu.org/packages/xelb-0.20.tar";
+          sha256 = "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk";
         };
-        packageRequires = [ cl-generic emacs ];
+        packageRequires = [ compat emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/xelb.html";
           license = lib.licenses.free;
@@ -6673,10 +6807,10 @@
       elpaBuild {
         pname = "xref";
         ename = "xref";
-        version = "1.6.3";
+        version = "1.7.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xref-1.6.3.tar";
-          sha256 = "0mir1nhic0rnz12d8i1n6m2ihfynhkkg8yccy4v9j4kd31w6f1gs";
+          url = "https://elpa.gnu.org/packages/xref-1.7.0.tar";
+          sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24";
         };
         packageRequires = [ emacs ];
         meta = {

From 2fc52debb5dccd7713ff37b1adb622a2cc122fc3 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 13 Jul 2024 19:11:32 -0300
Subject: [PATCH 246/319] elpa-devel-packages: updated 2024-07-13 (from
 overlay)

---
 .../elisp-packages/elpa-devel-generated.nix   | 706 +++++++++++-------
 1 file changed, 428 insertions(+), 278 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index 1ba0ea1519b0..7579b888c28f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -41,10 +41,10 @@
       elpaBuild {
         pname = "activities";
         ename = "activities";
-        version = "0.8pre0.20240328.110921";
+        version = "0.8pre0.20240709.193836";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240328.110921.tar";
-          sha256 = "0b8g9zb0x0hx0fgkrvn0lr7sxakrm931m1mrdzxrg779h8h24025";
+          url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240709.193836.tar";
+          sha256 = "1spvk9z1gc522nq36mhyvn86cq9j64chd3mkizj21j93wkd5i3gy";
         };
         packageRequires = [ emacs persist ];
         meta = {
@@ -220,10 +220,10 @@
       elpaBuild {
         pname = "aircon-theme";
         ename = "aircon-theme";
-        version = "0.0.6.0.20240307.233340";
+        version = "0.0.6.0.20240613.140459";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240307.233340.tar";
-          sha256 = "0wlnk169zkb3l7aw8536p6dvlf7qzqdcf0jbmn92w75hy8k7jwjk";
+          url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar";
+          sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -330,10 +330,10 @@
       elpaBuild {
         pname = "async";
         ename = "async";
-        version = "1.9.8.0.20240323.191212";
+        version = "1.9.8.0.20240712.45742";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240323.191212.tar";
-          sha256 = "0ji1ai2zx8wly0b0f670v0wij57hrclr4yr6kwiq0ljaqnbm59h3";
+          url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240712.45742.tar";
+          sha256 = "0a4zbpb58mdcmfq7vfwbsqhcfghxx8c3fkvwsrlg5a3gdcjv4ymv";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -341,14 +341,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    auctex = callPackage ({ elpaBuild
+                          , emacs
+                          , fetchurl
+                          , lib }:
       elpaBuild {
         pname = "auctex";
         ename = "auctex";
-        version = "14.0.5.0.20240519.95252";
+        version = "14.0.6.0.20240630.205810";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auctex-14.0.5.0.20240519.95252.tar";
-          sha256 = "0nb8djks4lpbkmsm4v8v6rnhh1wplcnarfc80fi7mglw26cls1lq";
+          url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240630.205810.tar";
+          sha256 = "0d1pkrqghyz2fqf7qs1yxnibjq0c7a0633j4kq7aqahcb9izpzj1";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -356,6 +359,44 @@
           license = lib.licenses.free;
         };
       }) {};
+    auctex-cont-latexmk = callPackage ({ auctex
+                                       , elpaBuild
+                                       , emacs
+                                       , fetchurl
+                                       , lib }:
+      elpaBuild {
+        pname = "auctex-cont-latexmk";
+        ename = "auctex-cont-latexmk";
+        version = "0.2.0.20240625.221402";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.2.0.20240625.221402.tar";
+          sha256 = "1yxc34q68cnri7k9m2gdnhhwyqz0gs1ip2r956fbxv65s0s7nbab";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auctex-label-numbers = callPackage ({ auctex
+                                        , elpaBuild
+                                        , emacs
+                                        , fetchurl
+                                        , lib }:
+      elpaBuild {
+        pname = "auctex-label-numbers";
+        ename = "auctex-label-numbers";
+        version = "0.2.0.20240617.174703";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20240617.174703.tar";
+          sha256 = "14zj8wgk1vs96z5sba4m3m0zhl02zr3mbapgpypf9ff4c28v8g1b";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "aumix-mode";
@@ -507,10 +548,10 @@
       elpaBuild {
         pname = "bicep-ts-mode";
         ename = "bicep-ts-mode";
-        version = "0.1.3.0.20240218.140135";
+        version = "0.1.3.0.20240530.63226";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240218.140135.tar";
-          sha256 = "1qa1ws7hvn7ni8qnrzhmwnf8hq2wb3dc36i49vdiv0rf68kci210";
+          url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240530.63226.tar";
+          sha256 = "0xmljjfx7a5b3jfqf7cbpb9102ci5vnkqqww1b328rr42v5sdmqm";
         };
         packageRequires = [];
         meta = {
@@ -700,10 +741,10 @@
       elpaBuild {
         pname = "bufferlo";
         ename = "bufferlo";
-        version = "0.8.0.20240516.162426";
+        version = "0.8.0.20240621.221659";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240516.162426.tar";
-          sha256 = "1w4vw1f5qmgv9207wpgmw5ahq4kans5dh775l213vzh32s6cdxx1";
+          url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar";
+          sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -767,10 +808,10 @@
       elpaBuild {
         pname = "cape";
         ename = "cape";
-        version = "1.5.0.20240517.221612";
+        version = "1.5.0.20240710.192144";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cape-1.5.0.20240517.221612.tar";
-          sha256 = "1gxk070lf204hp62zlxqkc0h8k7ml6sywms1m8kadbl650dl8fdc";
+          url = "https://elpa.gnu.org/devel/cape-1.5.0.20240710.192144.tar";
+          sha256 = "0kg9qv8qkcs2v3x1dkyg3j1zxqql000bhbdh7awfk42dfq181lcj";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -898,10 +939,10 @@
       elpaBuild {
         pname = "cobol-mode";
         ename = "cobol-mode";
-        version = "1.1.0.20221221.74904";
+        version = "1.1.0.20240505.191317";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20221221.74904.tar";
-          sha256 = "0268d848pj3vszspmbcz9923945pzz4kzcd0jcrl7k3dasg3mpka";
+          url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20240505.191317.tar";
+          sha256 = "1nv0594a244yp5rv9y7bna37sr4cn0869g7i48888dphg6savlb7";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -935,10 +976,10 @@
       elpaBuild {
         pname = "colorful-mode";
         ename = "colorful-mode";
-        version = "1.0.0.0.20240427.103837";
+        version = "1.0.4.0.20240712.155246";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/colorful-mode-1.0.0.0.20240427.103837.tar";
-          sha256 = "1ggasm3b678rnh96l4bynlbqciwsznsrljhxsi9ifak4xb3zlg8s";
+          url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240712.155246.tar";
+          sha256 = "1n2b5av3k8kwx6f5x0ziq7virv7n2d9npw11s934qzq3qfk2m8i3";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -988,10 +1029,10 @@
       elpaBuild {
         pname = "company";
         ename = "company";
-        version = "0.10.2.0.20240514.232026";
+        version = "0.10.2.0.20240713.30311";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240514.232026.tar";
-          sha256 = "10sh1pi3wb38r5v6vka0g3dxsmp3yr6p2iqrr3icqrx8mbz2mhvz";
+          url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240713.30311.tar";
+          sha256 = "166sgcwvwysvnlwm91bz2c4k85y846qflpg80ywyhnjklskldjh9";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1064,10 +1105,10 @@
       elpaBuild {
         pname = "compat";
         ename = "compat";
-        version = "29.1.4.5.0.20240520.101243";
+        version = "30.0.0.0.0.20240708.182228";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240520.101243.tar";
-          sha256 = "0ik2qlvkd414fs2zpks7bfdylcwpchx0mw2d5932156k3bchm0ib";
+          url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240708.182228.tar";
+          sha256 = "0qgr35606hqz5x6161lwq8zv15z08pm1xbfv32qgzpszmyj8855d";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -1079,10 +1120,10 @@
       elpaBuild {
         pname = "consult";
         ename = "consult";
-        version = "1.6.0.20240517.91901";
+        version = "1.7.0.20240710.202854";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-1.6.0.20240517.91901.tar";
-          sha256 = "0nyx7dncdqv40cfwzy2hfi4f23mph6q41yz5d04r0mzachpbh5zg";
+          url = "https://elpa.gnu.org/devel/consult-1.7.0.20240710.202854.tar";
+          sha256 = "0l4w88530qh65m5wkh8i5z2sv3zfm1jylr3885s550ix0dq45503";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -1099,10 +1140,10 @@
       elpaBuild {
         pname = "consult-denote";
         ename = "consult-denote";
-        version = "0.0.0.0.20240521.82207";
+        version = "0.1.1.0.20240703.93551";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-denote-0.0.0.0.20240521.82207.tar";
-          sha256 = "1yj93195gzjgwfms6k2chwbhq3w14vpab7r9dq24gjxcgb3f63w3";
+          url = "https://elpa.gnu.org/devel/consult-denote-0.1.1.0.20240703.93551.tar";
+          sha256 = "1275qhz4fyrh1qr1mjhzy923x4rs90v80sdiazmszn72dcvp25bq";
         };
         packageRequires = [ consult denote emacs ];
         meta = {
@@ -1170,10 +1211,10 @@
       elpaBuild {
         pname = "corfu";
         ename = "corfu";
-        version = "1.3.0.20240514.120535";
+        version = "1.4.0.20240711.184800";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240514.120535.tar";
-          sha256 = "0nqq690pnjx7dlab6ba1y1n8m6bhbwm1yl7iqzv8php9j4bxyd20";
+          url = "https://elpa.gnu.org/devel/corfu-1.4.0.20240711.184800.tar";
+          sha256 = "0fvpsblz8750vlnv4mbwh0zz90xn35svbii2hyz2ngzb0yjrygch";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -1299,18 +1340,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    csv-mode = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
+    csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "csv-mode";
         ename = "csv-mode";
-        version = "1.23.0.20240114.203711";
+        version = "1.25.0.20240529.65338";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/csv-mode-1.23.0.20240114.203711.tar";
-          sha256 = "0r36dycnc76a5l94ad6p7lkx0f9ma6qmjvnivimgq6man5lw6lxh";
+          url = "https://elpa.gnu.org/devel/csv-mode-1.25.0.20240529.65338.tar";
+          sha256 = "0rr4gz38y1gyzg8mwyl62macjq31rs6fvx3pngamyq1y3ghpivsb";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1354,10 +1391,10 @@
       elpaBuild {
         pname = "dape";
         ename = "dape";
-        version = "0.11.1.0.20240518.161137";
+        version = "0.13.0.0.20240711.211516";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dape-0.11.1.0.20240518.161137.tar";
-          sha256 = "1v359ilhbpsvyvr7x1c9lj2hadsblp2lxd7vwsqx87bf1ls2cpzi";
+          url = "https://elpa.gnu.org/devel/dape-0.13.0.0.20240711.211516.tar";
+          sha256 = "13wzg3z8pfd0gydld2np2bih7bpmpvm98m6z5cwmc2bfh20p8xpa";
         };
         packageRequires = [ emacs jsonrpc ];
         meta = {
@@ -1447,10 +1484,10 @@
       elpaBuild {
         pname = "denote";
         ename = "denote";
-        version = "2.3.5.0.20240520.93621";
+        version = "3.0.6.0.20240712.154245";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240520.93621.tar";
-          sha256 = "12mxsadpikjp3315cd20cp59r9f3g9jznkljp2yc3bkkjfrbjz5v";
+          url = "https://elpa.gnu.org/devel/denote-3.0.6.0.20240712.154245.tar";
+          sha256 = "134s5mgkrsi65skvhqic89ch9806ln6s9glhh8dz552yb46pwbdd";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1466,10 +1503,10 @@
       elpaBuild {
         pname = "denote-menu";
         ename = "denote-menu";
-        version = "1.2.0.0.20230927.131718";
+        version = "1.2.0.0.20240712.110155";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20230927.131718.tar";
-          sha256 = "0pq8k2aif60y22sjxs6d4vlf43fqlizs1zlk3wrd1k52sn2dkgxp";
+          url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20240712.110155.tar";
+          sha256 = "182dbr5hay13nca52qyymmrsmfcwd62ncayjh76ii0jn3khbcqzf";
         };
         packageRequires = [ denote emacs ];
         meta = {
@@ -1557,10 +1594,10 @@
       elpaBuild {
         pname = "diff-hl";
         ename = "diff-hl";
-        version = "1.9.2.0.20240505.211034";
+        version = "1.9.2.0.20240702.202011";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240505.211034.tar";
-          sha256 = "0mbxas2mx0pyvs3ccpp6ss2q8j7n5mva1ngg004fdhp8br8qknhn";
+          url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240702.202011.tar";
+          sha256 = "12i8vl4jiv3v952h7amlmzkvvdpdfmfj77xz3hyjyrr6zvdhygls";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1726,10 +1763,10 @@
       elpaBuild {
         pname = "do-at-point";
         ename = "do-at-point";
-        version = "0.1.1.0.20231027.63811";
+        version = "0.1.2.0.20240625.155102";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231027.63811.tar";
-          sha256 = "1cf4inz5805vd9hcrqsmwxjzc8wy7qwwxg9731d03czjxxcvyp0d";
+          url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20240625.155102.tar";
+          sha256 = "035f0gqywlrr8cwwk9b04nczcv8slf76f2ixvam949fphhc0zkrb";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1771,10 +1808,10 @@
       elpaBuild {
         pname = "drepl";
         ename = "drepl";
-        version = "0.3.0.20240511.124331";
+        version = "0.3.0.20240603.71909";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240511.124331.tar";
-          sha256 = "0xfmna8a8nh48ir9nl5gv4y03kqsvrzars74lza5k0cdsslga4gr";
+          url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240603.71909.tar";
+          sha256 = "0fjs0k36xm2sy3p0yi2km7pcrjv3f0gsc6qbrh47qimn7x5b9bkh";
         };
         packageRequires = [ comint-mime emacs ];
         meta = {
@@ -1905,10 +1942,10 @@
       elpaBuild {
         pname = "eev";
         ename = "eev";
-        version = "20240513.0.20240517.104050";
+        version = "20240710.0.20240710.214351";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eev-20240513.0.20240517.104050.tar";
-          sha256 = "03bdj2f3y5xj33vq7mgxb8s0n05b5qnrsbak2xqjv2bgfky08dmq";
+          url = "https://elpa.gnu.org/devel/eev-20240710.0.20240710.214351.tar";
+          sha256 = "120yka4xv6zqcd7gi6c4qlgydyqv86s15p444jsjiz57zvc5p991";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1923,10 +1960,10 @@
       elpaBuild {
         pname = "ef-themes";
         ename = "ef-themes";
-        version = "1.7.0.0.20240510.44643";
+        version = "1.7.0.0.20240605.183445";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240510.44643.tar";
-          sha256 = "0iygfxy4h74nd2glx7kb4faw4b0f2gpfakdwi1icfkkn021kr781";
+          url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240605.183445.tar";
+          sha256 = "09zmi2rsykdjkmj7hdylsqhqfd87i1g2g4v6sizm94s0hmvxa148";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1950,10 +1987,10 @@
       elpaBuild {
         pname = "eglot";
         ename = "eglot";
-        version = "1.17.0.20240518.213720";
+        version = "1.17.0.20240707.154630";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240518.213720.tar";
-          sha256 = "10hpsip9ai41pxh5a32dwh9z90h2lrjvd3jh666zl3m11g906iwh";
+          url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240707.154630.tar";
+          sha256 = "0f7lbbsh5y4945j8115ph5i2k9c3r0ipcxhmig9kvba6knrshgin";
         };
         packageRequires = [
           compat
@@ -1996,10 +2033,10 @@
       elpaBuild {
         pname = "eldoc";
         ename = "eldoc";
-        version = "1.15.0.0.20240223.120227";
+        version = "1.15.0.0.20240708.123037";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240223.120227.tar";
-          sha256 = "1jlvlzd2bvz0xgc8gdlzw655v5qiaihc4wz5k3yqqck6dbmhd8fy";
+          url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar";
+          sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2030,10 +2067,10 @@
       elpaBuild {
         pname = "elisp-benchmarks";
         ename = "elisp-benchmarks";
-        version = "1.16.0.20240518.180006";
+        version = "1.16.0.20240708.114026";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240518.180006.tar";
-          sha256 = "1pc3qs0j8hh68lbh4lqyf2xkahiylpqaaac3cpvard0wdp9b4wsr";
+          url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240708.114026.tar";
+          sha256 = "1njklwjfmwmxzhd535bkq32ljx99rb0q0jspg02vy88w89wbnkb8";
         };
         packageRequires = [];
         meta = {
@@ -2041,16 +2078,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }:
+    ellama = callPackage ({ compat
+                          , elpaBuild
+                          , emacs
+                          , fetchurl
+                          , lib
+                          , llm
+                          , spinner }:
       elpaBuild {
         pname = "ellama";
         ename = "ellama";
-        version = "0.9.4.0.20240517.145740";
+        version = "0.11.9.0.20240710.202758";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ellama-0.9.4.0.20240517.145740.tar";
-          sha256 = "0qb849ij6v7d8kk9mkx7nbk24d1dh32kydjddxykyn64xixw79kc";
+          url = "https://elpa.gnu.org/devel/ellama-0.11.9.0.20240710.202758.tar";
+          sha256 = "01qfp01lgs84xzzkkky4539bvmakf3xbgr1h57asfsy3j50nsblf";
         };
-        packageRequires = [ emacs llm spinner ];
+        packageRequires = [ compat emacs llm spinner ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/ellama.html";
           license = lib.licenses.free;
@@ -2078,10 +2121,10 @@
       elpaBuild {
         pname = "embark";
         ename = "embark";
-        version = "1.1.0.20240418.225241";
+        version = "1.1.0.20240607.161338";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/embark-1.1.0.20240418.225241.tar";
-          sha256 = "120wh0r76wnsk5kczdnr5b7029x78fyd8p0h9rl2sbss4ac8wa48";
+          url = "https://elpa.gnu.org/devel/embark-1.1.0.20240607.161338.tar";
+          sha256 = "14ar8sfjrk1q6f2dis2w8qa8nsqla8cz91l4nsssr1mfgs7x517b";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -2099,10 +2142,10 @@
       elpaBuild {
         pname = "embark-consult";
         ename = "embark-consult";
-        version = "1.1.0.20240418.225241";
+        version = "1.1.0.20240607.161338";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240418.225241.tar";
-          sha256 = "09qqwd5p7gasazg0plz1ijq5lgxh26358sia4727rs75pxwlz0zv";
+          url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240607.161338.tar";
+          sha256 = "1m48pddbyxpi7ji9cl0pd4npkl6xj7fdak4raacglbgayg4z9qdb";
         };
         packageRequires = [ compat consult emacs embark ];
         meta = {
@@ -2124,10 +2167,10 @@
       elpaBuild {
         pname = "ement";
         ename = "ement";
-        version = "0.15.0.20240416.101741";
+        version = "0.16pre0.20240707.203749";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ement-0.15.0.20240416.101741.tar";
-          sha256 = "1fjns4li3cvi3p2jkwxagzs6aj8x9s4zjc1lwpj013d54mflkndp";
+          url = "https://elpa.gnu.org/devel/ement-0.16pre0.20240707.203749.tar";
+          sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2";
         };
         packageRequires = [
           emacs
@@ -2153,10 +2196,10 @@
       elpaBuild {
         pname = "emms";
         ename = "emms";
-        version = "19.0.20240512.173549";
+        version = "20.1.0.20240704.95932";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/emms-19.0.20240512.173549.tar";
-          sha256 = "13y0g21giswhhysm5252q1rb066a3sap4z51j4cprmwhj282zglj";
+          url = "https://elpa.gnu.org/devel/emms-20.1.0.20240704.95932.tar";
+          sha256 = "1mid0m39af2mcq99xbdjxiiliw6axaysm6cfriyl00w0w6ybfrjf";
         };
         packageRequires = [ cl-lib nadvice seq ];
         meta = {
@@ -2222,10 +2265,10 @@
       elpaBuild {
         pname = "erc";
         ename = "erc";
-        version = "5.6snapshot0.20240518.154805";
+        version = "5.6.1snapshot0.20240709.13309";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240518.154805.tar";
-          sha256 = "0hscaz2nn08zv54gr2xfcg4pf66hycjsz31v603mbqyzgx6538hl";
+          url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240709.13309.tar";
+          sha256 = "1ijn2rwl2lpqckps4xxqxsn6385y84xmid83a2cj4fkkgjks7jnv";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -2339,10 +2382,10 @@
       elpaBuild {
         pname = "external-completion";
         ename = "external-completion";
-        version = "0.1.0.20240102.22814";
+        version = "0.1.0.20240616.203826";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240102.22814.tar";
-          sha256 = "0y2lh89zmyrfkdzwxhc7npbbyp97xi1mnr7qdlsnlnw8gllknf27";
+          url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240616.203826.tar";
+          sha256 = "1zg7v08wbk8ma5k2zj0jrchf2wz483bklgi0rshjividniy99877";
         };
         packageRequires = [];
         meta = {
@@ -2350,16 +2393,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    exwm = callPackage ({ elpaBuild, emacs, fetchurl, lib, xelb }:
+    exwm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, xelb }:
       elpaBuild {
         pname = "exwm";
         ename = "exwm";
-        version = "0.28.0.20240517.92828";
+        version = "0.31.0.20240708.212458";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240517.92828.tar";
-          sha256 = "0d65091s706ajfqi9kp3m6k9hvlwhab6f484fs5v14c9rvspy1pa";
+          url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240708.212458.tar";
+          sha256 = "0cb9y753d7gj40wfwg4my339kiffdydch1bmhdqw1haf3a21srar";
         };
-        packageRequires = [ emacs xelb ];
+        packageRequires = [ compat emacs xelb ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/exwm.html";
           license = lib.licenses.free;
@@ -2409,10 +2452,10 @@
       elpaBuild {
         pname = "filechooser";
         ename = "filechooser";
-        version = "0.2.0.0.20240310.203607";
+        version = "0.2.1.0.20240707.120050";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/filechooser-0.2.0.0.20240310.203607.tar";
-          sha256 = "1hcjnhb3bhk6im5k1mqrlb599jrdg9hxadjhvw31f5l5rjg2636l";
+          url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar";
+          sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -2471,14 +2514,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }:
+    flymake = callPackage ({ eldoc
+                           , elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib
+                           , project }:
       elpaBuild {
         pname = "flymake";
         ename = "flymake";
-        version = "1.3.7.0.20240503.61639";
+        version = "1.3.7.0.20240707.154630";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240503.61639.tar";
-          sha256 = "0qrdjynam3nvhm5qwjks308r28f8wlgsfdmdw4d7sb4xqyr2mzrz";
+          url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240707.154630.tar";
+          sha256 = "1y1r7hz8692y1q9n75vgq26liilaaiz1h8l3jh3n6dqyzll6c2wi";
         };
         packageRequires = [ eldoc emacs project ];
         meta = {
@@ -2740,10 +2788,10 @@
       elpaBuild {
         pname = "gnu-elpa-keyring-update";
         ename = "gnu-elpa-keyring-update";
-        version = "2022.12.0.20221228.123117";
+        version = "2022.12.1.0.20240525.173808";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.0.20221228.123117.tar";
-          sha256 = "18dqjkg9gva5a9967k4gkyjvzhjvh55z2jds7xwgbwczppg8mdz2";
+          url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.1.0.20240525.173808.tar";
+          sha256 = "0s8fydk7b3qc6zv90n3bjniczr5911jkza5xqwi69cb1v9fbfjyd";
         };
         packageRequires = [];
         meta = {
@@ -2858,19 +2906,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    greader = callPackage ({ elpaBuild
+    greader = callPackage ({ compat
+                           , elpaBuild
                            , emacs
                            , fetchurl
-                           , lib }:
+                           , lib
+                           , seq }:
       elpaBuild {
         pname = "greader";
         ename = "greader";
-        version = "0.9.20.0.20240427.100340";
+        version = "0.11.13.0.20240712.232251";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/greader-0.9.20.0.20240427.100340.tar";
-          sha256 = "0g07dvn21g35vx0g7c5dhhwv1pci3jxlpacd9f0iyj42f52yxxhy";
+          url = "https://elpa.gnu.org/devel/greader-0.11.13.0.20240712.232251.tar";
+          sha256 = "08gajcssq4h84r61sh1hpg86dklrh86slvd3q5b65nlwps5mslh6";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs seq ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/greader.html";
           license = lib.licenses.free;
@@ -2898,10 +2948,10 @@
       elpaBuild {
         pname = "gtags-mode";
         ename = "gtags-mode";
-        version = "1.6.0.20240511.23214";
+        version = "1.8.0.20240712.131914";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gtags-mode-1.6.0.20240511.23214.tar";
-          sha256 = "0wi1pfvx7wrd8jfnhlim2zp4k2n96c6prl42f8asbvq1rgi5qh1p";
+          url = "https://elpa.gnu.org/devel/gtags-mode-1.8.0.20240712.131914.tar";
+          sha256 = "1rzmgzirxxrhm8f3vbwf76nrrzd1svf4ddy20h0khp7ycldhd3hp";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2918,10 +2968,10 @@
       elpaBuild {
         pname = "guess-language";
         ename = "guess-language";
-        version = "0.0.1.0.20190417.81229";
+        version = "0.0.1.0.20240528.185800";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20190417.81229.tar";
-          sha256 = "167cz86pfxxszr57v312m9gb0l9318mvgg2lld6m5ppgzfmxlmnm";
+          url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20240528.185800.tar";
+          sha256 = "0hlcnd69mqs90ndp59pqcjdwl27cswnpqy6yjzaspmbya6plv3g6";
         };
         packageRequires = [ cl-lib emacs nadvice ];
         meta = {
@@ -3051,10 +3101,10 @@
       elpaBuild {
         pname = "hyperbole";
         ename = "hyperbole";
-        version = "9.0.2pre0.20240519.180059";
+        version = "9.0.2pre0.20240707.235928";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240519.180059.tar";
-          sha256 = "0i5h57a2ng28ijwds7ddy5ay8dkkgg817p35ig51mjrk7ljz6w2n";
+          url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240707.235928.tar";
+          sha256 = "1rrj0zmc5wfrdzzwpihpxrw6xawswnkszb1753p5sg3sxmj5h2kw";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3068,10 +3118,10 @@
       elpaBuild {
         pname = "idlwave";
         ename = "idlwave";
-        version = "6.5.0.0.20240430.163614";
+        version = "6.5.1.0.20240523.142720";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/idlwave-6.5.0.0.20240430.163614.tar";
-          sha256 = "165lbvhrvrd1szvqns6pd7wmr9zxszzvq3lqz11qg20didi6sngr";
+          url = "https://elpa.gnu.org/devel/idlwave-6.5.1.0.20240523.142720.tar";
+          sha256 = "00i7kl0j7aacm7vyjgmm2kqhjjb3s70g69ka3sqhigm7s1hn3zk9";
         };
         packageRequires = [];
         meta = {
@@ -3167,10 +3217,10 @@
       elpaBuild {
         pname = "ivy";
         ename = "ivy";
-        version = "0.14.2.0.20240519.163855";
+        version = "0.14.2.0.20240524.114155";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240519.163855.tar";
-          sha256 = "1r1b5znx1dzwpz903sm85sm2yp03yp4mvds782j8lngl46r5ibsr";
+          url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar";
+          sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3330,10 +3380,10 @@
       elpaBuild {
         pname = "jinx";
         ename = "jinx";
-        version = "1.7.0.20240515.101640";
+        version = "1.9.0.20240708.212221";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jinx-1.7.0.20240515.101640.tar";
-          sha256 = "1ghp16kmplj9kj92867xsv3bnl6f0w95xl8hgjxbck4krj8k6is5";
+          url = "https://elpa.gnu.org/devel/jinx-1.9.0.20240708.212221.tar";
+          sha256 = "10lp9pnlxaxr1rblkg3996m6bvhdkqhc4my8gxbswxsv9djaw621";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -3341,14 +3391,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+    jit-spell = callPackage ({ compat
+                             , elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
       elpaBuild {
         pname = "jit-spell";
         ename = "jit-spell";
-        version = "0.4.0.20240323.72834";
+        version = "0.4.0.20240604.141707";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240323.72834.tar";
-          sha256 = "1as5s3y1hgjzaz2325rayg0xm80wq2frswcxcarywn85gyfbpskn";
+          url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240604.141707.tar";
+          sha256 = "0qz81zrqhdymir9kbmkyavb591abv2j5iz1in2y0v96hpilxfdw6";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -3397,10 +3451,10 @@
       elpaBuild {
         pname = "jsonrpc";
         ename = "jsonrpc";
-        version = "1.0.25.0.20240427.91928";
+        version = "1.0.25.0.20240616.203826";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240427.91928.tar";
-          sha256 = "18x620ayb9bwp2crxn2mibl7arqc4dzhaykmp5lfqibjkx6qmm9i";
+          url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240616.203826.tar";
+          sha256 = "0jkhhds21vw4i03ya8lflkkh0yaqxqhj49zdzb1l7wgsb499hhya";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3626,14 +3680,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    literate-scratch = callPackage ({ elpaBuild
+                                    , emacs
+                                    , fetchurl
+                                    , lib }:
+      elpaBuild {
+        pname = "literate-scratch";
+        ename = "literate-scratch";
+        version = "1.0.0.20240621.41043";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/literate-scratch-1.0.0.20240621.41043.tar";
+          sha256 = "0k1vgb1pmrdhq0mlvrpgdsamqfbhvrjwm2jgixla82j7814zzckq";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
       elpaBuild {
         pname = "llm";
         ename = "llm";
-        version = "0.15.0.0.20240518.145931";
+        version = "0.16.1.0.20240706.201250";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/llm-0.15.0.0.20240518.145931.tar";
-          sha256 = "0dzvgq7lvlg62rzv9p62r5m0gm5glwd37mnw3sf6w5h3jfnkpzv0";
+          url = "https://elpa.gnu.org/devel/llm-0.16.1.0.20240706.201250.tar";
+          sha256 = "0kx90fqdsp762774f07jb4m9vr4lnimls45g4a16rq7xy783cd57";
         };
         packageRequires = [ emacs plz ];
         meta = {
@@ -3712,10 +3784,10 @@
       elpaBuild {
         pname = "loccur";
         ename = "loccur";
-        version = "1.2.4.0.20201130.183958";
+        version = "1.2.5.0.20240610.183057";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/loccur-1.2.4.0.20201130.183958.tar";
-          sha256 = "1ghig684f2r6dl5czym3d5hqhf72y1hilnhbk95lg890cc0yacir";
+          url = "https://elpa.gnu.org/devel/loccur-1.2.5.0.20240610.183057.tar";
+          sha256 = "1apir3ijix4pkrv8q30xxqbiwvj78vp3y68ffq18fcwiww0gkavf";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3809,10 +3881,10 @@
       elpaBuild {
         pname = "marginalia";
         ename = "marginalia";
-        version = "1.6.0.20240404.45149";
+        version = "1.6.0.20240710.95347";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240404.45149.tar";
-          sha256 = "1bqynrmb99691k0cmdn30g780356gff30bd7lirlriraabj19y7h";
+          url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240710.95347.tar";
+          sha256 = "1943srwzm6w4ixcb48d968pbf4hs3y3rwcmcnryh8az2q3j6sqgm";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -4007,10 +4079,10 @@
       elpaBuild {
         pname = "modus-themes";
         ename = "modus-themes";
-        version = "4.4.0.0.20240505.33119";
+        version = "4.4.0.0.20240709.63840";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240505.33119.tar";
-          sha256 = "1y637n8cll4932hyi16gnzpjqypwgwxbyq8mfhgjbz26663nksxs";
+          url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240709.63840.tar";
+          sha256 = "19yys9lkfsrcbib4rd0ph8d1a3698bih0ghihpb7i1mxy2x0dxwj";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4022,10 +4094,10 @@
       elpaBuild {
         pname = "mpdired";
         ename = "mpdired";
-        version = "2pre0.20240414.172616";
+        version = "2.0.20240614.95804";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240414.172616.tar";
-          sha256 = "0c7rjws601wh7bxg549hbbfanh5lxwrhrm03ay2ziriswqdrq5ng";
+          url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar";
+          sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4194,10 +4266,10 @@
       elpaBuild {
         pname = "nano-theme";
         ename = "nano-theme";
-        version = "0.3.4.0.20240319.93238";
+        version = "0.3.4.0.20240624.80231";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240319.93238.tar";
-          sha256 = "0xh3m9c4wq7zvc634nvfvxyyi0snlb67286znmnfkpgb3j84vshk";
+          url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240624.80231.tar";
+          sha256 = "1h2sifcl26av1lzzmngb2svl23hchjnzd8aaszkxxwh34wg1cgnk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4434,14 +4506,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    orderless = callPackage ({ elpaBuild
+                             , emacs
+                             , fetchurl
+                             , lib }:
       elpaBuild {
         pname = "orderless";
         ename = "orderless";
-        version = "1.1.0.20240401.95916";
+        version = "1.1.0.20240711.200241";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240401.95916.tar";
-          sha256 = "0w2n1b65hj642a36i6022kmzwgwlb72aicfc6hj3b7rk5zsjg0hc";
+          url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240711.200241.tar";
+          sha256 = "04ambf76p24z45b5zswbqprbvy31vdg48mk36dmd85apl0myvi95";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4453,10 +4528,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "9.7pre0.20240530.133120";
+        version = "9.8pre0.20240712.111340";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-9.7pre0.20240530.133120.tar";
-          sha256 = "sha256-DuuLDBJKI2LwC0PH9PtujcPvaqaKLWYij+KzP1U7o9M=";
+          url = "https://elpa.gnu.org/devel/org-9.8pre0.20240712.111340.tar";
+          sha256 = "1nqx0kvmxf7prfip30l1br9gl2s7bmcacds5ifafawywnc720jl6";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4472,10 +4547,10 @@
       elpaBuild {
         pname = "org-contacts";
         ename = "org-contacts";
-        version = "1.1.0.20240521.114436";
+        version = "1.1.0.20240609.105801";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240521.114436.tar";
-          sha256 = "0srbl81ngk24c9kf991ps2j53kpqriwgs8ld4lfcqmxzclr5y8iv";
+          url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240609.105801.tar";
+          sha256 = "1rx5lnn151wn42zpnrr64g1qn5lvk0syfqm2v4h58np7lsf10c2y";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -4530,10 +4605,10 @@
       elpaBuild {
         pname = "org-modern";
         ename = "org-modern";
-        version = "1.2.0.20240515.193202";
+        version = "1.3.0.20240708.215718";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240515.193202.tar";
-          sha256 = "05mbgm95rlcv5liswlckd26izz5p3a6mkcfnz60widnilfmza9k6";
+          url = "https://elpa.gnu.org/devel/org-modern-1.3.0.20240708.215718.tar";
+          sha256 = "1r3hk48781j375c307dp3mgb662nk223g6cqfbv72jhqbis7770g";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -4587,10 +4662,10 @@
       elpaBuild {
         pname = "org-remark";
         ename = "org-remark";
-        version = "1.2.2.0.20240325.201734";
+        version = "1.2.2.0.20240629.103632";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240325.201734.tar";
-          sha256 = "1m5fwry6854w1iv6pahvqgyakws31d82l8f14k585rdxx2n8fwzb";
+          url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar";
+          sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -4636,17 +4711,14 @@
           license = lib.licenses.free;
         };
       }) {};
-    orgalist = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
+    orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "orgalist";
         ename = "orgalist";
-        version = "1.14.0.20240111.181530";
+        version = "1.16.0.20240618.91747";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/orgalist-1.14.0.20240111.181530.tar";
-          sha256 = "05nbkphk3ii3ibfap9y9ss3w0g3qzl6qiynflib1dhbk2v222z3x";
+          url = "https://elpa.gnu.org/devel/orgalist-1.16.0.20240618.91747.tar";
+          sha256 = "0kw1iasyg5j1kghwb952rah040qhybhycsmgk8y0rfk382ra3a1i";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4673,10 +4745,10 @@
       elpaBuild {
         pname = "osm";
         ename = "osm";
-        version = "1.3.0.20240122.225511";
+        version = "1.3.0.20240708.215736";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/osm-1.3.0.20240122.225511.tar";
-          sha256 = "0xddnwrnypqz5l4swwbi5k9qdlv260fyq766vpg31r86z92q7r24";
+          url = "https://elpa.gnu.org/devel/osm-1.3.0.20240708.215736.tar";
+          sha256 = "12w8mgm7b3hg4h6yks0a1z2sy22b91gk5qsbs014ymq1z4mg38m3";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -4702,14 +4774,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    pabbrev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    pabbrev = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
       elpaBuild {
         pname = "pabbrev";
         ename = "pabbrev";
-        version = "4.3.0.0.20240216.43949";
+        version = "4.3.0.0.20240617.162224";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240216.43949.tar";
-          sha256 = "0lkqg6qv06ayianrxs9mivy8pny7hzr0743mlaa20adgk681v1s4";
+          url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240617.162224.tar";
+          sha256 = "0wkizis0wb6syy2lzp1mi2cn5znzangi1w18jcn5ra8k8xj66yp4";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4816,14 +4891,17 @@
           license = lib.licenses.free;
         };
       }) {};
-    persist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    persist = callPackage ({ elpaBuild
+                           , emacs
+                           , fetchurl
+                           , lib }:
       elpaBuild {
         pname = "persist";
         ename = "persist";
-        version = "0.6.0.20240114.52348";
+        version = "0.6.1.0.20240615.190609";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/persist-0.6.0.20240114.52348.tar";
-          sha256 = "1k4m2zmcb4l3q39qnx3kfl2wsm4380ih3mf0lc54g9l77fw4rfxr";
+          url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240615.190609.tar";
+          sha256 = "0qncm2q42y4xqijx468cpvbh841nw9fk27mm5zdc3l792i0i29y4";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4883,10 +4961,10 @@
       elpaBuild {
         pname = "plz";
         ename = "plz";
-        version = "0.8.0.20240425.201348";
+        version = "0.9.0.20240610.142147";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-0.8.0.20240425.201348.tar";
-          sha256 = "00kprdnnz584fa2r8mkn4wzyk4fyxgn5d22z6s5c6lag0il1bjvc";
+          url = "https://elpa.gnu.org/devel/plz-0.9.0.20240610.142147.tar";
+          sha256 = "1jbm07jw7kw2s57q4d0l6r8zxwjj1mi9kx37ppdqv28dbjmbln1r";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4902,10 +4980,10 @@
       elpaBuild {
         pname = "plz-event-source";
         ename = "plz-event-source";
-        version = "0.1pre0.20240501.111443";
+        version = "0.1pre0.20240607.160859";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240501.111443.tar";
-          sha256 = "1bygbgzvyc6k8bqrnl5gwdbjmlrdh25fmf7n0rllfz4b055cdj6a";
+          url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240607.160859.tar";
+          sha256 = "02wv00dij35crkff82plxlkwgninjnllpc44lq0ynxwk1lgx3q5a";
         };
         packageRequires = [ emacs plz ];
         meta = {
@@ -4921,10 +4999,10 @@
       elpaBuild {
         pname = "plz-media-type";
         ename = "plz-media-type";
-        version = "0.1pre0.20240501.111146";
+        version = "0.1pre0.20240607.134302";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240501.111146.tar";
-          sha256 = "0l2zgxgi48rvzs79qq2bjmp7bg2qhd3709rpyzfkv77gigcjwqj6";
+          url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240607.134302.tar";
+          sha256 = "1q6a4yyy339l2crc24mssxansmpmhq401h3mcqkzkcw60xh9wsr8";
         };
         packageRequires = [ emacs plz ];
         meta = {
@@ -5016,10 +5094,10 @@
       elpaBuild {
         pname = "popper";
         ename = "popper";
-        version = "0.4.6.0.20240323.172152";
+        version = "0.4.6.0.20240701.211603";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240323.172152.tar";
-          sha256 = "1avpaza4w7hav5x7wz6jvk0gacxas11cdlpggx9chjlp0klns0v2";
+          url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar";
+          sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5034,10 +5112,10 @@
       elpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "1.4.3.0.20240507.14806";
+        version = "1.4.3.0.20240703.35906";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240507.14806.tar";
-          sha256 = "08jhv15hwrdjgdzl6d8xwdmx46afwlpd6yz3h5k7y7lhbnlc5jkp";
+          url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar";
+          sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5077,6 +5155,44 @@
           license = lib.licenses.free;
         };
       }) {};
+    preview-auto = callPackage ({ auctex
+                                , elpaBuild
+                                , emacs
+                                , fetchurl
+                                , lib }:
+      elpaBuild {
+        pname = "preview-auto";
+        ename = "preview-auto";
+        version = "0.3.0.20240629.205058";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240629.205058.tar";
+          sha256 = "12qmpx9lamxkwkvximygqkczyvwxv6dn8zyv8x55v2qiav0vcp1r";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/preview-auto.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    preview-tailor = callPackage ({ auctex
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
+      elpaBuild {
+        pname = "preview-tailor";
+        ename = "preview-tailor";
+        version = "0.2.0.20240617.174356";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20240617.174356.tar";
+          sha256 = "17x74wzfi7kc08x1kwlzvsyiqmimxf77k58amskyg73l1iqmr8s8";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     project = callPackage ({ elpaBuild
                            , emacs
                            , fetchurl
@@ -5085,10 +5201,10 @@
       elpaBuild {
         pname = "project";
         ename = "project";
-        version = "0.10.0.0.20240512.175655";
+        version = "0.11.1.0.20240614.152748";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240512.175655.tar";
-          sha256 = "1228kpfyj3zd1bz8xjv257mhhxgvrj8d67saxgfxix3y62fhb2wc";
+          url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240614.152748.tar";
+          sha256 = "0izv7szsi3gqqafdjrqnpy3znsk1izr2zkcyc45jiyv5bafd76ik";
         };
         packageRequires = [ emacs xref ];
         meta = {
@@ -5177,10 +5293,10 @@
       elpaBuild {
         pname = "python";
         ename = "python";
-        version = "0.28.0.20240518.202234";
+        version = "0.28.0.20240708.74355";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/python-0.28.0.20240518.202234.tar";
-          sha256 = "0nk9rdr62c9j27gbjz3z6ri35aw026pmj6lhqvn6j9ci8ijif3yf";
+          url = "https://elpa.gnu.org/devel/python-0.28.0.20240708.74355.tar";
+          sha256 = "0q4s3lqifq6nrs9irqz709msja5slw6kc66gigm653m1n9j9kr1i";
         };
         packageRequires = [ compat emacs seq ];
         meta = {
@@ -5294,10 +5410,10 @@
       elpaBuild {
         pname = "rcirc-sqlite";
         ename = "rcirc-sqlite";
-        version = "1.0.1.0.20240422.191938";
+        version = "1.0.2.0.20240606.194313";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.1.0.20240422.191938.tar";
-          sha256 = "1nspv7qgwzjpy9jsgh3m75iimy8piicimv9r82ahm5vrpaxkwg3p";
+          url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar";
+          sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -5740,10 +5856,10 @@
       elpaBuild {
         pname = "shell-command-plus";
         ename = "shell-command+";
-        version = "2.4.2.0.20240313.182825";
+        version = "2.4.2.0.20240712.91350";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240313.182825.tar";
-          sha256 = "17rqdk23w41dl44imrk6b7p3r4g0ldppj84hp7s6w7amx6fia7ah";
+          url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240712.91350.tar";
+          sha256 = "11qma2a8cph3q87bma8jwb8q4vfqdqs7gmb88yw8ywil76p6jdms";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6224,10 +6340,10 @@
       elpaBuild {
         pname = "svg-tag-mode";
         ename = "svg-tag-mode";
-        version = "0.3.2.0.20240429.105240";
+        version = "0.3.2.0.20240624.85758";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240429.105240.tar";
-          sha256 = "0isp9zcyx9dqb0nah1b990nikwiaxm5lvqlbya9v1rcb3fbvf9hc";
+          url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar";
+          sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln";
         };
         packageRequires = [ emacs svg-lib ];
         meta = {
@@ -6378,10 +6494,10 @@
       elpaBuild {
         pname = "taxy-magit-section";
         ename = "taxy-magit-section";
-        version = "0.13.0.20240124.3519";
+        version = "0.14pre0.20240703.212805";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/taxy-magit-section-0.13.0.20240124.3519.tar";
-          sha256 = "1z1cypw7g5vs8vrm1mjvfzxaasr8nz89w1br9dhk8wshyy4kmgf3";
+          url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14pre0.20240703.212805.tar";
+          sha256 = "0sdjfryyg0lgr8mry0v662j9m3kaqcap6f73s4ds81yc67y30qbg";
         };
         packageRequires = [ emacs magit-section taxy ];
         meta = {
@@ -6411,10 +6527,10 @@
       elpaBuild {
         pname = "tempel";
         ename = "tempel";
-        version = "1.1.0.20240216.154335";
+        version = "1.1.0.20240708.212025";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240216.154335.tar";
-          sha256 = "14zraddmfxnz7bzr9m2qk38hqy3bmd8ypq5x7ni8xapc6lyqd0pm";
+          url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240708.212025.tar";
+          sha256 = "0jlqq91w8rwqkd6knqlpw9218xqblfqw253406q4an820rxkzx7l";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -6440,6 +6556,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    tex-item = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tex-item";
+        ename = "tex-item";
+        version = "0.1.0.20240617.174820";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tex-item-0.1.0.20240617.174820.tar";
+          sha256 = "17b95npakxjzc03qrsxla5jhdzhq0clwdrx57f9ck94a0fnpji3x";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tex-item.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tex-parens = callPackage ({ elpaBuild
+                              , emacs
+                              , fetchurl
+                              , lib }:
+      elpaBuild {
+        pname = "tex-parens";
+        ename = "tex-parens";
+        version = "0.4.0.20240630.70456";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/devel/tex-parens-0.4.0.20240630.70456.tar";
+          sha256 = "0rz6qmmmfajndq3irvrfvmjp1l3j0cfkz5fp36nabyrpj0v8g821";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tex-parens.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     theme-buffet = callPackage ({ elpaBuild
                                 , emacs
                                 , fetchurl
@@ -6547,10 +6696,10 @@
       elpaBuild {
         pname = "track-changes";
         ename = "track-changes";
-        version = "1.2.0.20240505.172329";
+        version = "1.2.0.20240604.221628";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240505.172329.tar";
-          sha256 = "1mvgwrrqfa3yix9lrsx4mb6zqaydjjqc69nh9lyrcgi54819jlvh";
+          url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar";
+          sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6562,10 +6711,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.6.3.0.20240331.120258";
+        version = "2.7.1.0.20240629.82953";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tramp-2.6.3.0.20240331.120258.tar";
-          sha256 = "07358iw3skm59qjry7qggj2rggbdbghmw0yrbdpyabrqmdfv3li8";
+          url = "https://elpa.gnu.org/devel/tramp-2.7.1.0.20240629.82953.tar";
+          sha256 = "0kf7l5v84hqhbxzvg6xmffs8b03shd6062wjxfxy9z8y9xb6zpar";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -6635,10 +6784,10 @@
       elpaBuild {
         pname = "transient";
         ename = "transient";
-        version = "0.6.0.0.20240509.184906";
+        version = "0.7.2.0.20240629.150812";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240509.184906.tar";
-          sha256 = "1axy5ccwd4n63saaf10af182r2k3j8x4vbyhxa81rdv73ndr652g";
+          url = "https://elpa.gnu.org/devel/transient-0.7.2.0.20240629.150812.tar";
+          sha256 = "02d73zfxcbk2p5pzs5j2hv0qznj2zbjyjd6xhinpxx657w1c3zsx";
         };
         packageRequires = [ compat emacs seq ];
         meta = {
@@ -6813,10 +6962,10 @@
       elpaBuild {
         pname = "urgrep";
         ename = "urgrep";
-        version = "0.5.1snapshot0.20240511.180511";
+        version = "0.5.1snapshot0.20240530.111648";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240511.180511.tar";
-          sha256 = "03dpbsmx11r14mi6vlh4phknmxlayxng2rfphv8q7wn4cvgv18q2";
+          url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240530.111648.tar";
+          sha256 = "160h7jzbkf1igaz49sp9gw30471qmw9b28h2pq9r8f1varkvy9an";
         };
         packageRequires = [ compat emacs project ];
         meta = {
@@ -6884,10 +7033,10 @@
       elpaBuild {
         pname = "use-package";
         ename = "use-package";
-        version = "2.4.5.0.20240518.103045";
+        version = "2.4.5.0.20240708.120317";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240518.103045.tar";
-          sha256 = "0zh4vb5h2733glbj3izflw0laxvf2y34cm924jpgyrjkz66ld6wc";
+          url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240708.120317.tar";
+          sha256 = "1kp1mh2hm6yhwchkr1vxpnnajdc378knwkmf88vky2ygnnscczy7";
         };
         packageRequires = [ bind-key emacs ];
         meta = {
@@ -7033,10 +7182,10 @@
       elpaBuild {
         pname = "verilog-mode";
         ename = "verilog-mode";
-        version = "2024.3.1.121933719.0.20240314.104026";
+        version = "2024.3.1.121933719.0.20240707.154630";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240314.104026.tar";
-          sha256 = "1fk5jl9897jbzg4dqf1mhdk7dmjmcqxpb1v2sv9ni06bh25rn6z8";
+          url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240707.154630.tar";
+          sha256 = "1sh1piff0jiahn7w9i607l6j28g74ysylr3n7xrp59nh07y2br6b";
         };
         packageRequires = [];
         meta = {
@@ -7048,10 +7197,10 @@
       elpaBuild {
         pname = "vertico";
         ename = "vertico";
-        version = "1.8.0.20240511.204721";
+        version = "1.8.0.20240711.185118";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240511.204721.tar";
-          sha256 = "0gd68x98dghqa7da0ybah2w27bxipal262n9d6rpdhxb361cmpca";
+          url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240711.185118.tar";
+          sha256 = "1wsybijh4h46swlxx7viz0wiwh5hbkh4q3a51r60flvys90cjkgz";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -7253,10 +7402,10 @@
       elpaBuild {
         pname = "which-key";
         ename = "which-key";
-        version = "3.6.0.0.20240501.85118";
+        version = "3.6.0.0.20240625.112213";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240501.85118.tar";
-          sha256 = "080i7b37fzvf020q4dqxy0dr8na0qqaymv8bd048yrw70wcrlz0w";
+          url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240625.112213.tar";
+          sha256 = "1shjn6bqnwr8fxccfz86dpwvyqw0crmrn7pb60dwvvjmxqfm0aj6";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -7282,19 +7431,20 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-tool-bar = callPackage ({ elpaBuild
+    window-tool-bar = callPackage ({ compat
+                                   , elpaBuild
                                    , emacs
                                    , fetchurl
                                    , lib }:
       elpaBuild {
         pname = "window-tool-bar";
         ename = "window-tool-bar";
-        version = "0.2.0.20240519.64147";
+        version = "0.2.1.0.20240609.122134";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.0.20240519.64147.tar";
-          sha256 = "1z5fdlrrjdx0lhfwzahnlqxg75fy9abrj3izc8mfwy5j1bkrym6m";
+          url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20240609.122134.tar";
+          sha256 = "1xfwirfdy69c349052jx31c3ib708mwl68458lj8dar5y2cqwk0q";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
           license = lib.licenses.free;
@@ -7432,16 +7582,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    xelb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    xelb = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "xelb";
         ename = "xelb";
-        version = "0.18.0.20240415.160551";
+        version = "0.20.0.20240708.212415";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xelb-0.18.0.20240415.160551.tar";
-          sha256 = "13bvf0k39bdwh8xr2m096idx371xqdxh2x0g9kh6y65hc80l1k1x";
+          url = "https://elpa.gnu.org/devel/xelb-0.20.0.20240708.212415.tar";
+          sha256 = "0sv3p1q3gc9jpjvnl9pjr98kzl3i969hmqbznpby1fgdrlbinvik";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ compat emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/xelb.html";
           license = lib.licenses.free;
@@ -7481,10 +7631,10 @@
       elpaBuild {
         pname = "xref";
         ename = "xref";
-        version = "1.6.3.0.20240518.3950";
+        version = "1.7.0.0.20240707.154630";
         src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240518.3950.tar";
-          sha256 = "0k60vvhpw5bzbs3qv28sip7dl2p44m8bczx54ff32klgfwpk06zk";
+          url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar";
+          sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7";
         };
         packageRequires = [ emacs ];
         meta = {

From ce760599f4221879bd8d8b76afaf7e22273e41f6 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 13 Jul 2024 19:11:32 -0300
Subject: [PATCH 247/319] melpa-packages: updated 2024-07-13 (from overlay)

---
 .../elisp-packages/recipes-archive-melpa.json | 5544 ++++++++++-------
 1 file changed, 3329 insertions(+), 2215 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 02857188f0f6..bba5811c01df 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -318,8 +318,8 @@
   "repo": "abstools/abs-mode",
   "unstable": {
    "version": [
-    20230705,
-    1437
+    20240701,
+    1407
    ],
    "deps": [
     "erlang",
@@ -327,13 +327,13 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "bf21971bf57100e9e1ac26563207b35b377ec057",
-   "sha256": "070xa0hylkxy2j8g5jhdv3q003aqvasp7ald6f98skg6a0hsrvc7"
+   "commit": "252d9f2de3773dcfc7b07f5edfafc2d9298c366e",
+   "sha256": "1z52wlv60y002xniy7klnp9aww8c4y6lkfif52h1v4l4q23czbhh"
   },
   "stable": {
    "version": [
     1,
-    6
+    7
    ],
    "deps": [
     "erlang",
@@ -341,8 +341,8 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "e6edb867b5cc68b5c9c112a51f51f7c1d22554dc",
-   "sha256": "1h355815bk4bs7wmmjkchb3c5v2fd5sfw7cqcxf4dgll3jpnphkv"
+   "commit": "0132032d9317861e63bea865746124accab9db83",
+   "sha256": "0xm88xqwlvdz2jj2fb196c4af64psyll1bjxmr5pvsgnn4j1pjay"
   }
  },
  {
@@ -1569,14 +1569,14 @@
   "repo": "gvol/emacs-achievements",
   "unstable": {
    "version": [
-    20150531,
-    1317
+    20240703,
+    318
    ],
    "deps": [
     "keyfreq"
    ],
-   "commit": "5c3c430b21bcf685c412cf5ceb3769f630082e4f",
-   "sha256": "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3"
+   "commit": "c229d21ad5d1e13be08e087ab498800b2b9b7c97",
+   "sha256": "0xwhzrmiph9dg9gqm8fd3bv0sz8izl7cr298rbyjzlrq6lksaf5y"
   }
  },
  {
@@ -2049,11 +2049,11 @@
   "repo": "t4ccer/agenix.el",
   "unstable": {
    "version": [
-    20231016,
-    614
+    20240601,
+    1304
    ],
-   "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816",
-   "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah"
+   "commit": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63",
+   "sha256": "0pibky4ndm765xwz6964yihl0v5pmfdj90rnalb5zld1bfv4dv1x"
   },
   "stable": {
    "version": [
@@ -2114,11 +2114,11 @@
   "repo": "vietor/agtags",
   "unstable": {
    "version": [
-    20221026,
-    904
+    20240701,
+    1433
    ],
-   "commit": "e8e04ece2f32d65b084974597bfe8077da3ddba0",
-   "sha256": "14sxysq606rq06banjhj5andny3j9r8yk3v4w8ipk0kd033qrr22"
+   "commit": "d47e58d024007d629b5a73c98c7c7e79f64be4d8",
+   "sha256": "13a9j56nnjh1zbglbd844wxr1zyw6jbdpmnmxcvhi9h5vksdxsgl"
   }
  },
  {
@@ -2254,14 +2254,14 @@
   "repo": "AnthonyDiGirolamo/airline-themes",
   "unstable": {
    "version": [
-    20211214,
-    1749
+    20240530,
+    1704
    ],
    "deps": [
     "powerline"
    ],
-   "commit": "6bd102e49a7d87af1a72eb86e953991ff7bc954e",
-   "sha256": "0yrkbg4wwbp2rm60gmsalz7vrrklw908m6ws66j611z6h6wgmj48"
+   "commit": "baaa4f1f0acd339b1efc1058654ea7d9e6e44ead",
+   "sha256": "0biyna1agxknsg2farj2bi0pnqqxkvdnicmnazl77kcxknhs0r9s"
   },
   "stable": {
    "version": [
@@ -2590,11 +2590,11 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20240108,
-    559
+    20240623,
+    1800
    ],
-   "commit": "ee414384938ccf2ce93c77d717b85dc5538a257d",
-   "sha256": "18gk71fsh99m6hafc85nwg7rx416d5pnnjyk506i15nnwywsbbqd"
+   "commit": "39ef44f810c34e8900978788467cc675870bcd19",
+   "sha256": "00d7z43xxbgfi0yms57qj5yksd6wfri186fq26fjrdn5xbqqjnja"
   },
   "stable": {
    "version": [
@@ -3261,11 +3261,11 @@
   "repo": "anki-editor/anki-editor",
   "unstable": {
    "version": [
-    20240514,
-    1944
+    20240710,
+    536
    ],
-   "commit": "32d81be1d8305c5ccde12c7d0b29845d4f831888",
-   "sha256": "1chlj0igxk2mmmdvmw3qahp3pz9ra6yabm4711xhlnx7zj028lkc"
+   "commit": "b14a6ccb2c3d0b06f2359ce44f8fe6fb535bf391",
+   "sha256": "180f6wb9whnzifpl3x9gcqfs94w04plyy99xk1nl5syx6ila6km3"
   }
  },
  {
@@ -3492,21 +3492,21 @@
  },
  {
   "ename": "ansible",
-  "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
-  "sha256": "17pfdyfv5z7bw0xhh8apqww8wsmvb5p5y0xs8048gh427mgw5yrf",
-  "fetcher": "github",
-  "repo": "k1LoW/emacs-ansible",
+  "commit": "db66ccdf93a7dde428808db839dfc42e1fb7a429",
+  "sha256": "0h4zh2w3hja9psfafdfy1i8bxial4l77ba778wvxnfgmx3kyab1p",
+  "fetcher": "gitlab",
+  "repo": "emacs-ansible/emacs-ansible",
   "unstable": {
    "version": [
-    20240212,
-    325
+    20240624,
+    1452
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "1d7de8d3ddac980715eebd87ee66859f8665b101",
-   "sha256": "1indmjrk3gwvxpigmn8lkdgnb841k2n8s2q4dsl8vppy4hfrl7aa"
+   "commit": "eebb2fb49d3c0a0586d1e4ead9ba618c7d003cae",
+   "sha256": "0ivmhavvi25kwz9kn5pf5kmsncwaqj4hzsf4i77c14sh8s0fjka9"
   },
   "stable": {
    "version": [
@@ -3870,11 +3870,11 @@
   "repo": "Greybeard-Entertainment/app-monochrome",
   "unstable": {
    "version": [
-    20240406,
-    36
+    20240611,
+    1623
    ],
-   "commit": "9324ec430a5154853c1da711e1c9738d61f1135a",
-   "sha256": "09jxb4b4lb19z2dfvpa0rjba89gcsphkx5d45p56rbb1b0i3h5iz"
+   "commit": "e319fcfeb56d0fe28bbda7fc813537593c2f368d",
+   "sha256": "0qgj8l22cyyxwknkwc0104nhi5kcswgx5amd1b67pmrxj6cni0ws"
   }
  },
  {
@@ -3885,11 +3885,11 @@
   "repo": "alexmurray/apparmor-mode",
   "unstable": {
    "version": [
-    20240211,
-    2243
+    20240703,
+    221
    ],
-   "commit": "05a67cba7508cf63bed22763a8949e55a7bf6786",
-   "sha256": "0644zfmrhlfrrgy5z21bp95885spcfxi93lv77gz070zzxk4ciq7"
+   "commit": "66136e99ad507e9b5404e09d01fe6e1828a930c7",
+   "sha256": "033sy23ybkv5y8194xi9693dwzmrpdxf4r1agy2rs6lkxssd1hb8"
   }
  },
  {
@@ -4105,11 +4105,11 @@
   "repo": "motform/arduino-cli-mode",
   "unstable": {
    "version": [
-    20210511,
-    653
+    20240613,
+    640
    ],
-   "commit": "9ff2c47a3b56cbffd41a62376f7c2ff16ccbf4e0",
-   "sha256": "1vj649nrj7f7r7vmp97z1llbgl7sd8vlxvn30l8kdfrfkyf4gq3q"
+   "commit": "3265507b5fe4173b3f452a9519c3d09a777f35fb",
+   "sha256": "1xsd0y5m59701gz1xcy0n95c80ggz5q2rf0m4dbbncp2pcmwmnl1"
   }
  },
  {
@@ -4120,14 +4120,14 @@
   "url": "https://repo.or.cz/arduino-mode.git",
   "unstable": {
    "version": [
-    20220210,
-    1355
+    20240527,
+    1603
    ],
    "deps": [
     "spinner"
    ],
-   "commit": "652c6a328fa8f2db06534d5f231c6b6933be3edc",
-   "sha256": "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x"
+   "commit": "b2ffd8441851659cb1cc844156073967729585e5",
+   "sha256": "0jk7l9y3x8p6c6m6qpg7vmzn3yirv0m5h483plq1i2qs8njk5v23"
   }
  },
  {
@@ -4461,11 +4461,11 @@
   "repo": "jwiegley/emacs-async",
   "unstable": {
    "version": [
-    20240323,
-    1912
+    20240712,
+    457
    ],
-   "commit": "72b70b004505db2f06318fefd6b358704b9167d7",
-   "sha256": "00dpd202b9g2qpzb1ijbw8j69j2fxf0q3hdqrxpbhcagh22yn0qr"
+   "commit": "585231547a495d0a36bdf6db9ef50bb9a19119f3",
+   "sha256": "17mrj3bvh29r7bncsz47gbpwhr1j7d4scj97yb4c58d2a6zmwwcz"
   },
   "stable": {
    "version": [
@@ -5097,20 +5097,20 @@
   "repo": "emacscollective/auto-compile",
   "unstable": {
    "version": [
-    20240415,
-    1533
+    20240628,
+    2027
    ],
-   "commit": "01844064e3f2bb9f109a8a064998baf89a864fbc",
-   "sha256": "1syrwi1rb9w4y4fi8kckvd27i879w35y0sbmlhqpp2li0yx51wwa"
+   "commit": "8f6d708d7021559e0d4577f77b5d42afb3a6cb4f",
+   "sha256": "1dicy4srxlr07qj4sbwaa8bcdbhz91wnxh9zrk2w29z08m0f18c7"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    2
    ],
-   "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd",
-   "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh"
+   "commit": "a495b3b92a555953b58ec4b6a8ab8411c337ea3d",
+   "sha256": "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl"
   }
  },
  {
@@ -5412,11 +5412,11 @@
   "repo": "LionyxML/auto-dark-emacs",
   "unstable": {
    "version": [
-    20240322,
-    44
+    20240711,
+    2247
    ],
-   "commit": "066f9723001647bec88b051e543b82366c9b7a42",
-   "sha256": "1r9pr8ars3341mh9mvybaigdq83i225rj3xr4c8c8lw93wl0pk0n"
+   "commit": "39b168e8e09b89ae8c8ef2388b895140901be48e",
+   "sha256": "1id8i9p6l46m1c09a7mz2335i168dj4q701d3a2q21i22lamhbff"
   }
  },
  {
@@ -5465,14 +5465,14 @@
   "repo": "elp-revive/auto-highlight-symbol",
   "unstable": {
    "version": [
-    20240101,
-    905
+    20240627,
+    650
    ],
    "deps": [
     "ht"
    ],
-   "commit": "6194af718b758e10a0401104760b9d9cf96735db",
-   "sha256": "17rnhmnwmb5lrm8z8gps8sh8ni3c94ixwks09pfqvsj0mlvgiswc"
+   "commit": "fe230750fdd3de07f71e776cb3270754e0865234",
+   "sha256": "0y5jcx8fkljfcsl5g92fzwq4x0ifr843bi9hy452kwgim6afi9ri"
   },
   "stable": {
    "version": [
@@ -6326,26 +6326,26 @@
   "repo": "licht1stein/babashka.el",
   "unstable": {
    "version": [
-    20240417,
-    1347
+    20240527,
+    732
    ],
    "deps": [
     "parseedn"
    ],
-   "commit": "117138c0b7361e70282ee53825e2f4de1a782609",
-   "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4"
+   "commit": "4ea9d7febf3e9d301c91231ba2833f3417ba9059",
+   "sha256": "0rjka55nbs76ykjfifwawm5knrsrhcx0q7dfaqvdjfzypz1r2bhc"
   },
   "stable": {
    "version": [
     1,
     0,
-    7
+    8
    ],
    "deps": [
     "parseedn"
    ],
-   "commit": "117138c0b7361e70282ee53825e2f4de1a782609",
-   "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4"
+   "commit": "4ea9d7febf3e9d301c91231ba2833f3417ba9059",
+   "sha256": "0rjka55nbs76ykjfifwawm5knrsrhcx0q7dfaqvdjfzypz1r2bhc"
   }
  },
  {
@@ -6447,28 +6447,28 @@
   "repo": "tarsius/backline",
   "unstable": {
    "version": [
-    20240415,
-    1533
+    20240712,
+    2214
    ],
    "deps": [
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "f070ebb33eb44087e07ff647d8d87d1b27ce40d4",
-   "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng"
+   "commit": "39726634051b2c1ee8d661df894b130447fb7632",
+   "sha256": "07rk77zbjysdqkw2zh6rr3wf2mvqvcgkfjkplg1vyfqqvlsl5lwh"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "f1d9e1cd5cba6362b152b5f4227d1714918fba59",
-   "sha256": "0f7rcbmaggj644z3j1pq2sjg4c12g9s2k4c5x3yrirjgazxfpr8x"
+   "commit": "af07e3862950c77bba6994ecbe9f62e0110dfc50",
+   "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng"
   }
  },
  {
@@ -6681,11 +6681,11 @@
   "repo": "tinted-theming/base16-emacs",
   "unstable": {
    "version": [
-    20240421,
-    101
+    20240621,
+    2329
    ],
-   "commit": "c7ea8116d331fd9ce913267489e7846c34795b38",
-   "sha256": "07vziyp5nn1rxgx0z467yjahvm90w5f62h5ysggrp924ywwzblp5"
+   "commit": "8789114e45d09d114e0e197cb090ce7beb993901",
+   "sha256": "1gipaykmrp20ncf6jlc1cl2w8swsg70iagzid4hj69cc3klay6mk"
   },
   "stable": {
    "version": [
@@ -7779,26 +7779,26 @@
   "repo": "tarsius/bicycle",
   "unstable": {
    "version": [
-    20240415,
-    1533
+    20240712,
+    2215
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0ac08d9946f0da7066a6c2242025b42983c0c2e8",
-   "sha256": "1pp8m5ai7353jzm54laxg3l1c3xfsk32dlrg8wnpz6cgqkd47ajs"
+   "commit": "0b7ea156d211e8a87a931afa210d4f6beea20f5d",
+   "sha256": "0mmmxxi29jcngslfas309nv7hvkr94w3m0yb111663x28z24v523"
   },
   "stable": {
    "version": [
     0,
     4,
-    6
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "dfc0c874d66d671cbb15149db27134e4ff4f54b8",
-   "sha256": "13aaz5fzdbplaf78713ax5f8v3qd7ggafdh1pgnc1mv4a37bjkl8"
+   "commit": "6244c479486b9a48369236b22a40d0830722e950",
+   "sha256": "1vildffmcj2k5q507ijn2s7f8x4fnabrq4gl2zrsx6ddddsbrym5"
   }
  },
  {
@@ -7966,14 +7966,14 @@
   "repo": "rnkn/binder",
   "unstable": {
    "version": [
-    20230729,
-    350
+    20240630,
+    725
    ],
    "deps": [
     "seq"
    ],
-   "commit": "859d89c00e21c83565ed2b45f8d7527b45b1292c",
-   "sha256": "0da3wx93rbsy9y1hd5w722sgblg5bffznw00vyylwnq5zaikh5lp"
+   "commit": "a17eb5089bbab05372c018e67b3da9aa25217d81",
+   "sha256": "0nbczlvcdygfjy0grlxqpc5ygnwk8nyxi3pk8kkgp681c19bcpdi"
   },
   "stable": {
    "version": [
@@ -7984,7 +7984,7 @@
    "deps": [
     "seq"
    ],
-   "commit": "3cf7c254703f5c3a90c2cd617b522d09e7913c7b",
+   "commit": "9881ca21d30400681e0b3de404e5cc020e060209",
    "sha256": "01y9yd1rvi1ll3pp2i44g7ivkvz1cvc22207f8a3dbv90jw4c66m"
   }
  },
@@ -8020,14 +8020,14 @@
   "repo": "liuyinz/binky.el",
   "unstable": {
    "version": [
-    20240519,
-    732
+    20240525,
+    715
    ],
    "deps": [
     "dash"
    ],
-   "commit": "f2fe74321f87dfe46421a7a7aaaec30b7f831059",
-   "sha256": "17h4jypfhlc7wbw3k7mr8l9hz3f5ji77xxi80i6p7mj5613j26fc"
+   "commit": "39c1a1e78aea36f79104fdc256949901e3d3d2c0",
+   "sha256": "086rcvdr58c9p2snqgh2mdnmrdigkzn8909a6ncg9c3j18x55bzj"
   },
   "stable": {
    "version": [
@@ -8142,16 +8142,16 @@
   "repo": "canatella/bitbake-el",
   "unstable": {
    "version": [
-    20220509,
-    1236
+    20240605,
+    1322
    ],
    "deps": [
     "dash",
     "mmm-mode",
     "s"
    ],
-   "commit": "434b088ab8715731d62978264cb934e34c75c4b3",
-   "sha256": "15p265zigxki80h3gfq61cmssqqwcnp0990zl8xmj8p377523l6m"
+   "commit": "8285f46fe19cb99fe5ed42d38de0fe5c51c98fb0",
+   "sha256": "1a929lxra50f99vc865iy2icprq3m40zg2zsgr5hxd2pvcpch927"
   }
  },
  {
@@ -8313,28 +8313,28 @@
   "repo": "Artawower/blamer.el",
   "unstable": {
    "version": [
-    20240512,
-    1514
+    20240701,
+    1909
    ],
    "deps": [
     "async",
     "posframe"
    ],
-   "commit": "4cc2e6daaecf84c8dd00792f86724413423293a6",
-   "sha256": "1xyx1gls4d9xzlfwr0xkbblk8mzk3xhwbdqlag1xxdqnd1z96n5n"
+   "commit": "a6526820ac37a2ab041c4abda57b78f133299bf2",
+   "sha256": "1snm5k56142drdi84vg328yzl00l0fm4sl704pnk9bj6wb28l6q2"
   },
   "stable": {
    "version": [
     0,
-    8,
-    0
+    9,
+    1
    ],
    "deps": [
     "async",
     "posframe"
    ],
-   "commit": "e249fa3ae23cfc013883bcc138ef9f46107acb0c",
-   "sha256": "03wvmhv4m7am4hhy0m454bn1c2cvpi33z2sxdwf9fnfd5drwhrgm"
+   "commit": "281963da789fe9e47ce9efc4f7a9c4d19bf3a405",
+   "sha256": "0imqw1nczhi2wvl7wzbiwdh0rf2gklrl1ck5wrr2lg26hkjs0fmz"
   }
  },
  {
@@ -8876,16 +8876,16 @@
   "repo": "jyp/boon",
   "unstable": {
    "version": [
-    20240314,
-    920
+    20240628,
+    703
    ],
    "deps": [
     "dash",
     "expand-region",
     "multiple-cursors"
    ],
-   "commit": "9e006726be9ac508e0bb0393393abce06f7493f4",
-   "sha256": "0n11869w4806lak36x54rfwsnckrv7ydp3lzmdbjcq48mcsh1jjg"
+   "commit": "19a7f76e75759f5266986b40c470edb1f70c43df",
+   "sha256": "1cv6hf3lfhbxaqv0r4d56gfw956mq5ylv2c85hcfhv5jmj4k69w8"
   },
   "stable": {
    "version": [
@@ -8909,15 +8909,15 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20240415,
-    1553
+    20240609,
+    1435
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "dfc5d58b439042a6e323cb342ab7531692d118a0",
-   "sha256": "02rq0ps327v8xlhs69r0cxicg4kljcza8ha7gks7z728hprwvhdl"
+   "commit": "940dc6af73cc40b5254fdb15ff1a6058e1b2b8a5",
+   "sha256": "1hlq3ss6waz6xi8qcqig1267l626fddpaz9038xy96w5zcm5wzdj"
   },
   "stable": {
    "version": [
@@ -9069,11 +9069,11 @@
   "repo": "museoa/bqn-mode",
   "unstable": {
    "version": [
-    20231217,
-    1203
+    20240623,
+    126
    ],
-   "commit": "23fd9db096ab3a5c5fbd034e721b8a7d27d1d6b7",
-   "sha256": "0nlwhk353fdl3jwmi1c6mz5898mh717lvldv9jypj9jdipcw6icc"
+   "commit": "b2a524b67d07483888fa17649a0618dfb6b22990",
+   "sha256": "1saq9fkdr4wflpnf257ddm3yhnvryhjms5isrik5vjwjv5j5lwrh"
   }
  },
  {
@@ -9141,11 +9141,11 @@
   "repo": "Michael-Allan/Breccia.Emacs",
   "unstable": {
    "version": [
-    20240507,
-    504
+    20240620,
+    1213
    ],
-   "commit": "dafb49308796f75db802e2d23596dfd3fb7e37b0",
-   "sha256": "1fb20vhszf7la1skzy093m6kl3q3akicirbpdp0vhd3xs47jzk1h"
+   "commit": "942e042cc22224ec3940d0867c8c08f71e036924",
+   "sha256": "06ps4swqyf4b8pv3x51wqsnpkxp9dmq089rbyvhn4rp7rix8y8x7"
   }
  },
  {
@@ -9156,25 +9156,25 @@
   "url": "https://bitbucket.org/MikeWoolley/brf-mode",
   "unstable": {
    "version": [
-    20230803,
-    2022
+    20240702,
+    1846
    ],
    "deps": [
     "fringe-helper"
    ],
-   "commit": "8875f5fcd173e220bbfa6bf9f8f09d721a29cd50",
-   "sha256": "0iqakgg7yz409776p14adg4vdn9ik0mf95vhzx23g3pd79lv34wb"
+   "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2",
+   "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96"
   },
   "stable": {
    "version": [
-    1,
-    25
+    2,
+    0
    ],
    "deps": [
     "fringe-helper"
    ],
-   "commit": "ca6f9869707dab5929e1da9e13bdf602207bc7f9",
-   "sha256": "15qq87fhdb99qd9ndxpprk43ip1mk57k1f7gin2yv8wdvv36n6bz"
+   "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2",
+   "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96"
   }
  },
  {
@@ -9327,11 +9327,11 @@
   "repo": "agzam/browser-hist.el",
   "unstable": {
    "version": [
-    20240402,
-    2345
+    20240607,
+    406
    ],
-   "commit": "0b7e93274173e82c05e5d9c9d3055e4b9017612a",
-   "sha256": "0jsq1sk4vbs3r7lhz28a550w88qq0mj6y2ra5ry351dnxsypsmsn"
+   "commit": "0372c6d984ca194d9454b14eba6eadec480ec3ff",
+   "sha256": "0s19gglc9jwapy7a9mf4i97a7r5q9lpm2ivvn0zjhqxcmzj3295j"
   }
  },
  {
@@ -9357,14 +9357,14 @@
   "repo": "plandes/bshell",
   "unstable": {
    "version": [
-    20230805,
-    1646
+    20240112,
+    2303
    ],
    "deps": [
     "buffer-manage"
    ],
-   "commit": "57f3409168ec9649508e3ee30d0d2de8f81b960e",
-   "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7"
+   "commit": "d59559cf7c5dded8b9639346ae5c1384d8b9be4e",
+   "sha256": "0shfv1lxhz5k07jppdn0shm0pv1lzwsncfyniwm15fwhvb71bzhv"
   },
   "stable": {
    "version": [
@@ -10672,8 +10672,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20240507,
-    456
+    20240707,
+    1121
    ],
    "deps": [
     "dash",
@@ -10683,13 +10683,13 @@
     "s",
     "transient"
    ],
-   "commit": "8ca1b5262f0f0e4a0e295efc2c14db00333e9a85",
-   "sha256": "0f3fqgl8kqb1r3dcfd9fn0sh68ky2l13mmd6hqib7lmg4lf7aljz"
+   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
+   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
   },
   "stable": {
    "version": [
     2,
-    12,
+    13,
     0
    ],
    "deps": [
@@ -10700,8 +10700,8 @@
     "s",
     "transient"
    ],
-   "commit": "1e09bd7cdf7e3274a0f43a66bba3121ea6b42f4a",
-   "sha256": "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0"
+   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
+   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
   }
  },
  {
@@ -10851,14 +10851,14 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20240517,
-    2216
+    20240710,
+    1919
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a71e5c96564163837810b96bd34322b42f6e4d9c",
-   "sha256": "0rwkn8p8p7axrh46x9cp3f90n5ic0dpm409pjn627s9sbz0j2vkj"
+   "commit": "040c1ee30b6ff766ba0f3e1458b43ce4a65f068b",
+   "sha256": "1h3xnjp1897syj2dwbb32x8s00hkcsvn09vsgjg1z204cd2i5czj"
   },
   "stable": {
    "version": [
@@ -11212,27 +11212,65 @@
   }
  },
  {
-  "ename": "casual",
-  "commit": "8eeb0f07cd1b2fff661cf6523390e81adfc060ba",
-  "sha256": "0d33xs732pnc4z29w13amslpx9qqbaxms7apqdwxcsyr8jsvybw0",
+  "ename": "casual-avy",
+  "commit": "1650f2d8352c64072794a1563f5b7728206acebd",
+  "sha256": "18rbw3mkmvadh517zcapfqfrmxb91xpp0dsmpdvcg3x05208dg20",
   "fetcher": "github",
-  "repo": "kickingvegas/Casual",
+  "repo": "kickingvegas/casual-avy",
   "unstable": {
    "version": [
-    20240416,
-    2237
+    20240703,
+    1846
    ],
-   "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce",
-   "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8"
+   "deps": [
+    "avy",
+    "casual-lib"
+   ],
+   "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9",
+   "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y"
   },
   "stable": {
    "version": [
     1,
-    5,
+    4,
     0
    ],
-   "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce",
-   "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8"
+   "deps": [
+    "avy",
+    "casual-lib"
+   ],
+   "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9",
+   "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y"
+  }
+ },
+ {
+  "ename": "casual-calc",
+  "commit": "47f061be179f0c7f8b86faa99ff0d3e9d8552ac1",
+  "sha256": "1c0wk9zbh7rzi9s0jcdxnzxy989545ccz1xmj7cs9jw4dq0i63z6",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-calc",
+  "unstable": {
+   "version": [
+    20240628,
+    2332
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a",
+   "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw"
+  },
+  "stable": {
+   "version": [
+    1,
+    10,
+    0
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a",
+   "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw"
   }
  },
  {
@@ -11243,20 +11281,186 @@
   "repo": "kickingvegas/casual-dired",
   "unstable": {
    "version": [
-    20240517,
-    2348
+    20240710,
+    2115
    ],
-   "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6",
-   "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937"
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897",
+   "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq"
+  },
+  "stable": {
+   "version": [
+    1,
+    6,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897",
+   "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq"
+  }
+ },
+ {
+  "ename": "casual-ibuffer",
+  "commit": "de711e92fd2f8ff1c626c3f7f789f402e8e92007",
+  "sha256": "1gynvk22nhm8l7dix7hracr7m3y3d0h065mplkj78hpx2pkmhvja",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-ibuffer",
+  "unstable": {
+   "version": [
+    20240712,
+    423
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731",
+   "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq"
   },
   "stable": {
    "version": [
     1,
     1,
-    2
+    1
    ],
-   "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6",
-   "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937"
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731",
+   "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq"
+  }
+ },
+ {
+  "ename": "casual-info",
+  "commit": "1b06cc08de41e82f3f148aa9e35663e2e06427ae",
+  "sha256": "1d6jmjhc0xalw1ll15k69bazbvprmw519lcsm2gd2jpkbngw9rmy",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-info",
+  "unstable": {
+   "version": [
+    20240711,
+    712
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c",
+   "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c",
+   "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz"
+  }
+ },
+ {
+  "ename": "casual-isearch",
+  "commit": "7280670087e28ed08575c71165c095ee7be7da49",
+  "sha256": "02qb1bpx30cxyjrd821g4qc5v7xwv4rc1f67p1dx3fglms8p2zc5",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-isearch",
+  "unstable": {
+   "version": [
+    20240711,
+    403
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e",
+   "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj"
+  },
+  "stable": {
+   "version": [
+    1,
+    8,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e",
+   "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj"
+  }
+ },
+ {
+  "ename": "casual-lib",
+  "commit": "fd3bb4b191bf416dd419c5c76d510c7f5890e673",
+  "sha256": "18g739n2dbcywamvkkpnrhsmmnk1l5b9v05d173b9qq1fj06pn8p",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-lib",
+  "unstable": {
+   "version": [
+    20240628,
+    2300
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d",
+   "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d",
+   "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf"
+  }
+ },
+ {
+  "ename": "casual-suite",
+  "commit": "4294e2c5d538ee9e1f2a59ad0c32efcd7a6affd2",
+  "sha256": "1qbym111j4yjbkb87h31lnkx9c7jbzqgd9b2m2f9fkc1zj9ddkn9",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-suite",
+  "unstable": {
+   "version": [
+    20240705,
+    1758
+   ],
+   "deps": [
+    "casual-avy",
+    "casual-calc",
+    "casual-dired",
+    "casual-ibuffer",
+    "casual-info",
+    "casual-isearch"
+   ],
+   "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956",
+   "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi"
+  },
+  "stable": {
+   "version": [
+    1,
+    2,
+    0
+   ],
+   "deps": [
+    "casual-avy",
+    "casual-calc",
+    "casual-dired",
+    "casual-ibuffer",
+    "casual-info",
+    "casual-isearch"
+   ],
+   "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956",
+   "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi"
   }
  },
  {
@@ -11291,11 +11495,11 @@
   "repo": "catppuccin/emacs",
   "unstable": {
    "version": [
-    20240326,
-    900
+    20240607,
+    1703
    ],
-   "commit": "3d93abaa33e95f19b4a8b0e1e9bef1e3e68dd994",
-   "sha256": "1j6nsy9is067288x2riabb7kc3grghb2g7bkvwndn2jyglbbxgi0"
+   "commit": "2f15c7c7cca7834b072bb26421a2755a67786899",
+   "sha256": "19gbkdmjq6616x9q4zhzf6hz9g1d91sh26h00pjzpbp1cj1qml3l"
   },
   "stable": {
    "version": [
@@ -11381,30 +11585,6 @@
    "sha256": "0cpmryg6haqlrfz6hwm10k7iw66hgwclm8lhdbikr97b6536bni5"
   }
  },
- {
-  "ename": "cc-isearch-menu",
-  "commit": "63dbaed255d4c0f263d534077b33c9cffec50b1b",
-  "sha256": "00jb1m3fdlp3pn75c67phshb22shyhga31s3wf1s7wldandrbkwj",
-  "fetcher": "github",
-  "repo": "kickingvegas/cc-isearch-menu",
-  "unstable": {
-   "version": [
-    20240401,
-    48
-   ],
-   "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b",
-   "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi"
-  },
-  "stable": {
-   "version": [
-    1,
-    4,
-    1
-   ],
-   "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b",
-   "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi"
-  }
- },
  {
   "ename": "ccc",
   "commit": "7375cab750a67ede1a021b6a4371b678a7b991b0",
@@ -11600,15 +11780,14 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20240521,
-    2204
+    20240704,
+    1048
    ],
    "deps": [
-    "cl-lib",
     "powerline"
    ],
-   "commit": "3346b23545932c73c4c88a4cdb54778ecff95443",
-   "sha256": "1p2jllqv6d5xh1j06y9844msww56ldinnil8c1zd9jd4q6jsvnrz"
+   "commit": "12663a3ea01d2652d28e63a9644b68ac31c400be",
+   "sha256": "1jlwk3930i389f38mmkrzq5nwk1vfffczdcsc9i0si5rzr010zbs"
   },
   "stable": {
    "version": [
@@ -11828,16 +12007,16 @@
   "repo": "worr/cfn-mode",
   "unstable": {
    "version": [
-    20240519,
-    805
+    20240630,
+    804
    ],
    "deps": [
     "f",
     "s",
     "yaml-mode"
    ],
-   "commit": "6ef789934d6b9b78cdbe5c90703f4afead736ead",
-   "sha256": "04hynyv60g9y3z76zlwvgfqmm4i9450skxhx0r8bw9m8yf04841i"
+   "commit": "a16c17e7765f1ae54ae7d40e748871e6b1ffced6",
+   "sha256": "1m1v2an9dpsksar9v60srg9bdhsiiwjxba7lbd7s6iyraj30r2dn"
   },
   "stable": {
    "version": [
@@ -12101,14 +12280,14 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240517,
-    2003
+    20240709,
+    808
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "910b0ad5cdb633f6be64f88596219a7eb58af226",
-   "sha256": "1mqdgsy1l9lc94cg1q8gzm7phc3f4rafk39cjlf5i9a1wai7f7p6"
+   "commit": "fce2b6d3609135f827da46dbb6d1f37d65a8b024",
+   "sha256": "1qlm6v2nbalfwwjwz956zmj9ipy2smfimlllidxdlbq0463hnsgs"
   }
  },
  {
@@ -12527,14 +12706,14 @@
   "repo": "breatheoutbreathein/chordpro-mode.el",
   "unstable": {
    "version": [
-    20231205,
-    26
+    20240618,
+    626
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a63fc0b7181299befc4496cba04e0f84d5953000",
-   "sha256": "0b2psymnp5bvx1ags4dx0xpm852bygrslk2qj4c8br5g89xh3pil"
+   "commit": "ea530813edb4936f36efea9b2f0009c9feb6b90b",
+   "sha256": "1rxqqarhspfvyf7ii0h6sg5z8qknn6zqj3cfy797awc2fv3m3drs"
   },
   "stable": {
    "version": [
@@ -12711,11 +12890,11 @@
   "repo": "DarkBuffalo/chronos",
   "unstable": {
    "version": [
-    20230804,
-    1712
+    20240525,
+    1339
    ],
-   "commit": "517c53f57c54ec64e1bc870a63b0f4cf1772fcf1",
-   "sha256": "009wc3hb2mflcpk0jdifvppjjj7m5gzgcf1s4x1knsrzqhmm9vxz"
+   "commit": "5ea0bf7c3881ea905e280446342539b242401979",
+   "sha256": "1175kx6nbkl6s8qdfjsd4vv4n0g2yd5wf8vbj31z8rk45fv4gnv2"
   }
  },
  {
@@ -12736,6 +12915,21 @@
    "sha256": "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc"
   }
  },
+ {
+  "ename": "chyla-dark-theme",
+  "commit": "bdae382c677e77d005fa08fa0ce7d7984e6ead86",
+  "sha256": "0pbywy3l44qanw4xbiav7djxr0kgghhdc9z5294mgxaka9m6z54f",
+  "fetcher": "github",
+  "repo": "chyla/ChylaDarkThemeForEmacs",
+  "unstable": {
+   "version": [
+    20240708,
+    2033
+   ],
+   "commit": "8d5c9a2eaaf04e0f1ad953a34b15e9777407b760",
+   "sha256": "0lx51z5iwm0wz9c8d2fjx9974z2rp48q50dljvcfw795zgbdm79b"
+  }
+ },
  {
   "ename": "chyla-theme",
   "commit": "5c55eebf8df165360ce1e5d18e484c90f296fe52",
@@ -12744,11 +12938,11 @@
   "repo": "chyla/ChylaThemeForEmacs",
   "unstable": {
    "version": [
-    20231220,
-    1545
+    20240708,
+    2017
    ],
-   "commit": "4d4b9dca3547e919ed5311cc7d04821f77860fbd",
-   "sha256": "1b41ar0ii5ikfi3hxss2maxgn2lx3kxzizpr9kf5218kmhjy3fh2"
+   "commit": "c2bb425eaff0975e0c7081f282d291f7853f8376",
+   "sha256": "0iqi0qfkwjhvqhs9yvs6pqbinp4jb6sj6fym4m69174fyqkjhc1b"
   }
  },
  {
@@ -12759,8 +12953,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20240522,
-    1030
+    20240711,
+    1319
    ],
    "deps": [
     "clojure-mode",
@@ -12771,13 +12965,13 @@
     "spinner",
     "transient"
    ],
-   "commit": "5a477c58dca86cbee723ddb2d0670689f53c47ed",
-   "sha256": "075ikfwrn3n0czzlj2233y7d0ljal8hwzab1vqhfl100q61j0hrj"
+   "commit": "42608a1369760b6e36a86f0a63daa876c8b24e9e",
+   "sha256": "1rwsfcmxm1fy1lc0h9d511hhp3x17vhsxzmwizdzpfw42xpa1pyq"
   },
   "stable": {
    "version": [
     1,
-    13,
+    15,
     1
    ],
    "deps": [
@@ -12789,8 +12983,8 @@
     "spinner",
     "transient"
    ],
-   "commit": "06dc45844ad05fe23fccb7dec1609404e3cda88e",
-   "sha256": "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h"
+   "commit": "810337cee931d9f14aa16550a74516f8337a47f3",
+   "sha256": "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1"
   }
  },
  {
@@ -12969,20 +13163,20 @@
   "repo": "guidoschmidt/circadian.el",
   "unstable": {
    "version": [
-    20221223,
-    1419
+    20240603,
+    935
    ],
-   "commit": "f20cdbf164be10ef0c55d26eba4d270c7c826f42",
-   "sha256": "03wh3zb1pwvjn990bvd461397v8fh5y6asy0g5wb7x86sg6za1hg"
+   "commit": "76464419f69e9758bc5a76b2420c9648ddf93dba",
+   "sha256": "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p"
   },
   "stable": {
    "version": [
+    1,
     0,
-    4,
     0
    ],
-   "commit": "323039363588028c629604fae17b73a3d3c821cc",
-   "sha256": "108qsmzdbk4jw445chl6zhbd0mb95w3lc30c6jaijn4y7ys3dmls"
+   "commit": "76464419f69e9758bc5a76b2420c9648ddf93dba",
+   "sha256": "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p"
   }
  },
  {
@@ -12993,14 +13187,14 @@
   "repo": "emacs-circe/circe",
   "unstable": {
    "version": [
-    20240407,
-    1101
+    20240630,
+    2055
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9d703f481a2c65f2b17edcc2b05412f9865d24af",
-   "sha256": "1k8hydd45zqhbfd4lmcdr46wxj9m788wwjmr9ss0vyrqc0w6z6zw"
+   "commit": "3ae38790506311fd32b2d499804af69b16307652",
+   "sha256": "1gmzjcsk7vyp0mnx1ak4a5xi1wz9j1jcz5lvia68sx5wrwn2vicg"
   },
   "stable": {
    "version": [
@@ -13105,16 +13299,16 @@
   "repo": "pprevos/citar-denote",
   "unstable": {
    "version": [
-    20240520,
-    2325
+    20240709,
+    1954
    ],
    "deps": [
     "citar",
     "dash",
     "denote"
    ],
-   "commit": "1c62db7107b1ff9de5f87a03d9ac1973c4bbb0ec",
-   "sha256": "0140a7zxs479na6p94g9rsxg7sp08jx7ri4y1h764wxwfvl8qf8c"
+   "commit": "8333093ffcd05aaf5ec98568d9e4abe03a6eebb2",
+   "sha256": "19vrmsykp4j9p7ib686jc4qya2rra09685wp9c715r5kas4y8rva"
   },
   "stable": {
    "version": [
@@ -13203,8 +13397,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20240513,
-    1309
+    20240621,
+    1425
    ],
    "deps": [
     "compat",
@@ -13216,8 +13410,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "fed285385c1a8c0248890cd591f64a0e2598334d",
-   "sha256": "19m3q2izbgzvaimk9z38zznj1602vmr8y93c2sfrkyssjb4rmxfy"
+   "commit": "cfa30b6c95c7465a05da98eccf273608880b22d7",
+   "sha256": "0layhvngypfxms7ivhiqfhfx5787kq0vdp2m4k51mwgjk0cagfqc"
   },
   "stable": {
    "version": [
@@ -13285,19 +13479,20 @@
   "repo": "universal-ctags/citre",
   "unstable": {
    "version": [
-    20240508,
-    1154
+    20240630,
+    721
    ],
-   "commit": "fe670ff2410fe4cd59cdce8ef1b947deefa71879",
-   "sha256": "1fancp1z955z2clnr9rh6iqpg6cisama9drx51356n4afv60q9pv"
+   "commit": "d99483767016cada88a2877a77b9b76f8e118b80",
+   "sha256": "10sp5256354p6f3wcgvgniv7jsvb000nffzhq4lkc4kzf3b579q3"
   },
   "stable": {
    "version": [
     0,
-    4
+    4,
+    1
    ],
-   "commit": "ac01a5c5852fa3a170e5f00dafeb633012e25fd8",
-   "sha256": "0fq1f03v706gj6p2fjz51kvmj1pwc9p64chqap2ajr0a9cxpwln6"
+   "commit": "7c9c77276cc7dfcb77640df7d589eaac3198cfee",
+   "sha256": "1x5kxlzhzr2x4cszcqaxcg2lc71nwmmfnm2vzx7iz7h74hn4f1ld"
   }
  },
  {
@@ -13407,6 +13602,21 @@
    "sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl"
   }
  },
+ {
+  "ename": "clang-format-lite",
+  "commit": "748d88db575163fadbae8a20556351e4fe26d2dc",
+  "sha256": "0iy902lrk8518q2ndxb6b1xf9zdiy6h9hi021jpqg44v7rg7y9gp",
+  "fetcher": "github",
+  "repo": "arteen1000/clang-format-lite",
+  "unstable": {
+   "version": [
+    20240708,
+    223
+   ],
+   "commit": "4e60389129601ac81f8c698c1a6985ad72224b3e",
+   "sha256": "1hiviarym9ahf3hi0zqf2ja5y14cyvm56z922m11kyapbmwqprka"
+  }
+ },
  {
   "ename": "claude-shell",
   "commit": "a40f86ecc9a185f065a720318ff69afc10d92535",
@@ -13415,14 +13625,14 @@
   "repo": "arminfriedl/claude-shell",
   "unstable": {
    "version": [
-    20240420,
-    1917
+    20240707,
+    1743
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "2574f5d1fe58c44dc0e16d3a7be36a9e4e0927ca",
-   "sha256": "1my1n0bsx7xghaxa3qyrsqkdn3nxxym00acncp24b1hsm63k12yx"
+   "commit": "6fb330578a84a8753e32b9ffc50a2506406f1099",
+   "sha256": "1v6jbqd3djk4h3id4spqax6wzg1sgqc7mypci1j1qvgxafg6iqyh"
   }
  },
  {
@@ -14079,20 +14289,20 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20240516,
-    525
+    20240526,
+    1825
    ],
-   "commit": "faee3efbb1e940af0e5777514923c8dea567f87d",
-   "sha256": "1d3pwwwwzfaqbynpmkpnmfmf2gh7nviy8nc18m0nm9g27i9x3wk4"
+   "commit": "815bc387ec1436fb2fcac00ba8a61207636d0186",
+   "sha256": "0rx7r4v6dfz26n9bqhfbd4jv0fj9zqnc22jk8pa5y4ldjzkas35c"
   },
   "stable": {
    "version": [
     5,
-    18,
-    1
+    19,
+    0
    ],
-   "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f",
-   "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5"
+   "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085",
+   "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"
   }
  },
  {
@@ -14103,26 +14313,26 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20231124,
-    732
+    20240526,
+    1824
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f",
-   "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5"
+   "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085",
+   "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"
   },
   "stable": {
    "version": [
     5,
-    18,
-    1
+    19,
+    0
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f",
-   "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5"
+   "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085",
+   "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"
   }
  },
  {
@@ -14195,11 +14405,11 @@
   "repo": "clojure-emacs/clojure-ts-mode",
   "unstable": {
    "version": [
-    20240314,
-    552
+    20240618,
+    301
    ],
-   "commit": "8afa5656955814193b3b27020faf4edf00abda88",
-   "sha256": "0jxfzcmqlmc88ib483n6y445xs7bpaqw3b1w0z3nmcdfk512d0fr"
+   "commit": "7b7a4705d1a952b4414672955e67fb9471213f2a",
+   "sha256": "02hz3wfpfkkiqx92swmj5avisq408934iybip6rs4pwrh69630aq"
   },
   "stable": {
    "version": [
@@ -14254,15 +14464,15 @@
   "repo": "magit/closql",
   "unstable": {
    "version": [
-    20240415,
-    1534
+    20240712,
+    2215
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "2bff36edd28c9a0d0c25b545b3837fa874376cc5",
-   "sha256": "1951r5p5p6jr9xahjw7sr0s01d6mhcp721b35gxa9d9kw3p52xx6"
+   "commit": "ebfb860510d895ebcbbe920dd0d86381f1b6504c",
+   "sha256": "0v1maxvxzcihg1ssvxc1h1m4l0yzhfp9702s6fmb7h18yd2g2gvy"
   },
   "stable": {
    "version": [
@@ -14447,20 +14657,20 @@
   "url": "https://gitlab.kitware.com/cmake/cmake.git",
   "unstable": {
    "version": [
-    20240412,
-    1329
+    20240624,
+    1425
    ],
-   "commit": "3bb04b05a527b2443298cb7bc9520f58e56c4e9e",
-   "sha256": "0cn206miz1z0b92rg95z7qr240awh92vfby62gjh9pv0mazhac3q"
+   "commit": "4b874546fc3711bb24fcdba5718e6c85a17c740a",
+   "sha256": "1mjw3wwn0bqqyvlf251mwbjq5pbw018qd6cnid5mjlxglfbj4y75"
   },
   "stable": {
    "version": [
     3,
-    29,
-    3
+    30,
+    0
    ],
-   "commit": "b39fb31bf411c3925bd937f8cffbc471c2588c34",
-   "sha256": "1bwa80zrqyav0bxpq6b9vrjijbfn5g52vqhzvy70g7bp3jbp6vzm"
+   "commit": "0f88f57389fd636d76b7f726ac94933476d6c195",
+   "sha256": "1p6jq4yq81r0vdzr7wshllvn8dl80snz6q4ihp2fhd2yjngxj1l4"
   }
  },
  {
@@ -15046,14 +15256,14 @@
   "repo": "purcell/color-theme-sanityinc-solarized",
   "unstable": {
    "version": [
-    20220917,
-    1350
+    20240712,
+    1038
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b8f4a65bd53b97b56b93fff2fb14f71b2831aa6f",
-   "sha256": "10vfbl9dry03dw264w7b4grmzcv78x3p7r86bsyhyl74hwwvx1hp"
+   "commit": "e1854917d84051393b64de54883f2df7b9cec797",
+   "sha256": "121y3hb2v17shv5r0y4vqsbw1avc19rv9bk99l3ls7apx6xma8ji"
   },
   "stable": {
    "version": [
@@ -15072,11 +15282,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20240429,
-    949
+    20240621,
+    1005
    ],
-   "commit": "5f3b2039eda57e9e4501f8decab5808d9edf98eb",
-   "sha256": "11vpha0nmcxh7b1cp27778sacjzccp87b6db3mnsir5mbnxyhfx4"
+   "commit": "ddf2920a8866040e57359d2e1c5517fffcad2e38",
+   "sha256": "0qnn3dxzi40skrmi6a2w68c1dcn89zbdxnm18nw7axa7c0q0wcqs"
   },
   "stable": {
    "version": [
@@ -15414,20 +15624,19 @@
   "repo": "pzel/commentary-theme",
   "unstable": {
    "version": [
-    20210714,
-    1757
+    20240620,
+    1307
    ],
-   "commit": "a73e1256f667065933e96bd6032c463cb115201d",
-   "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98"
+   "commit": "31e3724631d20fe5854cf522443a31fc12245ce3",
+   "sha256": "09sm5da945qfxmjcyvjwhgbrgns5kqqxb0i8qh2d7b08qj1wr5p2"
   },
   "stable": {
    "version": [
     0,
-    4,
-    1
+    5
    ],
-   "commit": "a73e1256f667065933e96bd6032c463cb115201d",
-   "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98"
+   "commit": "31e3724631d20fe5854cf522443a31fc12245ce3",
+   "sha256": "09sm5da945qfxmjcyvjwhgbrgns5kqqxb0i8qh2d7b08qj1wr5p2"
   }
  },
  {
@@ -15516,11 +15725,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20240428,
-    2258
+    20240713,
+    303
    ],
-   "commit": "32f030a4c79bbf082cc21ec21b2cf8ba9dfa22cc",
-   "sha256": "19y5s4jxz62ak9q3cq66d1gijpbv9bkxazm4qyglsk9ayjz03q43"
+   "commit": "31f7ad52e4d353a8b2f0ec7e2c3135c012e500e2",
+   "sha256": "1xj4nghrdns30s8672566gpcbqz22wz6wkchq6g370s76ngmrqhs"
   },
   "stable": {
    "version": [
@@ -16102,16 +16311,16 @@
   "repo": "jcs-elpa/company-fuzzy",
   "unstable": {
    "version": [
-    20240519,
-    904
+    20240616,
+    549
    ],
    "deps": [
     "company",
     "ht",
     "s"
    ],
-   "commit": "ae4dbb00d91fae8f13e236093d99c7e4d0d8fa73",
-   "sha256": "1akl4d83lydq1sjp56kfwwv4zya0awpvm8ifw7sj4f1fmvkz8awr"
+   "commit": "204f7d63a5388637a3767c0232173c477ce96df3",
+   "sha256": "1kxij0npbhfr9ngn0dyhlp77ida76nvlxs0a45ycmmj44y5a37ah"
   },
   "stable": {
    "version": [
@@ -17551,8 +17760,8 @@
   "repo": "mkcms/compiler-explorer.el",
   "unstable": {
    "version": [
-    20240517,
-    1816
+    20240617,
+    2114
    ],
    "deps": [
     "eldoc",
@@ -17560,21 +17769,23 @@
     "plz",
     "seq"
    ],
-   "commit": "ca01cbfa5941750f3cf2232f00e28032ef7f9bce",
-   "sha256": "05yzp9gch1hw10xgk742zdgky0vbbqhyn6fzxj2n6ilwaslcnprh"
+   "commit": "be99c0f00d4814c3602ea55ca116f5dcda6645a6",
+   "sha256": "1hdsa6jm75sga62xsw4054dnr1l8wqbb86bxqmq4zwlqnhi7rdp7"
   },
   "stable": {
    "version": [
     0,
-    4,
+    5,
     0
    ],
    "deps": [
     "eldoc",
-    "request"
+    "map",
+    "plz",
+    "seq"
    ],
-   "commit": "4980ed8f91a94b7a1cace9d199f1a0b35bed3a07",
-   "sha256": "1d181wm69r00j3wrvcb7i44v9c85ahk7b3hcqb91wlky25lsbjrz"
+   "commit": "f7b440125264efc043b9d61186e4ac662cb8b67c",
+   "sha256": "0yih4rl037f14v1cq13g49fx1dy6yl6v7ps13lrklv0pjjf7gc9c"
   }
  },
  {
@@ -17609,15 +17820,15 @@
   "repo": "emacs-php/composer.el",
   "unstable": {
    "version": [
-    20221120,
-    202
+    20240618,
+    1112
    ],
    "deps": [
     "php-runtime",
     "seq"
    ],
-   "commit": "2299cd731205906350d615021f99a66d7a8905c2",
-   "sha256": "1s1wmvav83djcg6jgf5cjvwjm045y5fbwf0sqwgkfk8m4ka4473a"
+   "commit": "42cf9848d438f8dc4c07ac684a83280ace7bb94c",
+   "sha256": "0a7hwikxzw1y6i4ny9bxj4lnyaz2p25sx5w97rhnkagr0859jflg"
   },
   "stable": {
    "version": [
@@ -17710,8 +17921,8 @@
   "repo": "necaris/conda.el",
   "unstable": {
    "version": [
-    20231109,
-    219
+    20240708,
+    2135
    ],
    "deps": [
     "dash",
@@ -17719,8 +17930,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "60e14d1e9793431b91913a5688e278bd91d56224",
-   "sha256": "1irrcdm3ckbafsjr442i9iljsfjqsg5mj79hzwps2k1j7b911gy1"
+   "commit": "ce748a53f9c7d7a7d112632d32c848d6e5482e18",
+   "sha256": "0l63dbkv91ashpjvnns4z5fzhmacal1pslycnmj05gar4sj4339v"
   },
   "stable": {
    "version": [
@@ -17859,11 +18070,11 @@
   "repo": "tralph3/conner",
   "unstable": {
    "version": [
-    20240512,
-    1717
+    20240707,
+    2220
    ],
-   "commit": "d8dabaab32e39b01500841b7465076c6ad73c3b9",
-   "sha256": "1iw787gp2r7ab3xc8s6brsdc7a8cg5g2vsjlb1qhir6zmyz5y5dz"
+   "commit": "583d8288b07f4372b68e1c06917eb77c419c555d",
+   "sha256": "1ix3lrgdhc425kninmq9nly7472nzx9m925c3bpd8bf49pnd7ypk"
   },
   "stable": {
    "version": [
@@ -17897,25 +18108,25 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20240516,
-    2240
+    20240710,
+    2028
    ],
    "deps": [
     "compat"
    ],
-   "commit": "80407622f323669c735737272ecbc3b602434b77",
-   "sha256": "0rrxyds14a3c1f96q3hx92hm4axl66cgghrvc3j745s257macx0y"
+   "commit": "3d7f3d2de22eacb125f56ae5b5af6411bbe00b46",
+   "sha256": "1j6biflxz03ywqnvwiwhpk2x3gscb26q72sxcm8s8p4zkx5wrcwq"
   },
   "stable": {
    "version": [
     1,
-    6
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6eba1a3fa8e13681091a30b2490a03bdce5f243a",
-   "sha256": "1c6skqx5aqkb0mfnm5zw4mvzcrcr34zcd5jz3ypgb5483nv9kp3c"
+   "commit": "fe4852280006e61be7f1374d021ee06155ce5a26",
+   "sha256": "1xvxqv21b0d1c129dc72iajrbyyfibcv8gmv643h388p5wb69msv"
   }
  },
  {
@@ -18004,15 +18215,15 @@
   "repo": "mohkale/compile-multi",
   "unstable": {
    "version": [
-    20230904,
-    1806
+    20240507,
+    1949
    ],
    "deps": [
     "compile-multi",
     "consult"
    ],
-   "commit": "30edb0e86287101269debf20f43cead92310029a",
-   "sha256": "0ppm9zw65f1a7b6qb5hx60i6fxkqarrhlz2kn6p2b48s089dykyp"
+   "commit": "a8782ac55115b1afe0bee52664b46bfbd9bf202e",
+   "sha256": "1rr74klnariax66n7r5sbkqjszqslxg8l58rxmb1b3yv5mzic10y"
   },
   "stable": {
    "version": [
@@ -18266,14 +18477,14 @@
   "repo": "rcj/consult-ls-git",
   "unstable": {
    "version": [
-    20230924,
-    810
+    20240529,
+    641
    ],
    "deps": [
     "consult"
    ],
-   "commit": "3ccd9d80da73a05ef2a74616ffdc469860f74c21",
-   "sha256": "1gxh0zwfkm50493bbnvjlsx38i3sxmrajqm1gf65icp55s0slrp0"
+   "commit": "b1ca94f7c43cbd3811d09a0c9ab04f67f6318e95",
+   "sha256": "1r8d42r4dszg7jdabgs60inn6hkd293fddps1sjrs8y4ygkxcp61"
   }
  },
  {
@@ -18317,16 +18528,16 @@
   "repo": "mclear-tools/consult-notes",
   "unstable": {
    "version": [
-    20240516,
-    1423
+    20240624,
+    1219
    ],
    "deps": [
     "consult",
     "dash",
     "s"
    ],
-   "commit": "c97420c8e91aaae214be7de897eb7eb9b7843520",
-   "sha256": "0nf06al179p3g7n0zvcxkwhq1ygakg4n554a1w8f6k00m1syslsh"
+   "commit": "9858bb13b54934ea0a95df45947ff40ffde4553b",
+   "sha256": "0kv5hdc3cl7vkr06llyd6dcbddd55rmhhsfr8hzjpmvgw0h317kg"
   }
  },
  {
@@ -18567,20 +18778,20 @@
   "repo": "licht1stein/context-transient.el",
   "unstable": {
    "version": [
-    20240507,
-    1534
+    20240530,
+    1344
    ],
-   "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107",
-   "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr"
+   "commit": "4461c3a5b8654cb1dacea404f78951172437804f",
+   "sha256": "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
-   "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107",
-   "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr"
+   "commit": "4461c3a5b8654cb1dacea404f78951172437804f",
+   "sha256": "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l"
   }
  },
  {
@@ -18867,25 +19078,25 @@
   "repo": "minad/corfu",
   "unstable": {
    "version": [
-    20240413,
-    927
+    20240713,
+    1327
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b779552341354d59365a981fd208ae07b7a2950a",
-   "sha256": "0yhdp1bf96m0llfc8v19swnrd4zl2dn5gxyppvjyidjvic3n0djv"
+   "commit": "f74d3e7b5aa658663705035aaac2c321bb8ed5cc",
+   "sha256": "1xm04c98kj5qnnjb2kn4ckhsykbvzsgyzp44xh4kma1q76g1glxj"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6088f0550dc8f10f5bcf6f24d35ce24159b01b43",
-   "sha256": "1nrwh00dy2ffzd3np8yk4n0vn0r5iqqhgcr40wbnv5qzgbdw9kas"
+   "commit": "cdc3e13ad312f5f12b3f78f842fff0b398eb4473",
+   "sha256": "04vsy5dv3zlid914igyi6ya9hf08ph0hc4c09pbja0z1if4mjrqh"
   }
  },
  {
@@ -19076,14 +19287,14 @@
   "repo": "ideasman42/emacs-counsel-at-point",
   "unstable": {
    "version": [
-    20240422,
-    116
+    20240616,
+    2345
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "5aa7a483c5188d71c04c3302cfd900e7be91ffd6",
-   "sha256": "147v6nz5vhai38wxmfzsziwn50110viq575j33k0cm2iimv4gkpb"
+   "commit": "7da3813fe01e5a7a651632b1af031891c009b559",
+   "sha256": "15mq1lkjf72fb7g2di8gwvqk6iads2znhzbpx2khchia1vl30qba"
   }
  },
  {
@@ -19919,14 +20130,14 @@
   "repo": "emacsfodder/emacs-theme-creamsody",
   "unstable": {
    "version": [
-    20240109,
-    557
+    20240619,
+    731
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "5f4fce9de6920cd2788bf6baf3a3da110f09bffd",
-   "sha256": "0qk76dk3g5whnx49qwahh32di7x9adw6d7gj4rr03d10zlvwsssb"
+   "commit": "10acf5c5d3e1108fc1e7a4ab487aa2ac79720f42",
+   "sha256": "0s07lvzrr12faxf5wpyg9s44g2v8w6vm4f59mam4xl6v8nq6pfdh"
   },
   "stable": {
    "version": [
@@ -21076,11 +21287,11 @@
   "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
   "unstable": {
    "version": [
-    20240218,
-    1753
+    20240529,
+    611
    ],
-   "commit": "dc583981dd2d4097ce1c9a80a958a7a1bf225ad4",
-   "sha256": "1vrv2iwglrv6xnpcrdgy9wwsixz2bcimn3ylh10gyv3rajym69fk"
+   "commit": "cbdabb9ca566cc12403f37f46d4102fe778e2721",
+   "sha256": "1rzmmc40cyg5z5jd8bns7fxb0pkiiiki4cg03wjq415mx7lli5n8"
   },
   "stable": {
    "version": [
@@ -21100,11 +21311,11 @@
   "repo": "andorsk/d2-mode",
   "unstable": {
    "version": [
-    20230210,
-    1130
+    20240707,
+    1850
    ],
-   "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89",
-   "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v"
+   "commit": "69374e0249df20139f3f2d475de9eae2b201d019",
+   "sha256": "0hr2q2d3qfrbd7vpxbcamawvdzvak30rdsbrkxcqz9d36grhsj97"
   },
   "stable": {
    "version": [
@@ -21334,8 +21545,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20240514,
-    1617
+    20240611,
+    1356
    ],
    "deps": [
     "bui",
@@ -21348,8 +21559,8 @@
     "posframe",
     "s"
    ],
-   "commit": "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583",
-   "sha256": "1m77dwy1p7jy41v7gjqk9w7jy6sh3blg2qrlw22f3y1d6n0h3lvs"
+   "commit": "b407773ebca56e3bd8e6a4643854e91cbde0c35e",
+   "sha256": "1a1iwx299xcm5ldd2sh7sjhmpb6wndyrwx7q0q6nih6j8ly0nppr"
   },
   "stable": {
    "version": [
@@ -21709,11 +21920,11 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20240407,
-    12
+    20240529,
+    2058
    ],
-   "commit": "89b42bff4d60fb00ef3d679e2d2289541e5009f6",
-   "sha256": "1cl9p8a9dxjbl8kn7fqkx1abr90frk4g7n09lqriyf8hn5bizy5c"
+   "commit": "3852301f9c6f3104d9cc98389612b5ef3452a7de",
+   "sha256": "198xf1ydmgz795a7ffk9s5q4jszy6nrg1d54g1bacipwnq0c654v"
   },
   "stable": {
    "version": [
@@ -22104,29 +22315,29 @@
   "repo": "Wilfred/deadgrep",
   "unstable": {
    "version": [
-    20240408,
-    1537
+    20240627,
+    1535
    ],
    "deps": [
     "dash",
     "s",
     "spinner"
    ],
-   "commit": "eafc642c551e6d5df7eb1fee9aa7596e59811178",
-   "sha256": "029szbwssvdxrsrzv0ppgik30hl9apr0dp5hcp666zgpm415frc4"
+   "commit": "609a9c3bf52f44998dd0ec7275374d059a3fdc15",
+   "sha256": "0j8ggh70xvf72bf0d86kxqn19vpdylj7rchyf8asd0b9gq6l2ah6"
   },
   "stable": {
    "version": [
     0,
-    12
+    13
    ],
    "deps": [
     "dash",
     "s",
     "spinner"
    ],
-   "commit": "d32fe49079c1e9e0af95387120fa4990d4107778",
-   "sha256": "0bwf8gsqw7hsmacqd34piwgv066ijfclmxaigkvhvpac0lpsmi79"
+   "commit": "ad7ddfbce9d1b665281c2ec6ea48644602925d30",
+   "sha256": "1ry9qvvxwhh3gkb0kkwiwpx37jpdzgky1h2zkwpzjpkv5jm022dr"
   }
  },
  {
@@ -22137,11 +22348,11 @@
   "url": "https://salsa.debian.org/emacsen-team/debian-el.git",
   "unstable": {
    "version": [
-    20240519,
-    1104
+    20240704,
+    2138
    ],
-   "commit": "a76a38cf0af5625b38e1d298bbfa3ae5a2a1ebc9",
-   "sha256": "0k3r9a9qsi380m4j53j4irfv591irg9w2i0pqk1c8fv3rwxrdiq5"
+   "commit": "8e41a9b4957b9d56ec6c55ee5d4ce84038d01dd6",
+   "sha256": "1k8w5h0n8imf7w2mnic68rkhb3mhp38nngwzssvmvfilnfb4bmiv"
   },
   "stable": {
    "version": [
@@ -22367,10 +22578,10 @@
  },
  {
   "ename": "defcapture",
-  "commit": "96bb0339b35e5a7128889637bbd811eb5df1aa7d",
-  "sha256": "0gmvrpq8fyq6g85fl5078v9yyg5pjydnfl14aapgcsdd2iml97f6",
+  "commit": "1d636bef32d060df0e0da9dff699436bf949ed3b",
+  "sha256": "1hkbmhirlb1pbpavr61nxzw58a9pjvh0f93abbdf3sqs1lhybbbk",
   "fetcher": "github",
-  "repo": "aggu4/defcapture",
+  "repo": "sawyerkirbi/defcapture",
   "unstable": {
    "version": [
     20230909,
@@ -22529,11 +22740,11 @@
   "repo": "jrblevin/deft",
   "unstable": {
    "version": [
-    20240407,
-    149
+    20240524,
+    1524
    ],
-   "commit": "7f352747a2c4dfe40ba060ab42f47ae8a9ddab41",
-   "sha256": "048kzgqxild8ywclp659wyvpjiqi16kpbc91zh1r459gzmawcll3"
+   "commit": "b369d7225d86551882568788a23c5497b232509c",
+   "sha256": "0zqkapm01czz6syvh125f2fird2mbxmrcgbksz4qycdc89hlrl1k"
   },
   "stable": {
    "version": [
@@ -22675,6 +22886,27 @@
    "sha256": "0dazxjk3p53y8xpzd62557i9qz0r0hy1xcv7h2vc1mg2jdxlf2xm"
   }
  },
+ {
+  "ename": "denote-citar-sections",
+  "commit": "9ba5d6796e1c2564f2fb49b6a020ab4f7aa90968",
+  "sha256": "00dskskj3gyqcm75akhply0c77z97g3yzx2fr6kvd0mmyc39qi7b",
+  "fetcher": "sourcehut",
+  "repo": "swflint/denote-sections",
+  "unstable": {
+   "version": [
+    20240608,
+    1629
+   ],
+   "deps": [
+    "citar",
+    "citar-denote",
+    "denote",
+    "universal-sidecar"
+   ],
+   "commit": "00c7084652fa32f9f4ab504facaaed623f299684",
+   "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj"
+  }
+ },
  {
   "ename": "denote-explore",
   "commit": "f304db78b4bfeb4e1061b4ef221bf46e1bafe9d0",
@@ -22683,15 +22915,34 @@
   "repo": "pprevos/denote-explore",
   "unstable": {
    "version": [
-    20240512,
-    113
+    20240616,
+    359
    ],
    "deps": [
     "dash",
     "denote"
    ],
-   "commit": "7073ef97758fbcf953557efa15da9226283ff6b0",
-   "sha256": "151ba0mhq61y2iwic5645rh4agklp1rg3618xcc7r76b4078fybs"
+   "commit": "242c4d79ee13e9aca4566b552d29c74026b1ff6d",
+   "sha256": "1lgk351d33h0inp9i0vmaz12i57f1l73yswlipd59mpjvdzg04fa"
+  }
+ },
+ {
+  "ename": "denote-sections",
+  "commit": "95afd698f7adbd47adb3ce1a8918cd75b87c1a5a",
+  "sha256": "1151f40j23yn1rllnnk10nr1vs3plm9087cx8320c7h7ccpmms0z",
+  "fetcher": "sourcehut",
+  "repo": "swflint/denote-sections",
+  "unstable": {
+   "version": [
+    20240608,
+    1629
+   ],
+   "deps": [
+    "denote",
+    "universal-sidecar"
+   ],
+   "commit": "00c7084652fa32f9f4ab504facaaed623f299684",
+   "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj"
   }
  },
  {
@@ -23152,11 +23403,11 @@
   "repo": "ideasman42/emacs-diff-ansi",
   "unstable": {
    "version": [
-    20240421,
-    810
+    20240616,
+    2345
    ],
-   "commit": "9e5b61a82e04ffd0e81f88fcf159575618886d72",
-   "sha256": "1jwgw5ypl9iw6hy1yk4y34l8n5mxaw3zhk4bly7wxpyq4di0n9ik"
+   "commit": "0338970469375eadd3c0e492997aec2fcb06bb27",
+   "sha256": "1mjazx6zcskijijdrgm0iqdi2kii01q2j1b6ifwdzg8c9pr7swmq"
   }
  },
  {
@@ -23182,14 +23433,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20240505,
-    2110
+    20240702,
+    2020
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "11f3113e790526d5ee00f61f8e7cd0d01e323b2e",
-   "sha256": "1a6hqb0258kdskixcwacq41d7x71rlpwwapmbpd9ds8w6dj5vi40"
+   "commit": "a942b2383db0dc16df389611b84031c29d5c17ed",
+   "sha256": "1i4wgf0mb7c0w2i1zkapds6gbs2njr7ddpfh9g2a7yfjlpb9hyln"
   },
   "stable": {
    "version": [
@@ -23212,11 +23463,11 @@
   "repo": "ber-ro/diffed",
   "unstable": {
    "version": [
-    20230208,
-    1546
+    20240618,
+    2037
    ],
-   "commit": "f7dc37f13a4f1660212c41a6e9faba61eb8cc078",
-   "sha256": "0g1xjwby2sljmkf4nl0das45464162hwlsrjhbwzf4bp4i1c8gi9"
+   "commit": "93251169a4fc8c07fdd5f3d32c89b4d3401d37a1",
+   "sha256": "1am6a4b7yvdr4v54zmanirqbqvsk3bzf4ghf1rpdab5jk3rdzzg9"
   }
  },
  {
@@ -23305,15 +23556,15 @@
   "repo": "pkryger/difftastic.el",
   "unstable": {
    "version": [
-    20240429,
-    2057
+    20240528,
+    1657
    ],
    "deps": [
     "compat",
     "magit"
    ],
-   "commit": "90b9b223bfc39786f6fcf266cdc1cb982bdc37aa",
-   "sha256": "1z7q6rr3cnp6fpx0439hbk22g1kl84xa6k3pbxm4mph2cqw536jm"
+   "commit": "79753bfec7c32f44dc0d5ed57a8bc6b370392a87",
+   "sha256": "02rl4zrh871cck7gr0b7jgw2xzlx50lgldbdcx2vdmd3ljkq383h"
   }
  },
  {
@@ -23347,20 +23598,20 @@
   "repo": "retroj/digistar-mode",
   "unstable": {
    "version": [
-    20240515,
-    1529
+    20240613,
+    225
    ],
-   "commit": "546adaccb1f90d6947c2c80c2fab4933f40bc274",
-   "sha256": "16a4x0zxrhs2c4k7v3qhinbxayx213mb8b84jrs21sq7whfad63d"
+   "commit": "1a02a4773d1380d8cab44f5e342a1e9bcc7276e8",
+   "sha256": "0x0927zfhxx25xplyifnq4qg76ahifk9m51dqqqyahnf9rpljrhl"
   },
   "stable": {
    "version": [
     0,
     9,
-    13
+    14
    ],
-   "commit": "a0f0756b132202fadf487d689d3c4312f480d2a7",
-   "sha256": "0i055f0kvm4ymq9a7ad4zg2kzw4gf60db0kcg5q8gmlsri7ppsl2"
+   "commit": "4e5d0b463468fcc4a54df1310360ba13b2bdff6a",
+   "sha256": "10ng3dxckgzanxl4p4yn6syabhkzpiq49c9czdbfqhmabr5ayb3m"
   }
  },
  {
@@ -23480,26 +23731,26 @@
   "repo": "tarsius/dim-autoload",
   "unstable": {
    "version": [
-    20240415,
-    1534
+    20240712,
+    2215
    ],
    "deps": [
     "compat"
    ],
-   "commit": "54bd356cdac7bdae2bdff994b048f847374cec6c",
-   "sha256": "0hjs9nxw6hy7kvaw389n1k1rwqq22pvc3q5cbndnybpkbfpmrhjq"
+   "commit": "9d08ecf4f8b00e53093864a59b51f58e4fb6ae4b",
+   "sha256": "18mp2ls5fs1kjg6wd11gkyqn9x83hkzqzq1djjssbh65z5ln6qd9"
   },
   "stable": {
    "version": [
     2,
     0,
-    5
+    6
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9e7b4d47f2dc972ec16baa6bd56b016000790ff4",
-   "sha256": "1f7syxknpqxvrng1sa9a7ypwg7c4r5gsc3c88rm1p5mrak2xpcg9"
+   "commit": "bb57bf5367b48862864f0dea4287fa81d51a0d5e",
+   "sha256": "0li7s5ny3w75k1r11bsh5psc9d0a3r9ap909brcldrpnp567wvq6"
   }
  },
  {
@@ -23563,11 +23814,11 @@
   "repo": "jcs-elpa/diminish-buffer",
   "unstable": {
    "version": [
-    20240327,
-    210
+    20240612,
+    52
    ],
-   "commit": "c577a8ed289d1a2cf56845fb6b8c7b9c638d4bc8",
-   "sha256": "11858nlkvpwyzkn7za8c45amv185pklg3x9z0s4a25zkxjrswi7m"
+   "commit": "ba65fec96983ae471edbeee2b38c2107bee94f31",
+   "sha256": "0blnbr4prdm1bg9qvyh8h2bkzzqnzbijrqzsz1327b1agqjh6j7c"
   },
   "stable": {
    "version": [
@@ -23759,15 +24010,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1857
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -23778,16 +24029,16 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20240328,
-    1154
+    20240629,
+    1857
    ],
    "deps": [
-    "dash",
     "dired-hacks-utils",
-    "f"
+    "f",
+    "s"
    ],
-   "commit": "e596b0bac3de8e7730dfb43ca10b0331b6f94469",
-   "sha256": "0sny6wqvckwp7h9dwsdvn55irnw94axqfa7jcbbwyxqs9ird8pg2"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -23920,8 +24171,8 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20221127,
-    1247
+    20240629,
+    1857
    ],
    "deps": [
     "cl-lib",
@@ -23929,8 +24180,8 @@
     "dired-hacks-utils",
     "f"
    ],
-   "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1",
-   "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -23986,14 +24237,14 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1906
    ],
    "deps": [
     "dash"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "63b04d17936c98cb4ad7ce6bc3331cda8e30c55a",
+   "sha256": "187qgpfnfyw6qbif0hqw987inz6kbxmb2nx6431f9rjzzyz9q75r"
   }
  },
  {
@@ -24178,15 +24429,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1953
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "e9e408e8571aee5574ca0a431ef15cac5a3585d4",
+   "sha256": "0lq73f49qd4ld55f3842vdhy8j6yxz2j37qhzy608pcnbraq0408"
   }
  },
  {
@@ -24197,15 +24448,38 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20240330,
-    1831
+    20240629,
+    1857
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "a01c126c3b1068655509487c76971895f5459d09",
-   "sha256": "128wy7i7qrs7yzw82hzsr7lxiifdgbvmxb1w18kspd82ijlj4j5q"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
+  }
+ },
+ {
+  "ename": "dired-open-with",
+  "commit": "e4a6a8f4ccf395c3dc2e9b5638d90550a8497891",
+  "sha256": "060x16662pscafvl8lnfrhj03v4lpyiz2z8dlnghmr2zcj7d5ymw",
+  "fetcher": "github",
+  "repo": "FrostyX/dired-open-with",
+  "unstable": {
+   "version": [
+    20240614,
+    2213
+   ],
+   "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81",
+   "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81",
+   "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc"
   }
  },
  {
@@ -24275,15 +24549,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20221127,
-    1247
+    20240629,
+    1857
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1",
-   "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -24294,14 +24568,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1857
    ],
    "deps": [
-    "dash"
+    "dash",
+    "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -24427,14 +24702,14 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20240320,
-    1952
+    20240522,
+    2316
    ],
    "deps": [
     "dired-subtree"
    ],
-   "commit": "573658021fd6e6cf032d789de29aca4e5dd258fd",
-   "sha256": "0icy2mzkbcrf7dq0zlakq56h89jw0rdlgfn0z6zz0hlyq2d2zhz6"
+   "commit": "702165ad53a473992d84e0207b984b9be5114bde",
+   "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp"
   },
   "stable": {
    "version": [
@@ -24481,15 +24756,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1859
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "b769c7de9c8c5dc70e4dcdbb3267c70fae3cb9b7",
+   "sha256": "05akgf4aqf687cvf5nw35v46c95f7nycdmxb4y6qmj2r39y5rmvz"
   }
  },
  {
@@ -24805,11 +25080,11 @@
   "repo": "purcell/disable-mouse",
   "unstable": {
    "version": [
-    20210512,
-    2114
+    20240604,
+    900
    ],
-   "commit": "cae3be9dd012727b40ad3b511731191f79cebe42",
-   "sha256": "0zx3ihhxhjvhsi08khyx8fdhw2kg065zhhicqc587jsabk0wzj6f"
+   "commit": "93a55a6453f34049375f97d3cf817b4e6db46f25",
+   "sha256": "0acqinbhb4vjyq4fhw2abslgkn6qwnvqbgzk6wbglff2m256vrdi"
   },
   "stable": {
    "version": [
@@ -25466,11 +25741,11 @@
   "repo": "ideasman42/emacs-doc-show-inline",
   "unstable": {
    "version": [
-    20240421,
-    943
+    20240616,
+    2345
    ],
-   "commit": "d2bfa37f2f027c5da0abca319882daa3740ca57b",
-   "sha256": "0j70sg2gnf2qi367pskwbm24qvy8bl2qims04rjaw7knd9yiyh43"
+   "commit": "cc363ed39f023642c4d8e7c91b26c802ca356fa3",
+   "sha256": "02kh8wk202qppac7l7ap8hknb1hbg06gi66w5cpxhp32lijh1m90"
   }
  },
  {
@@ -25919,16 +26194,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20240510,
-    144
+    20240625,
+    230
    ],
    "deps": [
     "compat",
     "nerd-icons",
     "shrink-path"
    ],
-   "commit": "65d0bd83eb7c393092e032c24b882f3ba19b4899",
-   "sha256": "1w657ss91f00kb3gghi9rs0a8cw2bszvik4yjzn6cj7m8ji3k3qi"
+   "commit": "1505c13564b83e44d3187611e326a48b742cad3a",
+   "sha256": "1scq3ahqg6s7ccvd0gs0m2ifa8k9rzflaslz3lmp0i7kmv1prs49"
   },
   "stable": {
    "version": [
@@ -25953,15 +26228,15 @@
   "repo": "elken/doom-modeline-now-playing",
   "unstable": {
    "version": [
-    20210831,
-    1442
+    20240522,
+    1704
    ],
    "deps": [
     "async",
     "doom-modeline"
    ],
-   "commit": "ef9158dfdf32e8eb789b69e7394d0bddaa68f42c",
-   "sha256": "1namv6qfmf5xxwbhsl5887cp41y8krr7g9vf3dzvi5n924ixlm2l"
+   "commit": "1532f324f98a234aa14e12ebdfd17cebba978d6a",
+   "sha256": "0mk759hznnpwvwzqykncgij60773z87x976ql5ccarz4j79j44sv"
   }
  },
  {
@@ -25972,14 +26247,14 @@
   "repo": "doomemacs/themes",
   "unstable": {
    "version": [
-    20240404,
-    2042
+    20240712,
+    1822
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3b2422b208d28e8734b300cd3cc6a7f4af5eba55",
-   "sha256": "1ksv964vlzszbd2372kl80l60mmmiqxgyxypysrylrw831kkxfi9"
+   "commit": "2c794a09b023bda09d2f36a7be80684f4e416d88",
+   "sha256": "16mhcbnk8cv0lacl9wycbj1d1i2brrb3vf6lb4hxyici5qlfyykh"
   },
   "stable": {
    "version": [
@@ -26199,11 +26474,14 @@
   "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git",
   "unstable": {
    "version": [
-    20240421,
-    628
+    20240626,
+    1953
    ],
-   "commit": "acfc3bd42271286d22d7cbadd48a5b9d5675f85c",
-   "sha256": "1mhh6kmlkbzaliyx8fwdnbmkhaaing4jkjc9ai76l5nyisjimqrc"
+   "deps": [
+    "debian-el"
+   ],
+   "commit": "dbebf6fc2c50facff195ae9fb14bf691ad0f4544",
+   "sha256": "0pj2sjj0dnv12m982icaqf93bnklaab4wg96bbyzhiji981yjs2x"
   },
   "stable": {
    "version": [
@@ -26249,11 +26527,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20231013,
-    821
+    20240614,
+    1303
    ],
-   "commit": "29d5180f7e34c0c858a520068fb650f705b8cfc2",
-   "sha256": "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38"
+   "commit": "1dd3702bcca1191b082783062bde42668515c700",
+   "sha256": "0sxanisx51vcplnhgz7yn3xslslky4xp4ydjkrgwq045ppmq3rr7"
   },
   "stable": {
    "version": [
@@ -26453,6 +26731,30 @@
    "sha256": "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd"
   }
  },
+ {
+  "ename": "dslide",
+  "commit": "9e8c6aadf7a38beb2e18306067c5870195dc6b7c",
+  "sha256": "1hzz7bbn7d2qixa76jyw88z3bd42dm1p54lnjnzcnw3v7pikpwvq",
+  "fetcher": "github",
+  "repo": "positron-solutions/dslide",
+  "unstable": {
+   "version": [
+    20240703,
+    1523
+   ],
+   "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d",
+   "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n"
+  },
+  "stable": {
+   "version": [
+    0,
+    5,
+    3
+   ],
+   "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d",
+   "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n"
+  }
+ },
  {
   "ename": "dsvn",
   "commit": "be27e728327016b819535ef8cae10020e5a07c2e",
@@ -26542,19 +26844,19 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20240211,
-    1111
+    20240623,
+    2118
    ],
-   "commit": "5d1b44f9a1a484ca229cc14f8062609a10ef4891",
-   "sha256": "1k8d4a7hq21ahiad0mlpyi637r0b2mzjpxhz09c69h1nk38nkzjn"
+   "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c",
+   "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r"
   },
   "stable": {
    "version": [
     1,
-    17
+    18
    ],
-   "commit": "e45fa760eecf74edfa9e8419f9f9773d8a7abadd",
-   "sha256": "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la"
+   "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c",
+   "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r"
   }
  },
  {
@@ -26624,16 +26926,16 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20240514,
-    702
+    20240625,
+    224
    ],
    "deps": [
     "dash",
     "popup",
     "s"
    ],
-   "commit": "3c2ab8dfff3a10d3c5f2efd69cfbc81fb5dbbd39",
-   "sha256": "0q37akv7xnwq14a7zn7cjr3njkkkl7vfrkkr0di8bw9p6dyvwqw4"
+   "commit": "cd65a743370ac7b1a12e9ef0a7371b285a2597fb",
+   "sha256": "1ly7xsfliyw38hqh862p6m37mxl460k4zq1fy3xs0jz9q3ak84iq"
   },
   "stable": {
    "version": [
@@ -26682,11 +26984,11 @@
   "stable": {
    "version": [
     3,
-    15,
-    2
+    16,
+    0
    ],
-   "commit": "c28817c416ac0b381f6a6938236419ab5d86d6e1",
-   "sha256": "0rgrfpw588mgw78p87xlrlidc9xhkppf6b7dqa3vqlhjxs5q6kqg"
+   "commit": "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed",
+   "sha256": "0sxz15g1lhgm880glix2y0dinsidpv83ss7cvb2ff12rbjhk4a4w"
   }
  },
  {
@@ -26804,11 +27106,11 @@
   "repo": "sadiq/dwim-coder-mode",
   "unstable": {
    "version": [
-    20230830,
-    1215
+    20240712,
+    1047
    ],
-   "commit": "94a752fca078144dd309343880abafbc4eacca5f",
-   "sha256": "010z2bcscizd75shmbgrjfvlkzsfjcvqcif7pm5a5iynmjx5n4n7"
+   "commit": "02f5fa0c3ae5cc17ca860c792d988705f41b0eee",
+   "sha256": "0p1yz2lnzifqsjqcbk2jk9darj72icnydaxwhs2h0hmvl786g4gi"
   }
  },
  {
@@ -26819,11 +27121,11 @@
   "repo": "xenodium/dwim-shell-command",
   "unstable": {
    "version": [
-    20240520,
-    1732
+    20240712,
+    859
    ],
-   "commit": "c20a474ba8fc0ad73a1b30aeb99502cbfc709c0b",
-   "sha256": "0lj8rkvpns4fpdmwriax0i5yijqraji1vjbdc6scyvpmdmsqd3p1"
+   "commit": "715f0ae8cfe455f1dc611074bb8bb90e03533dab",
+   "sha256": "0gjz3sliwdxgsvd2c1chmqfzwzk1bbflb7qn8gc3ims1fwjhz0jc"
   }
  },
  {
@@ -26964,11 +27266,11 @@
   "repo": "countvajhula/dynaring",
   "unstable": {
    "version": [
-    20230619,
-    1854
+    20240615,
+    129
    ],
-   "commit": "909a64aa96f09b05fe59d5703f7e0ad22d161bb5",
-   "sha256": "18vf0646wqnahnc7rj0wzq9shd1g69hr5j35psgcdzkrczma16m7"
+   "commit": "90daf413abee1723c37697e72bb700a06727ff4b",
+   "sha256": "12634kmx7fdb3lndyjgf7hisdzcqg3hn90xqr56gjdj0m5yzq310"
   },
   "stable": {
    "version": [
@@ -27287,20 +27589,20 @@
   "repo": "emacs-eask/eask",
   "unstable": {
    "version": [
-    20240420,
-    44
+    20240614,
+    541
    ],
-   "commit": "ecee5a60b9e13796400e9dec84ce55f89767b6fa",
-   "sha256": "09g53ijbxlk48i1s7fj7iyhh4j230xpv673lia19k3364pzy361g"
+   "commit": "8015c62602188c008988fc6825ff97b04c614c8f",
+   "sha256": "1qz7jql5g2n643hws5ybaj78zdrqm6pnnbi0bvgzchfbc5nc1h2b"
   },
   "stable": {
    "version": [
     0,
-    9,
-    5
+    10,
+    0
    ],
-   "commit": "a0361201d5d0c4552b3075cec8ffaf11a867054d",
-   "sha256": "1irwqampchd2n70pnlhamnjnlaaj4qiqhwnmvhjgk5bi51bp8kb9"
+   "commit": "94a45a3422a04819a5090d8acaec4fc563c6dfa9",
+   "sha256": "0wm2bhadsgs429f67bgvxxfdxkhf4z3v3mypdxbyrhlkzwqdmiag"
   }
  },
  {
@@ -27338,8 +27640,8 @@
   "repo": "emacs-eask/easky",
   "unstable": {
    "version": [
-    20240420,
-    113
+    20240608,
+    744
    ],
    "deps": [
     "ansi",
@@ -27348,8 +27650,8 @@
     "lv",
     "marquee-header"
    ],
-   "commit": "bde4a0af084f356b993b5fd5b727c05c54e1d132",
-   "sha256": "17cg70n50h1jpi2j705wpy4g3xgca8hqhraqinbk1lac9z2s3sil"
+   "commit": "d75ec4865742a4939bd685360f8ec5b076bdcf77",
+   "sha256": "10zqx7kfjw6rzq0mqpj4s3sdb13rabw98bkgm9nddi387ffmamql"
   },
   "stable": {
    "version": [
@@ -27618,28 +27920,28 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20240430,
-    1436
+    20240618,
+    1008
    ],
    "deps": [
     "compat",
     "parsebib"
    ],
-   "commit": "2f2d39d1953fa10d7c3dad6a4611d8ec0d489aba",
-   "sha256": "0x40cwcibl3dsyxmqn3yhsbw5pyisx5yypjy6qm7hzi6r2wxgvzr"
+   "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f",
+   "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k"
   },
   "stable": {
    "version": [
     2,
-    41,
-    1
+    42,
+    2
    ],
    "deps": [
     "compat",
     "parsebib"
    ],
-   "commit": "3458aa7777e0acf883b17008da78788c62d9a337",
-   "sha256": "1ylq4l044rals7xbf8rcx97gz84kypksl2fs5xwin2rc6rvpli8d"
+   "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f",
+   "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k"
   }
  },
  {
@@ -27731,11 +28033,11 @@
   "repo": "benzanol/echo-bar.el",
   "unstable": {
    "version": [
-    20240521,
-    326
+    20240601,
+    1744
    ],
-   "commit": "0e221754cb40406609ae5c79ac294683850638e1",
-   "sha256": "0cwpphdj78g6w4an58qrf3mbqji0lm6cfzkz099pcppg17ljz4h4"
+   "commit": "80f5a8bbd8ac848d4a69796c9568b4a55958e974",
+   "sha256": "1mpq8ha42lffzzwy0ib8vbb2dp9fgqnh112wfa1a6b3vh21wnxm8"
   }
  },
  {
@@ -28193,14 +28495,14 @@
   "repo": "editorconfig/editorconfig-emacs",
   "unstable": {
    "version": [
-    20240512,
-    1958
+    20240604,
+    602
    ],
    "deps": [
     "nadvice"
    ],
-   "commit": "6ac848e380322bb52d6f70a032e12f70d60daab1",
-   "sha256": "08fl3jg2vklyczqdz3ifaa0j4zkq7siz0m141lzcq5rahi7c65g6"
+   "commit": "0ce1abc65bfb030ccec97b0d4231667ca431e663",
+   "sha256": "1kxj0srq9f6ibhdd25428585h5v73xgdf5wq95qlz2r4vshmpxw0"
   },
   "stable": {
    "version": [
@@ -28451,11 +28753,11 @@
   "repo": "oxidase/eff",
   "unstable": {
    "version": [
-    20240108,
-    658
+    20240708,
+    231
    ],
-   "commit": "b8ce5d82dc2ef4df912b2b0cbe79e20b455ebd84",
-   "sha256": "0y7hz4cmhr6n91wv5q82ly2fjj4k0ihvc7pgr7wmbj63pvzbdys8"
+   "commit": "b8298439360b29333d3dcd8a352e00cde2b6ccd7",
+   "sha256": "0s8k4nfr8m13c1ylsn401yhf17ym15lh950smv01lbymkghcxvkg"
   },
   "stable": {
    "version": [
@@ -28727,22 +29029,22 @@
  },
  {
   "ename": "eglot-signature-eldoc-talkative",
-  "commit": "1639318f0f1730ab5b0e575256d93882d2fd063f",
-  "sha256": "03nz0xnzwf1db0b3whz7s8bykp2m9jnlssa9g4mpslaq1bwvfkry",
+  "commit": "1839deb57d34adc76db0b1a1a877b3cb542a6810",
+  "sha256": "1b1ymfm8nc505dy7c6cgmhac22pz98jb21gwnjynv5gbbqscb78s",
   "fetcher": "codeberg",
-  "repo": "mekeor/emacs-eglot-signature-eldoc-talkative",
+  "repo": "mekeor/eglot-signature-eldoc-talkative",
   "unstable": {
    "version": [
-    20240424,
-    801
+    20240626,
+    815
    ],
    "deps": [
     "eglot",
     "eldoc",
     "jsonrpc"
    ],
-   "commit": "859aa6f2c0acf060a8e7549b79daf46c8d63ea8d",
-   "sha256": "1s44kz9b2b61f5gy922rvzv1kpmx62chvdsnb1g785skdhfdzb6v"
+   "commit": "34cc207265f26f13142f5c62276e0ba18e1d55e4",
+   "sha256": "1p2qsv525jnmdsb7d3wqdhpryb1srgpf83g5l79lkq9mx776m2qn"
   },
   "stable": {
    "version": [
@@ -29479,6 +29781,21 @@
    "sha256": "0laq0qwlp1172yirvcyxsrmgqj8mjs4rfavjy4apiyxvv7131mss"
   }
  },
+ {
+  "ename": "elcute",
+  "commit": "53b72d7a58b48652ecb140cb4ddac93536522c01",
+  "sha256": "0dawqaaghaiz6mqvmcmmws5wlhx3h9x8bnbf9qam4pvzm4c29nz4",
+  "fetcher": "codeberg",
+  "repo": "vilij/slurpbarf-elcute",
+  "unstable": {
+   "version": [
+    20240708,
+    1910
+   ],
+   "commit": "625da6298f7128204de7464d6e2df298741f784f",
+   "sha256": "1g6gajikz1g9hni15r2sa206208q1v23d9yryrr7vrp8my1n72d4"
+  }
+ },
  {
   "ename": "eldev",
   "commit": "6d94da66938ea895c0b32bb54057c3b36bebf36d",
@@ -29487,11 +29804,11 @@
   "repo": "emacs-eldev/eldev",
   "unstable": {
    "version": [
-    20240511,
-    2039
+    20240609,
+    1211
    ],
-   "commit": "5153b5a747aaadb51ac14f3963e3ffbf59273e74",
-   "sha256": "183pa9sxg0qg0kd75vgll7xfaplpkrlj077vdqhh5qcciikhqhla"
+   "commit": "bb1938237ee85e477243cd45421330403df29390",
+   "sha256": "01fmgafs294lns10nj31pj327v943x7r4y81plp43gm8cngzgf0r"
   },
   "stable": {
    "version": [
@@ -29511,20 +29828,20 @@
   "repo": "casouri/eldoc-box",
   "unstable": {
    "version": [
-    20240426,
-    408
+    20240605,
+    1742
    ],
-   "commit": "4392128d4caaa21f7810ba0955514c395e9f3cae",
-   "sha256": "0nf28jh02al8vqyj0awij2hbqa03jkggdysc0v8kjlsrd673scgp"
+   "commit": "9658ba7d4616e97f2feeda3abf4aab3e96c91f28",
+   "sha256": "0gr8k2xbqc43jhzd3j91dzl639hgq5083qx8k9rx30wjdlpd4j09"
   },
   "stable": {
    "version": [
     1,
-    11,
+    12,
     1
    ],
-   "commit": "24c216ea3a2d369b814047271a8edf0c7c404b39",
-   "sha256": "0fzcyjg61icwjw1ml3p9qzd4a10vl7n1hqdpynqr5nlq9ih7rrgq"
+   "commit": "0be491c30e2f97da6bd680174a3223847eae567a",
+   "sha256": "1v163zk8qazz92q2iv9f0sgq2paryx80m94hbl588lhnyk227lsb"
   }
  },
  {
@@ -30046,26 +30363,26 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20230728,
-    1433
+    20240711,
+    433
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d",
-   "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q"
+   "commit": "c2be8c12d4c1e7027409d4a1b7876da68f3c167c",
+   "sha256": "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z"
   },
   "stable": {
    "version": [
     1,
     2,
-    7
+    8
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d",
-   "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q"
+   "commit": "c2be8c12d4c1e7027409d4a1b7876da68f3c167c",
+   "sha256": "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z"
   }
  },
  {
@@ -30108,15 +30425,15 @@
   "repo": "karthink/elfeed-tube",
   "unstable": {
    "version": [
-    20240511,
-    418
+    20240606,
+    241
    ],
    "deps": [
     "aio",
     "elfeed"
    ],
-   "commit": "1f5ad2cc26d6290eb77dd36716e5887cb2cd617c",
-   "sha256": "1c0nxzqhldn59hgalvx24r7wn0s641jv6akv8vra6m8qwarw9ksk"
+   "commit": "0c3fbc21259e1fa794f3179a53b410ba610231f2",
+   "sha256": "0hg2s5yzpd1fsl0fyrfv2cc2m61a67drfg86msfqpqdmkv30pbca"
   },
   "stable": {
    "version": [
@@ -30280,30 +30597,32 @@
   "repo": "s-kostyaev/elisa",
   "unstable": {
    "version": [
-    20240401,
-    1528
+    20240712,
+    1639
    ],
    "deps": [
     "async",
     "ellama",
-    "llm"
+    "llm",
+    "plz"
    ],
-   "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860",
-   "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m"
+   "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a",
+   "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5"
   },
   "stable": {
    "version": [
-    0,
     1,
-    4
+    0,
+    0
    ],
    "deps": [
     "async",
     "ellama",
-    "llm"
+    "llm",
+    "plz"
    ],
-   "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860",
-   "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m"
+   "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a",
+   "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5"
   }
  },
  {
@@ -30314,11 +30633,11 @@
   "repo": "ideasman42/emacs-elisp-autofmt",
   "unstable": {
    "version": [
-    20240421,
-    854
+    20240616,
+    2345
    ],
-   "commit": "0560fe21d1173b2221fd8c600fab818f7eecbad4",
-   "sha256": "00vsgjqb3qfm2lr2vqf10yr84b07l63pgkqvi0s1a0js7mvv6s65"
+   "commit": "98edd8158b778ff9a0e34b5c6615523c0035f8d6",
+   "sha256": "11p41lpw0vvbwm3mshmhqmgqs39b9lmrba45im0hwfpa9wcmx73z"
   }
  },
  {
@@ -30628,28 +30947,30 @@
   "repo": "s-kostyaev/ellama",
   "unstable": {
    "version": [
-    20240517,
-    1457
+    20240710,
+    2027
    ],
    "deps": [
+    "compat",
     "llm",
     "spinner"
    ],
-   "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c",
-   "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk"
+   "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328",
+   "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby"
   },
   "stable": {
    "version": [
     0,
-    9,
-    4
+    11,
+    9
    ],
    "deps": [
+    "compat",
     "llm",
     "spinner"
    ],
-   "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c",
-   "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk"
+   "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328",
+   "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby"
   }
  },
  {
@@ -31009,11 +31330,11 @@
   "url": "https://thelambdalab.xyz/git/elpher.git",
   "unstable": {
    "version": [
-    20240324,
-    1315
+    20240702,
+    816
    ],
-   "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2",
-   "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s"
+   "commit": "0bd12913940a047724d830725bf8649e4f8df499",
+   "sha256": "0pbx9zgig14qzgaar0ks425hmrmmgl3a50w4ykzy6r7ahbg93g88"
   },
   "stable": {
    "version": [
@@ -31391,28 +31712,28 @@
   "repo": "emacscollective/elx",
   "unstable": {
    "version": [
-    20240506,
-    1556
+    20240712,
+    2216
    ],
    "deps": [
     "compat",
     "llama"
    ],
-   "commit": "9db9f8dcc595717d82943fef66f554a4b40aff0b",
-   "sha256": "1cn4qya2miky1bwiwdkbp6kykcf5syy3hb7vfz5jlld4i9ckc23c"
+   "commit": "1159333ab9a09eaf32b3ab4fe10e4e7cea5a1a64",
+   "sha256": "1976vnpfpk4bz5pw7abh2624dwjwn0bfyf7fyb75djr4yg3g1bjy"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    2
    ],
    "deps": [
     "compat",
     "llama"
    ],
-   "commit": "f3dfcb41c6471b8150cc19cea5ff96fe1321f5a1",
-   "sha256": "1m01fmhxgqrk22llwwafyg3a29h5bhrbdv9mpf6yyqdm2f37h3yb"
+   "commit": "bb621713e2a111be5d2e3c45f4d168ccc8dd6fcd",
+   "sha256": "071x09yh7zaqpm3yphs6gn3lj1yxxzqlh5lf2rzykhnl6241pmv5"
   }
  },
  {
@@ -31438,20 +31759,21 @@
   "repo": "knu/emacsc",
   "unstable": {
    "version": [
-    20240104,
-    634
+    20240629,
+    1325
    ],
-   "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d",
-   "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1"
+   "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228",
+   "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz"
   },
   "stable": {
    "version": [
     1,
     5,
-    20230104
+    20240629,
+    1
    ],
-   "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d",
-   "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1"
+   "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228",
+   "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz"
   }
  },
  {
@@ -31477,11 +31799,11 @@
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240623,
+    1340
    ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "efddd69c5e69214dbbe921fbf90f938501414894",
+   "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg"
   },
   "stable": {
    "version": [
@@ -31593,14 +31915,14 @@
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240623,
+    1340
    ],
    "deps": [
     "emacsql"
    ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "efddd69c5e69214dbbe921fbf90f938501414894",
+   "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg"
   },
   "stable": {
    "version": [
@@ -31756,14 +32078,14 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20240419,
-    452
+    20240607,
+    2213
    ],
    "deps": [
     "compat"
    ],
-   "commit": "195add1f1ccd1059472c9df7334c97c4d155425e",
-   "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg"
+   "commit": "9c166c4b96a0b1e85401bcc6fb95ce021e7b5013",
+   "sha256": "1l8jqvcn61a1lzclq77z82645f7qsq7i61f9rknwbdwxb9aaidij"
   },
   "stable": {
    "version": [
@@ -31970,11 +32292,11 @@
   "repo": "smihica/emmet-mode",
   "unstable": {
    "version": [
-    20221111,
-    329
+    20240617,
+    45
    ],
-   "commit": "63b6932603184956b5ea8919036d2b307b48d7fd",
-   "sha256": "1g0fvp98w23dsyi75idyv4jf90635z80hchd1k13pychla6bw76j"
+   "commit": "322d3bb112fced57d63b44863357f7a0b7eee1e3",
+   "sha256": "1y41iqlybfls1rsagi9g1s879vw020r252j8m9jc89lsp5vkhawk"
   },
   "stable": {
    "version": [
@@ -31994,28 +32316,29 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20240512,
-    1735
+    20240704,
+    1359
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "c86ede13e80ad573f52e46de54fd24a97e2faa88",
-   "sha256": "04zw0al519n1xiyy15lzf1mv65d2fip5ha46h8lj03psl777bc4x"
+   "commit": "b5567be2176dcbdf42aa2d0ccad32a44f245dd09",
+   "sha256": "1kwybpr86ih0g739x3mqfpvbgsd9pfns1h6hm89f79qlgla282xz"
   },
   "stable": {
    "version": [
-    19
+    20,
+    1
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "384ca4544ec359bba08d2f9d2a78acb8f9917e25",
-   "sha256": "06yk5fpmgqkxrpcyd8gqq9g11x0clv8zgbwvxr95nwz720j70i72"
+   "commit": "e0331bd7c480b3ac326140bd5b312bfdbc4881c9",
+   "sha256": "06vsf3mlj0sxhmcgz70haihsrskr98w2jnhy68h7g3b9rkbxgmhc"
   }
  },
  {
@@ -32405,28 +32728,28 @@
   "repo": "isamert/empv.el",
   "unstable": {
    "version": [
-    20240517,
-    1701
+    20240712,
+    2241
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "c7313288e350de7331779c0b37a8298980f6ff57",
-   "sha256": "00w59r7ycpv7819kbyjcvpiif9kzqh7k5nk1nfy2wgs1saxkg8ln"
+   "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e",
+   "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1"
   },
   "stable": {
    "version": [
     4,
-    1,
+    4,
     0
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "c48cd223b145806a6a36167c299e9a0384a5f2e6",
-   "sha256": "0p62wfsxk0sh8lpjm52md8kaixkfagfsl9gpmps76448iznn04m7"
+   "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e",
+   "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1"
   }
  },
  {
@@ -32585,6 +32908,35 @@
    "sha256": "1jpiyjb5291jk6pd649d6i8nxaazqjznb3zpksp7ykrqqgw4wgjm"
   }
  },
+ {
+  "ename": "enlight",
+  "commit": "b7f467a2dcf96f67e641b6bea9262bee469bea3a",
+  "sha256": "14ygvcd6ppvdcwlxj5mnhxp47h6ls9azhnjw0zalhb55rq62vq89",
+  "fetcher": "github",
+  "repo": "ichernyshovvv/enlight",
+  "unstable": {
+   "version": [
+    20240602,
+    2025
+   ],
+   "deps": [
+    "compat"
+   ],
+   "commit": "5194c1a4f4c245a1ef544205d723381fac30414b",
+   "sha256": "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq"
+  },
+  "stable": {
+   "version": [
+    0,
+    3
+   ],
+   "deps": [
+    "compat"
+   ],
+   "commit": "5194c1a4f4c245a1ef544205d723381fac30414b",
+   "sha256": "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq"
+  }
+ },
  {
   "ename": "enlightened-theme",
   "commit": "93728d3fe62331b49627c1cfa1c4273a43407da8",
@@ -32709,25 +33061,25 @@
   "repo": "purcell/envrc",
   "unstable": {
    "version": [
-    20240517,
-    1633
+    20240613,
+    907
    ],
    "deps": [
     "inheritenv"
    ],
-   "commit": "4405f6e7b2e300aa91211bd505364d8f01667c97",
-   "sha256": "0jkydssnmljj8d29h15gar90r5cgin8qnlwampf2af26zfxxgq3v"
+   "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae",
+   "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"
   },
   "stable": {
    "version": [
     0,
-    11
+    12
    ],
    "deps": [
     "inheritenv"
    ],
-   "commit": "8571bf94b6a63ffd9a84100106602f88ba186854",
-   "sha256": "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0"
+   "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae",
+   "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"
   }
  },
  {
@@ -32852,8 +33204,8 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20240415,
-    1554
+    20240712,
+    2216
    ],
    "deps": [
     "closql",
@@ -32861,8 +33213,8 @@
     "emacsql",
     "llama"
    ],
-   "commit": "91c3e441eaa9f85b13d5957ee82f7c440addd147",
-   "sha256": "0n6psk9k2aglfsbxpnqfsmah4c9060sgf13wix0mmakba2iq11wc"
+   "commit": "e864055a1916a54127050fbb50f07614e2f6319b",
+   "sha256": "0d0y50dacjg6jwz1vn8hmacighn0q7g1h15pwh32gd9qakmp15z1"
   },
   "stable": {
    "version": [
@@ -32885,8 +33237,8 @@
   "repo": "emacscollective/epkg-marginalia",
   "unstable": {
    "version": [
-    20240415,
-    1536
+    20240712,
+    2216
    ],
    "deps": [
     "compat",
@@ -32894,8 +33246,8 @@
     "llama",
     "marginalia"
    ],
-   "commit": "41bb627934e0a389e24573d2c9d088f6f6afdbcc",
-   "sha256": "1m0g1h81if11v0mw8l3kd6i2mxs1r1s1dh9c84niig0gw0dgligw"
+   "commit": "11e551187b7fa37aa8989bee50939ed0adbacdeb",
+   "sha256": "1mplkpm7h33g0y3p98kcywyrw6k0xvyrwjpy1xkiswlwknmvx51i"
   },
   "stable": {
    "version": [
@@ -33108,11 +33460,11 @@
   "repo": "leathekd/erc-hl-nicks",
   "unstable": {
    "version": [
-    20200317,
-    16
+    20240615,
+    2058
    ],
-   "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439",
-   "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra"
+   "commit": "fd2759bde20c25226a332c3d19aed6c7f135bf10",
+   "sha256": "1lpsm3z3q89hfpay476m7n7p1m897j0sl6z5bnvgn6cqyvhl1d8a"
   },
   "stable": {
    "version": [
@@ -33568,19 +33920,20 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20240517,
-    1225
+    20240709,
+    1136
    ],
-   "commit": "601a012837ea0a5c8095bf24223132824177124d",
-   "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1"
+   "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa",
+   "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if"
   },
   "stable": {
    "version": [
     27,
-    0
+    0,
+    1
    ],
-   "commit": "601a012837ea0a5c8095bf24223132824177124d",
-   "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1"
+   "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa",
+   "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if"
   }
  },
  {
@@ -34045,6 +34398,21 @@
    "sha256": "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"
   }
  },
+ {
+  "ename": "eshell-command-not-found",
+  "commit": "908102fbfdb7e7b3bbb0bf5a8bc5bfd37ce67586",
+  "sha256": "1vyl80078wswk4nypn3gjsbjas7vbz9dkljc0ch0zq975vr4wapz",
+  "fetcher": "github",
+  "repo": "jaeyeom/eshell-command-not-found",
+  "unstable": {
+   "version": [
+    20240708,
+    512
+   ],
+   "commit": "28427f0ca266fd75890ceafdd96997b5507e1bc4",
+   "sha256": "0cid9caklxbp4rfdpam42cmkxj1izzw84g9hpk7jabjmfgashrxg"
+  }
+ },
  {
   "ename": "eshell-did-you-mean",
   "commit": "a7649eca21a21ddbbc7131f29cbbd91a00a84060",
@@ -34224,11 +34592,11 @@
   "repo": "akreisher/eshell-syntax-highlighting",
   "unstable": {
    "version": [
-    20240509,
-    241
+    20240701,
+    502
    ],
-   "commit": "1198fd658d317747eb606a50c7767fef579af324",
-   "sha256": "1j2qfaw2jrd9gpn7a0i0wd5hjqgzj3akgkayrw73bh285iz19fm6"
+   "commit": "26f49633308ea876b5850256e07622de34ad0bdd",
+   "sha256": "1p2lqx3rzfmn1lamnx9ns5mr0svjqamx7ah9342l30bmv87skz1h"
   },
   "stable": {
    "version": [
@@ -35190,6 +35558,30 @@
    "sha256": "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip"
   }
  },
+ {
+  "ename": "evenok",
+  "commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1",
+  "sha256": "03kvr25rd91hkrrymyhsv1j48hr06p1k6hrz0skfd4ns617ambd0",
+  "fetcher": "codeberg",
+  "repo": "mekeor/evenok",
+  "unstable": {
+   "version": [
+    20240627,
+    2213
+   ],
+   "commit": "0f3291547de570ce8f03326443bf65452e848fd7",
+   "sha256": "1gf611r3vaq03gf696c2ig7idvxz0k52nji9w08rcmg1qwbl09va"
+  },
+  "stable": {
+   "version": [
+    0,
+    11,
+    1
+   ],
+   "commit": "1cdd8f8d09473bc8fb1c5157bd3a2129883701bc",
+   "sha256": "1qnncjdd2jc65zz2slm8pjgg64nqyvc9v8p6m0zl15xhh7kdavi3"
+  }
+ },
  {
   "ename": "everlasting-scratch",
   "commit": "7d14ddda9729eec229a72a8827d0f0a5be779db7",
@@ -35198,11 +35590,11 @@
   "repo": "beacoder/everlasting-scratch",
   "unstable": {
    "version": [
-    20240430,
-    1713
+    20240612,
+    814
    ],
-   "commit": "1837142ae14fdfd4d634434ceff966b348826259",
-   "sha256": "15509mjlk382yws41gb90xqn9g06agjpd6c8b8ps4ykmswm6ad5h"
+   "commit": "fa1b2af29e8bb463400bbea912ab4dfaa2b0c890",
+   "sha256": "10zckrrz0mh6alrmav8lbzyz4imh7966m7524jzm2576pn6mxf04"
   },
   "stable": {
    "version": [
@@ -35221,15 +35613,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20240521,
-    954
+    20240712,
+    2240
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "0b134d3bbf73c93f5fed2bb89a35f408a9d627ed",
-   "sha256": "1nrvrb520wpphbhj1ck7jz2ks55yd7bkzycbjzbh534zax1nri93"
+   "commit": "fc993435bbb3c486bdf0666298e2204ec170880b",
+   "sha256": "09a7kl45sj1wxlz8abir2c4d8whmf4kcbv2baldqj80jbljfvpyd"
   },
   "stable": {
    "version": [
@@ -35351,8 +35743,8 @@
   "repo": "emacs-evil/evil-cleverparens",
   "unstable": {
    "version": [
-    20240308,
-    751
+    20240529,
+    1025
    ],
    "deps": [
     "dash",
@@ -35360,8 +35752,8 @@
     "paredit",
     "smartparens"
    ],
-   "commit": "aa19ed6fec73c883442fb4ffd8d300355d5a8580",
-   "sha256": "1lidyj1xk1xaszsi832f8bhpxgmfpjykd1gxn1y9zqi9rg9b8hpw"
+   "commit": "6637717af0bdac55f97eef98433d53a10395cf77",
+   "sha256": "15vsqm2pgyb1qg2rwnd4b6pny771zyp5x9z4a0p9pc67f11mrwp0"
   }
  },
  {
@@ -35422,15 +35814,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20240417,
-    1647
+    20240711,
+    1239
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "5886bab852dc9e31959e70384d535473e44504ad",
-   "sha256": "0dz9dkmxm4j2r2nilgxwgvsgbm531rrsiszzx480zrmqybdsziq6"
+   "commit": "28d64031ff58871828a0dec25ef437beb9371337",
+   "sha256": "0zm7mgcapkc6nhn531qxnv8wsr5zvhhpd966yfi5f6nwhj7yv10l"
   },
   "stable": {
    "version": [
@@ -36024,15 +36416,15 @@
   "repo": "gabesoft/evil-mc",
   "unstable": {
    "version": [
-    20230529,
-    210
+    20240701,
+    140
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "bdf893ea6f52fd0f10bece8ddae813658e17bbb4",
-   "sha256": "12r2vi3a3la93fm18rcwjy6v6x4rqa6khryxggdki3whlmzv60xf"
+   "commit": "cff3374bfe1b7b1932743425d7fc5d4ab66d747e",
+   "sha256": "1kmc9vmryqnzkc1xmdkycrrakcyscg2apixff63hdcr715bljrm9"
   },
   "stable": {
    "version": [
@@ -37492,8 +37884,8 @@
   "repo": "anonimitoraf/exercism.el",
   "unstable": {
    "version": [
-    20231007,
-    1253
+    20240610,
+    32
    ],
    "deps": [
     "a",
@@ -37505,8 +37897,8 @@
     "s",
     "transient"
    ],
-   "commit": "9d164a54fd7be933e6f65d4cc7112c99bd957b26",
-   "sha256": "1b73274krk38jb8znnp5q788jh66g3s8w8lslf79b34s586p8ih4"
+   "commit": "f9a287a4cd533fdbd3b0e645f425a7b9c469e6ab",
+   "sha256": "0lf6xa0x2g0izwfcpi48b0s0146mz8r60gf4ynqpx4fmyl2mccj5"
   }
  },
  {
@@ -38218,19 +38610,19 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20240520,
-    1303
+    20240619,
+    1314
    ],
-   "commit": "452546431e3bef05fbf8914f6d41b8b7a3557bf3",
-   "sha256": "1dikgq84xfv2hq340f9m2nvhn4h09sv9py0sm3214nfssn6z4a55"
+   "commit": "763d524b5dd6273843256810e8531954335583bd",
+   "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz"
   },
   "stable": {
    "version": [
     3,
-    4
+    5
    ],
-   "commit": "9b8ff139442b29a16a437c367f201f263bbb884c",
-   "sha256": "103npmlln3c394fkacapx17zjyw4niwqqn8c768gij0ny4k0qfg4"
+   "commit": "763d524b5dd6273843256810e8531954335583bd",
+   "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz"
   }
  },
  {
@@ -38681,14 +39073,14 @@
   "repo": "martianh/fedi.el",
   "unstable": {
    "version": [
-    20240311,
-    1417
+    20240711,
+    753
    ],
    "deps": [
     "markdown-mode"
    ],
-   "commit": "b4996a467868b11e7f4ee9c53354131a99bc6bad",
-   "sha256": "0shh0k73h39yq44yrcqsvci88byrvc52x2r2vgld9fh1kfw9iq66"
+   "commit": "7c31f0d580bb20f70285bae136c6b4634a6c21b5",
+   "sha256": "0jxs8ic6z2rcv8l62614phf1hgq4zr4nmfm2bznbqf49kc5hpxhk"
   },
   "stable": {
    "version": [
@@ -38913,15 +39305,15 @@
   "repo": "Artawower/file-info.el",
   "unstable": {
    "version": [
-    20231207,
-    2041
+    20240621,
+    653
    ],
    "deps": [
     "browse-at-remote",
     "hydra"
    ],
-   "commit": "158524c92f37eeccf55e096f3090db2baa12fbae",
-   "sha256": "0l17mmail2gcz71rmk2p1p4lf0lc10mhj5pdq1c1dpppri42cbwm"
+   "commit": "36fb3469a4d1c9d803e9d13e7e2e9582ced3043f",
+   "sha256": "1cd6m5acclfwzqpnrnqz08gm52jfjg7m137l005g9hn3vwlbc3bj"
   },
   "stable": {
    "version": [
@@ -39398,6 +39790,21 @@
    "sha256": "0pbbqwms0w7n2blqan7jbk38klc85gwqw3j4w5c90shg9a8xsr01"
   }
  },
+ {
+  "ename": "firebase-rules-mode",
+  "commit": "c9d7c4fd4118244c73f11f8e34e478bb05642752",
+  "sha256": "0xqkyq6nbvy636r13pq61cykk00vl62a3cm9x798mbc958w01ny0",
+  "fetcher": "github",
+  "repo": "dherbst/firebase-rules-mode",
+  "unstable": {
+   "version": [
+    20240520,
+    1326
+   ],
+   "commit": "c88cb10251cdfce931e4fe48ce76eaa50cc7e791",
+   "sha256": "0sdqljlpgmhszkd8psfpx99wjcg5z5wg8q9lfcnw2j30hdlxiik2"
+  }
+ },
  {
   "ename": "firecode-theme",
   "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c",
@@ -39945,11 +40352,11 @@
   "repo": "crmsnbleyd/flexoki-emacs-theme",
   "unstable": {
    "version": [
-    20240109,
-    607
+    20240702,
+    1515
    ],
-   "commit": "9339a2a1a8052159916e9913b14ec062c0a3f506",
-   "sha256": "071if59ikrfyc17vw1fbzpqsg16zd7zpnfgxhi02sz8ng7q4jmx7"
+   "commit": "e9c352075eb3a0d06e280d60968b6147f9678b6e",
+   "sha256": "1g0n72j05s2k70a5d4plawrmffvinkc970pidysfjc7rpzfzrpgc"
   }
  },
  {
@@ -40261,11 +40668,11 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20240411,
-    449
+    20240703,
+    1352
    ],
-   "commit": "900b8e79754d21853a6e5b5a2802f317a7112a1e",
-   "sha256": "0k9gf7aim1ns09rmicaqy93lp1915c8llr9i837gw8a86c8fjfrr"
+   "commit": "eb29cd8b4adb211226e2b87eac49b8d5fb169c55",
+   "sha256": "1rnn63vwy8fx3g578zlqipffr0w0zl43mmzz0bgdafr4mal4ac5x"
   },
   "stable": {
    "version": [
@@ -40428,15 +40835,15 @@
   "repo": "shuxiao9058/flycheck-buf-lint",
   "unstable": {
    "version": [
-    20230724,
-    1501
+    20240612,
+    1219
    ],
    "deps": [
     "flycheck",
     "s"
    ],
-   "commit": "51c439dcb9fa40966256d8cce835f7b7aabf44d0",
-   "sha256": "1gq8abj5ld2hqhwc0p7qmf8vfy8nj3pfzzdba2yh8zx8l22r2h3i"
+   "commit": "6cf7e7a01bfe150f9be45e83f9fc2d0c8b9d8de3",
+   "sha256": "1lf69gmbh0q9drjxb1h1wz426hxjr4mkzl8grz6ggl56rxwxj2f4"
   }
  },
  {
@@ -41087,15 +41494,15 @@
   "repo": "flycheck/flycheck-eglot",
   "unstable": {
    "version": [
-    20240214,
-    1937
+    20240705,
+    1738
    ],
    "deps": [
     "eglot",
     "flycheck"
    ],
-   "commit": "a38101634c55ef6cfcfc74b4fd9a50b541b42457",
-   "sha256": "0r4h4c0pzfgp22iscgszvzv1sf3b286wrgmds0ijlha4r99ln88s"
+   "commit": "09e37f4c726d9b565b040ba9e89215158d3bd6b6",
+   "sha256": "0hxkgdgxlj4faylckbfj68pg0dxj5y8nfyq3rkqshswma1537zg1"
   }
  },
  {
@@ -41678,14 +42085,14 @@
   "repo": "flycheck/flycheck-inline",
   "unstable": {
    "version": [
-    20200808,
-    1019
+    20240709,
+    1812
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5",
-   "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn"
+   "commit": "de96ba2eb4619a9a7d891773629ec70f2be89aec",
+   "sha256": "1nh28p3sf1swxgip732lh9k9bmw1k4x4z0pnjw8ihcas4xw0bygy"
   }
  },
  {
@@ -42231,15 +42638,15 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20230417,
-    1142
+    20240527,
+    2142
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456",
+   "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj"
   },
   "stable": {
    "version": [
@@ -43325,11 +43732,11 @@
   "repo": "purcell/flymake-easy",
   "unstable": {
    "version": [
-    20141022,
-    1828
+    20240624,
+    1702
    ],
-   "commit": "2a24f260cdc3b9c8f9263b653a475d90efa1d392",
-   "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c"
+   "commit": "1986500f75ea06f006ab1734abcce441117d385d",
+   "sha256": "1pb2angvlfdg4s9qbsm6yzhshxpfz75p3dd50vw7cbb4q1iws8a0"
   },
   "stable": {
    "version": [
@@ -43933,11 +44340,11 @@
   "repo": "LionyxML/flymake-margin",
   "unstable": {
    "version": [
-    20240401,
-    2342
+    20240612,
+    306
    ],
-   "commit": "fe4da9f947c7a11aba331dd77637d471cedbd061",
-   "sha256": "1p3q7s5n1szggj8w8fmpz8l7g27srmsrgla5wag2320dnd6djrir"
+   "commit": "4e36634789d64c33a9fc0dc5bc2eb4a21c391d96",
+   "sha256": "05fw8ncspafk4j2mvqaznw78cqwf2v1xdl70b7j30cya97wab4kn"
   }
  },
  {
@@ -44303,14 +44710,14 @@
   "repo": "erickgnavar/flymake-ruff",
   "unstable": {
    "version": [
-    20240419,
-    232
+    20240709,
+    1338
    ],
    "deps": [
     "project"
    ],
-   "commit": "15bf4d3a4ebe899991e385b64901b5cde0daa177",
-   "sha256": "0g9czaf6his577g1fcgi5xiy3fhfjkf8ihilgnxjydiwgr4fg4f1"
+   "commit": "3b69008d6cc3084338392bc03373d00844ad4261",
+   "sha256": "0yy16n5lqyv5bd2q3jlnmcg9hjx79985kf9ap283shx5ssb217zq"
   }
  },
  {
@@ -44412,11 +44819,11 @@
   "repo": "erickgnavar/flymake-sqlfluff",
   "unstable": {
    "version": [
-    20231105,
-    2009
+    20240611,
+    1257
    ],
-   "commit": "598dff268231f74ba902e2c607c85dd014fbee28",
-   "sha256": "0r32vhb9krjhq4xk0bmzk43x756jcw39k7vl0ps10zha7p7mnm69"
+   "commit": "0a836d7a919723ae5897fce01c3c7d651a30e8c6",
+   "sha256": "1i75c2i6ks2drq5a8y48m7wyk50jm5p7lj2xks3jwkzj4dgl7c4p"
   }
  },
  {
@@ -44834,14 +45241,14 @@
   "repo": "larstvei/Focus",
   "unstable": {
    "version": [
-    20221016,
-    1846
+    20240528,
+    901
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2507ec4ec5a9402647ef85540669db1815520c15",
-   "sha256": "0qbzbs18isxyf5yiz64vyxvzjpfjdaafxnas2lhx3sjkgglb08i2"
+   "commit": "17c471544f540f2cf9a05fd6cd87e52e5de317e2",
+   "sha256": "0aqcnvnla4rmpc9iy679jaw1vqqg16j2fw7m9iis7j3w0wcw5c77"
   },
   "stable": {
    "version": [
@@ -45236,8 +45643,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20240519,
-    1510
+    20240712,
+    1313
    ],
    "deps": [
     "closql",
@@ -45252,8 +45659,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "d3b14f2cb6740d18827ed713715908b517e4a899",
-   "sha256": "058g4gi3p3r70h1bdpphbg65xwggq4azyw70wgq30b9q13v90lkh"
+   "commit": "03d012ae24eafa89a1a5ba7d9ed4069b05d54e21",
+   "sha256": "09pclclvw92i216m45m5hzw55vi3zszps1jkykyqc2vpl0zna0i8"
   },
   "stable": {
    "version": [
@@ -45471,14 +45878,14 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20240520,
-    307
+    20240710,
+    937
    ],
    "deps": [
     "seq"
    ],
-   "commit": "7e10f27dd5d9a5d18e08a5454321e961167dfbf7",
-   "sha256": "0z7lf948l4yn8znir2nca2bd38c6wqcgihf6cx603j1q7ipfxnwb"
+   "commit": "70967d12f59cef29b7d301c2ed51c32b4a11c7f1",
+   "sha256": "1216wfps6zm0rq2ghq8m7m3nrjqk2j4ky6k1fsqkj5d5lj25x2gx"
   },
   "stable": {
    "version": [
@@ -45489,7 +45896,7 @@
    "deps": [
     "seq"
    ],
-   "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928",
+   "commit": "195fa8670456855b592e76fb495d03cc621ad647",
    "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn"
   }
  },
@@ -45655,26 +46062,26 @@
   "repo": "tarsius/frameshot",
   "unstable": {
    "version": [
-    20240415,
-    1537
+    20240712,
+    2217
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8bceac0988ea2e84452f87b96e0a9f669d717843",
-   "sha256": "1xw8cd8gaawggywpqkalzcjsvn6ns52v7bsp0jmbz113y6l8q689"
+   "commit": "23d550389ca978945300f5a1076d5c4f530d8d0e",
+   "sha256": "0563z8ahn4jlmfwrz391h340d69hmn4szkk41cy1v9nig0f7vp8k"
   },
   "stable": {
    "version": [
     0,
     2,
-    6
+    8
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f74d99be64dc7afa4bdea106c0597c1fa59b9a3d",
-   "sha256": "0qwffkpjh5zsj487yi5m5j5y7vxqc67pga5nj127nbg4rdmjs3ng"
+   "commit": "c60ef067f582f7dc7ebdfb8e1b544068f56e2bf1",
+   "sha256": "0pbxzn16hjvmf81hscq3d3jj07d1j4x7amg67j741fwddvzkm8wc"
   }
  },
  {
@@ -45799,11 +46206,11 @@
   "repo": "rnkn/freeze-it",
   "unstable": {
    "version": [
-    20220301,
-    148
+    20240630,
+    730
    ],
-   "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5",
-   "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49"
+   "commit": "0d0b6c425769a602ab18d41927feb8c0e22e214b",
+   "sha256": "0zs0d7r14yzw7nihw5v24drwbv1pf8ldrgfackkdkhxh1x6laqqm"
   },
   "stable": {
    "version": [
@@ -45811,7 +46218,7 @@
     2,
     2
    ],
-   "commit": "1f252a922612e0d6ee62a683b7cdab8956460f11",
+   "commit": "6891d3b7a85da13e6d5982ac6b9588473941ec98",
    "sha256": "0bwd3hw5qdijmvbfm69iyhijjx12yqvsa8n08cawxfa26cs6hi1g"
   }
  },
@@ -46159,14 +46566,14 @@
   "repo": "factor/factor",
   "unstable": {
    "version": [
-    20230824,
-    1321
+    20240523,
+    1604
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e10b64dbc53a8583098e73580a1eb9ff4ce0c709",
-   "sha256": "0fscknmhqc1lzjrv920wlch33vbxkys4290n51r9mrgz830lg41s"
+   "commit": "436d9a61aaa1fdaa319f14d0eac6b5aec920db05",
+   "sha256": "0z2xrin546dycz0vp9y9rq6jb3i13x0sfnmq0041zmr9nywb7wr6"
   },
   "stable": {
    "version": [
@@ -46319,14 +46726,14 @@
   "repo": "jojojames/fussy",
   "unstable": {
    "version": [
-    20240224,
-    1641
+    20240607,
+    2153
    ],
    "deps": [
     "flx"
    ],
-   "commit": "0f58683355986e3f8d49734cb1f2ecdd71729439",
-   "sha256": "1hqh656h7gy233d1557qrp4vq9vsalgdn9wa2bsd1c11z46f3r8f"
+   "commit": "21f4ac6b971f61890d46308d7ac5db64c20228e6",
+   "sha256": "0skjr9pqjbr4am3cdq78frf5bckpv5761j0ppp0pg6pfbrcdbaa3"
   },
   "stable": {
    "version": [
@@ -46461,26 +46868,26 @@
   "repo": "tarsius/fwb-cmds",
   "unstable": {
    "version": [
-    20240415,
-    1537
+    20240712,
+    2218
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2214ad1094b0b4d466825521eefe39bba65634d0",
-   "sha256": "0cqxin5mnmkjzswh6vk46dhxyh6parxd74w4i2cd44ijrh6rx9yn"
+   "commit": "257659fc0bf0112d40f921717c57e558b25f91ea",
+   "sha256": "02b5kgnmadgnq8cpmrh1srxpzw30gxn52azy58g9p16jy0i0lnnf"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417",
-   "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21"
+   "commit": "a2569c7c986dcde2c859e390a0da5aeacf69db77",
+   "sha256": "0dql8nh79sh10fhxc2h3sypx6qvrg30j2x3ib3mw32qwgx33v8m2"
   }
  },
  {
@@ -46592,11 +46999,11 @@
   "repo": "ShiroTakeda/gams-mode",
   "unstable": {
    "version": [
-    20231202,
-    1410
+    20240502,
+    1456
    ],
-   "commit": "03c24b19c270feca0d3fc9494698cf6d4c7f8152",
-   "sha256": "1g1w0z04qc6k61p9y7mfplqk83yi3pcabv3mr4kfq1pmny8l46sp"
+   "commit": "cf0fce18ed51aa6b66e672e3f5655faf4631d9cd",
+   "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y"
   },
   "stable": {
    "version": [
@@ -46691,6 +47098,21 @@
    "sha256": "13nafw4rz1xfzcag0390xxs1nqadplvkrkiw72h0i8y2kwa9yya3"
   }
  },
+ {
+  "ename": "gdb-x",
+  "commit": "563763f2ef13c67fef65d54df6a7370cfa07ab81",
+  "sha256": "1ilzb1gagis1jkwnr00xq2szvmbzv0a1k99n1gv4x2a9crn122ma",
+  "fetcher": "codeberg",
+  "repo": "shepherd/gdb-x",
+  "unstable": {
+   "version": [
+    20240617,
+    1857
+   ],
+   "commit": "367dbb31e1591ffb3f4b7630f2c8ddcc0692e133",
+   "sha256": "0x1i1lrs5szrmabakhm07d6hiywn072b0bid0ir2jva4msqkcajp"
+  }
+ },
  {
   "ename": "gdscript-mode",
   "commit": "0694d21374661c7ff94202468d57ddd438c0973d",
@@ -46800,25 +47222,25 @@
   "repo": "emacs-geiser/geiser",
   "unstable": {
    "version": [
-    20240208,
-    26
+    20240706,
+    1537
    ],
    "deps": [
     "project"
    ],
-   "commit": "4e64934bd2ae7c6f0e4acb9f2ed017844c187223",
-   "sha256": "098xbywraa8a8qcg07iy2svvsqr10s9wdk2ixwcxdh0cskfq40m4"
+   "commit": "a81969a5271f155d2d1e389ccbe47e1c7ec36ae7",
+   "sha256": "17srwjw84lxpcfdl0jg7pxh6vdh3am6fs5dk0l4hy3z1axzd3i12"
   },
   "stable": {
    "version": [
     0,
-    30
+    31
    ],
    "deps": [
     "project"
    ],
-   "commit": "f343592a52da0f947989d07c208a51ad6c972a5e",
-   "sha256": "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938"
+   "commit": "b6b4ac070d136345345c80ff649f0084e3c512a5",
+   "sha256": "1lxvgj50c3lbyib4lcv4f5xjhgnngnklc8sszrx5yy9snsrd1sn5"
   }
  },
  {
@@ -46972,15 +47394,15 @@
   "repo": "emacs-geiser/guile",
   "unstable": {
    "version": [
-    20240314,
-    1950
+    20240712,
+    1202
    ],
    "deps": [
     "geiser",
     "transient"
    ],
-   "commit": "71a6be00433a157de3936f208c7a1bd0192b12cd",
-   "sha256": "0chwpwl55qbgfig7z4zdd4ly9vj2367b1ll1wg0q41sn34fqgpq5"
+   "commit": "ebdd1923b0780778706ea6b16aa2b0ce3e7dc33d",
+   "sha256": "1fhv3r93vq497rkbwrfn6nwq525vviqlfbry6x2fimcm02sizsa1"
   },
   "stable": {
    "version": [
@@ -47617,16 +48039,16 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20240507,
-    1647
+    20240618,
+    1527
    ],
    "deps": [
     "compat",
     "let-alist",
     "treepy"
    ],
-   "commit": "1df5298c3c4d26ec3720dc6c31f8bfd07858f8a9",
-   "sha256": "1ag8jkc9kkq6rikz19gv2m2hj85f37zwdxxnx16825hf1q9xcjpk"
+   "commit": "e44aceeb12831f8b7afac4e089525b5a2dd5a5e8",
+   "sha256": "18k7w0fw56ris6wkf48dp5x4isq11zxzy712grdgax6gp0ls8m84"
   },
   "stable": {
    "version": [
@@ -48041,16 +48463,16 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240520,
-    1135
+    20240623,
+    1335
    ],
    "deps": [
     "compat",
     "transient",
     "with-editor"
    ],
-   "commit": "22fd8f8594202a0679ccc2f7d02bca44d48b8039",
-   "sha256": "1ddx82j2j8sf9w7vc9jqa8fm54slprz4jyg3bxmsh6qb0y7n3yni"
+   "commit": "196abe727054a440bf6262c5c254ad4565cbaa66",
+   "sha256": "09hrg76rhjzz1y5svzbcbw2qpq6hxcq0rc4iasb0bqmvljcra0aq"
   },
   "stable": {
    "version": [
@@ -48103,6 +48525,21 @@
    "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5"
   }
  },
+ {
+  "ename": "git-commit-ts-mode",
+  "commit": "18b52cd5af8b5ccd5c28efcde18758d03e4c76dd",
+  "sha256": "0vp7r70j8sn5q8n30lhqjdhbk6kl2qrly1dq4a8vl5rfxs5rx81c",
+  "fetcher": "github",
+  "repo": "danilshvalov/git-commit-ts-mode",
+  "unstable": {
+   "version": [
+    20240527,
+    708
+   ],
+   "commit": "04219fdac2a5c1816cd08141513770adc0c2a48b",
+   "sha256": "0chhls16pz215hxsh2c9c95msz4jmj941fvpiqp57alsv7fva9ci"
+  }
+ },
  {
   "ename": "git-dwim",
   "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af",
@@ -48136,6 +48573,40 @@
    "sha256": "0c1hfh62vdi9ly530crsz2aghapf0s2z9i3xdvfyyynr1gqs3mis"
   }
  },
+ {
+  "ename": "git-grep-transient",
+  "commit": "f44d0bfeebbc326f39f6996fe387389c421e4368",
+  "sha256": "133c8lss7nkak0983ax1fnzagd6vw5fx5ii87krszy3izzwiagil",
+  "fetcher": "github",
+  "repo": "adelplanque/git-grep-transient",
+  "unstable": {
+   "version": [
+    20240521,
+    648
+   ],
+   "deps": [
+    "magit",
+    "symbol-overlay",
+    "transient"
+   ],
+   "commit": "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80",
+   "sha256": "0kfzj77rl0lcdlwjcq6dqpm4ylqqxj38j4ymvdsk7whgnd1pwgji"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "magit",
+    "symbol-overlay",
+    "transient"
+   ],
+   "commit": "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80",
+   "sha256": "0kfzj77rl0lcdlwjcq6dqpm4ylqqxj38j4ymvdsk7whgnd1pwgji"
+  }
+ },
  {
   "ename": "git-gutter",
   "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
@@ -48334,20 +48805,20 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20240413,
-    1547
+    20240630,
+    626
    ],
-   "commit": "f16ced38f954f1159fda2f0ba7b60842f8d7e9f9",
-   "sha256": "08miy2jdn5bbmwpz5p3a196p60j8ldgb4sk77rf1cz24dp490h1i"
+   "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8",
+   "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z"
   },
   "stable": {
    "version": [
     0,
     9,
-    1
+    2
    ],
-   "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5",
-   "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl"
+   "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8",
+   "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z"
   }
  },
  {
@@ -48387,26 +48858,26 @@
   "repo": "magit/git-modes",
   "unstable": {
    "version": [
-    20240415,
-    1538
+    20240618,
+    1609
    ],
    "deps": [
     "compat"
    ],
-   "commit": "52ea2a1281ea9df9b8732fe2add0e6a0c9c2cd11",
-   "sha256": "1nf9ij8qab4lfcgj6h63mxlqph04z4icq5fxs5hsdxzcxrz3y6g1"
+   "commit": "7901415b39bef1b789d161ca2c10dfb910d13780",
+   "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i"
   },
   "stable": {
    "version": [
     1,
     4,
-    2
+    3
    ],
    "deps": [
     "compat"
    ],
-   "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf",
-   "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc"
+   "commit": "7901415b39bef1b789d161ca2c10dfb910d13780",
+   "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i"
   }
  },
  {
@@ -48766,10 +49237,10 @@
  },
  {
   "ename": "github-modern-theme",
-  "commit": "35763febad20f29320d459394f810668db6c3353",
-  "sha256": "07xv4psw34mrpb1f5fsvj8vcm9k3xlm43zxr6qmj00p46b35z25r",
+  "commit": "0ee692a25ee31066d22cd1cbe3405ec6c323e72e",
+  "sha256": "1i4589cwf5m7bf1x39mljsi0qjiwva8zpx14i03xbpnmc6h8x3nk",
   "fetcher": "github",
-  "repo": "philiparvidsson/GitHub-Modern-Theme-for-Emacs",
+  "repo": "vexx9/GitHub-Modern-Theme-for-Emacs",
   "unstable": {
    "version": [
     20171109,
@@ -48896,10 +49367,10 @@
  },
  {
   "ename": "github-theme",
-  "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
-  "sha256": "132jahd8vvhzhhkm71dzq6x46wmaakbbxg9s7r9779bfwbrms9j9",
+  "commit": "41c3ba590a2bb7c864b7f86abf0bf8e82b157f1d",
+  "sha256": "0r22rhhv3qjvd9la0p13hpdk9ar9cblib4m8s8hax0lxqwr0h0gx",
   "fetcher": "github",
-  "repo": "philiparvidsson/GitHub-Theme-for-Emacs",
+  "repo": "vexx9/GitHub-Theme-for-Emacs",
   "unstable": {
    "version": [
     20170630,
@@ -49502,28 +49973,28 @@
   "url": "https://git.thanosapollo.org/gnosis",
   "unstable": {
    "version": [
-    20240517,
-    334
+    20240712,
+    1936
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb",
-   "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7"
+   "commit": "9f678e624d7e89478d0090826f813d05bb811e27",
+   "sha256": "0xlv6vp51gkd2i2xnhajkzhraz0nb8ykynbm8g9kjn8nq5y8dqmp"
   },
   "stable": {
    "version": [
     0,
-    2,
-    5
+    3,
+    0
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb",
-   "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7"
+   "commit": "688dc187a1684fabb209d4d08a2d2baa5ae0e99d",
+   "sha256": "19mzyg4hg6mplv3s2kb8xiaw06zkbj7a3gvfvy51cwvb8k979ap6"
   }
  },
  {
@@ -50188,11 +50659,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20230823,
-    2304
+    20240620,
+    1948
    ],
-   "commit": "8dce1e3ba1cdc34a856ad53c8421413cfe33660e",
-   "sha256": "0l002gcjmwrfkc4972hc8sal6xaja05s50rg7cbv2q9axb18rcqj"
+   "commit": "636d36e37a0d2b6adb2e12d802ff4794ccbba336",
+   "sha256": "0n8qx85ijrijq8wdmmlga69v47vq0kw0njjkvmvibv05hi8g2q2h"
   },
   "stable": {
    "version": [
@@ -50429,11 +50900,11 @@
   "repo": "lorniu/go-translate",
   "unstable": {
    "version": [
-    20240522,
-    333
+    20240711,
+    28
    ],
-   "commit": "8cc1f9d013fd99d5bec8b862f8acb249c9104e7e",
-   "sha256": "15z86y5dvwdcds6w6vl1bv6j4rakc5a4gzawbacpb8wz25nbbigx"
+   "commit": "97468ed8ff5ae93e01e93d4018e7be1b711046a1",
+   "sha256": "0c6snl8jm9ykpq2h3cl7335pmzycq9kg6ki3mqq8yzzrp51a6ffh"
   },
   "stable": {
    "version": [
@@ -51057,8 +51528,8 @@
   "stable": {
    "version": [
     0,
-    37,
-    2
+    38,
+    0
    ],
    "deps": [
     "dash",
@@ -51066,8 +51537,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "9a1b3c8fdfd0fcbe460b3546ef1fba26905e6bd0",
-   "sha256": "1bcakhih2c3ql2npq4v8bsq88dknbk8658b94hbfhy16an81l2zn"
+   "commit": "51648874c24e2232274693e92218551e3292c425",
+   "sha256": "1bk2bnxc5b7y2ng0pdxnxfwr6s3yp4kpw50zwrak3phiv8z862k7"
   }
  },
  {
@@ -51221,28 +51692,28 @@
   "repo": "karthink/gptel",
   "unstable": {
    "version": [
-    20240520,
-    1943
+    20240626,
+    2246
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "3bce2caa5dc773d1b1fce53e8453d2e1ce534b8b",
-   "sha256": "1v6pvla6kv9ym3vkd37k2hkn71ycgh4av933ipjqycy1zrwb968i"
+   "commit": "dcc4e3640ebaa0f94e24b3ad2099a01f7f3a517a",
+   "sha256": "00y8kmzgsyqgvy0hcjinnqnm6jsf22wyg7jfadybwbnw9aiy7q6a"
   },
   "stable": {
    "version": [
     0,
-    8,
-    6
+    9,
+    0
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "cdb07d0d2bb6a4fe6d6a620aa4eec98f70fe6f78",
-   "sha256": "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv"
+   "commit": "4c0583b2bd6557a09d66dfec84bab776242d0848",
+   "sha256": "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4"
   }
  },
  {
@@ -51253,11 +51724,11 @@
   "repo": "mkcms/gpx-mode",
   "unstable": {
    "version": [
-    20240513,
-    1737
+    20240609,
+    2200
    ],
-   "commit": "b79baf93040fb5c89e803848e8aff31331ea03b8",
-   "sha256": "0ffqzihh1c874bj53hdgjcvwhkmp2pdmcl6rmzjv1m9ijxhxnjmj"
+   "commit": "88aa5fed1b0987d90f442eb002ab0f2e4731e223",
+   "sha256": "1gc52avqkwq9l119ckah0qvwml6cc3w02gvl772ncj821ci90d7r"
   },
   "stable": {
    "version": [
@@ -51708,6 +52179,25 @@
    "sha256": "0vkv34aslcw2fl9yx8j6094s8j5mgpqrwvyf07a1d16rixncffpm"
   }
  },
+ {
+  "ename": "greader",
+  "commit": "adeadbbb9d48e015f621a86bd4fbfb26465ff5e6",
+  "sha256": "1z3qqbbaydfpmzwm5ih9b3grf1xwjaxh5s565lbd8r9kmfvb08zp",
+  "fetcher": "gitlab",
+  "repo": "michelangelo-rodriguez/greader",
+  "unstable": {
+   "version": [
+    20240712,
+    2322
+   ],
+   "deps": [
+    "compat",
+    "seq"
+   ],
+   "commit": "7301a27f22bcae3e57a85e1e88d7917077b4d791",
+   "sha256": "0zxjkihz5x8jwpyxfykmkp5zna1m9p3kg9bir5h5k7aak07jj7mf"
+  }
+ },
  {
   "ename": "greek-polytonic",
   "commit": "bf0e6206be0e6f416c59323cf10bf052882863f3",
@@ -52047,14 +52537,14 @@
   "repo": "greduan/emacs-theme-gruvbox",
   "unstable": {
    "version": [
-    20240515,
-    553
+    20240615,
+    432
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "3388a96d8e59c120bc243c1f90c614237f6ac3b5",
-   "sha256": "0r0yqa47zlwr9bv9m84dq3vl43k1gk5hlclcg40v4wqkiiyhwbvw"
+   "commit": "d2404eb157845536b111999a4332d58a4867427e",
+   "sha256": "1bnmp9nbpsrnxhn6v81533xcb9hx043wf86n5hwj9mpacl5ic33y"
   },
   "stable": {
    "version": [
@@ -52236,14 +52726,14 @@
   "repo": "tmalsburg/guess-language.el",
   "unstable": {
    "version": [
-    20220408,
-    1545
+    20240528,
+    1319
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b1fc363ca2c30b8a8ddaf2e366bca7770c8cfbec",
-   "sha256": "1sgzvi6ax05rfnjdlmhkd52sr26b6w3q1lfcrrv6rdzsifarh2iv"
+   "commit": "a17203d26135b970e4d7c5d101955d41303a758f",
+   "sha256": "1v9wwpfjl7a37jx0s2w5g48mv58vw8b3d0552v5ksxw21mbkya8s"
   }
  },
  {
@@ -52355,11 +52845,11 @@
   "repo": "Overdr0ne/gumshoe",
   "unstable": {
    "version": [
-    20240304,
-    525
+    20240628,
+    2142
    ],
-   "commit": "223d19ffbd6296864a775d18025150ccbcbc7800",
-   "sha256": "1lad09axg7iyk3iclk35fxpdb42s8sxxncfqgpqcc56grin7jq85"
+   "commit": "569ee770d022df9f6d51ff448652788a379c377c",
+   "sha256": "1gl0w48gpqd02zq3jh4gn2n41mr8g850fq6s10jlmkdh6q1za233"
   }
  },
  {
@@ -52491,14 +52981,14 @@
   "repo": "abrochard/emacs-habitica",
   "unstable": {
    "version": [
-    20220215,
-    1758
+    20240601,
+    2029
    ],
    "deps": [
     "org"
    ],
-   "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327",
-   "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac"
+   "commit": "b884301058c075e6f530f10e970b744aa29f5937",
+   "sha256": "1jfizwqi54bw0w9p77wrz9b2a5jbyd2v14nrb1nr03l5jxmx0f1n"
   }
  },
  {
@@ -52509,14 +52999,14 @@
   "repo": "hhvm/hack-mode",
   "unstable": {
    "version": [
-    20230227,
-    1950
+    20240524,
+    1838
    ],
    "deps": [
     "s"
    ],
-   "commit": "278e4cc4032bff92060496cf1179643cfc6f9c0f",
-   "sha256": "0b7831sklgal1zky772qdmg6b2a1kdy4nwhz398rb8shx66fx4pm"
+   "commit": "ccf20511f0f2ed45d00d423c703bb91ab6a8b80c",
+   "sha256": "0jnxys3zcmswb0z4zcd05c58cpw9qbw8hgwfqfsixyk720722b9g"
   },
   "stable": {
    "version": [
@@ -52767,27 +53257,27 @@
   "repo": "alphapapa/hammy.el",
   "unstable": {
    "version": [
-    20240423,
-    407
+    20240608,
+    359
    ],
    "deps": [
     "svg-lib",
     "ts"
    ],
-   "commit": "e3b2e365140abd87537edc09cd87fb04268bc439",
-   "sha256": "166wjgkdrp2gdw10a8bkpqbiaqhhxlwmk80ia9djnz6js50hx8xq"
+   "commit": "d5d154060bb13e9b61d74a83b25a12238973099d",
+   "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi"
   },
   "stable": {
    "version": [
     0,
-    2,
-    1
+    3
    ],
    "deps": [
+    "svg-lib",
     "ts"
    ],
-   "commit": "84c0f14e2fcbaa36dfbf2986d44e672d028fa2e6",
-   "sha256": "1jz3cfmlwf5p5hzix4phl7gz8nymmbf5h3h3qd2ni37yz01d2xch"
+   "commit": "d5d154060bb13e9b61d74a83b25a12238973099d",
+   "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi"
   }
  },
  {
@@ -53076,11 +53566,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20240116,
-    1718
+    20240527,
+    853
    ],
-   "commit": "43b4036bf02b02de75643a1a2a31e28efac1c50b",
-   "sha256": "09lz6w8rwfvp57byzalz8l3622kb06inqf5p6ijngkrildfgzgcr"
+   "commit": "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0",
+   "sha256": "0r0fzvrmqg4vi4q9h3b260dppxszq4gpak5jl8kqb84s22hx4g33"
   },
   "stable": {
    "version": [
@@ -53403,30 +53893,28 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20240521,
-    1457
+    20240710,
+    509
    ],
    "deps": [
     "helm-core",
-    "popup",
     "wfnames"
    ],
-   "commit": "c65a9039b6574183aa3f3e0b647c85470c002339",
-   "sha256": "0m0b6gb393q60cha19wm0xsry6rihqyp2v6yqcrbmhjr4qbsmni6"
+   "commit": "568f104747876a675aad5f2ded395f487a5e6492",
+   "sha256": "1kgkvx6ys43awv6vryr6k0n8z70svn5i3pdx0lcwzc51sysy3zil"
   },
   "stable": {
    "version": [
     3,
     9,
-    8
+    9
    ],
    "deps": [
     "helm-core",
-    "popup",
     "wfnames"
    ],
-   "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49",
-   "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1"
+   "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592",
+   "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v"
   }
  },
  {
@@ -54296,26 +54784,26 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20240518,
-    1434
+    20240712,
+    1822
    ],
    "deps": [
     "async"
    ],
-   "commit": "ba2eb552353635222f14984b8a2f4456b4ac62e2",
-   "sha256": "15nb9dd59fbzmq2b78pnb9iy1d2q6bdnq6xxsmpycqr10kbmsv1p"
+   "commit": "0b3a41934051ae9be4b97f92115c121f9fb0352a",
+   "sha256": "0w0h8j4m6prxyhqznprwnzdqlqfqmcpvry2f6cb4fx2c4rxvv5sn"
   },
   "stable": {
    "version": [
     3,
     9,
-    8
+    9
    ],
    "deps": [
     "async"
    ],
-   "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49",
-   "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1"
+   "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592",
+   "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v"
   }
  },
  {
@@ -55852,14 +56340,14 @@
   "repo": "emacs-helm/helm-ls-git",
   "unstable": {
    "version": [
-    20240315,
-    1721
+    20240702,
+    811
    ],
    "deps": [
     "helm"
    ],
-   "commit": "8b0b9484d43153e0c1a1fb664a14b1a53874e60b",
-   "sha256": "1ggsx4hvkq7q13pxa4lqxj4s78fm5acl55z7b5c1qrvykkwjdfc4"
+   "commit": "1cf4e5caf8f18ae323764015496b13d0e85c716f",
+   "sha256": "1nixr1si7zgrdpprxr3wrm89fl4g8dnnaq21wr217f9wf3gp7nkr"
   },
   "stable": {
    "version": [
@@ -56321,23 +56809,24 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20240403,
-    2026
+    20240613,
+    355
    ],
    "deps": [
+    "compat",
     "dash",
     "helm-org",
     "org-ql",
     "s"
    ],
-   "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84",
-   "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"
+   "commit": "f7c3a61e32e8da62da1e69a2a79ec5b333a7d1f5",
+   "sha256": "1di581sgfqjbij1s2ka5mkycdkrsg39rh6g51x1iicvs5j8r0ih9"
   },
   "stable": {
    "version": [
     0,
     8,
-    6
+    7
    ],
    "deps": [
     "dash",
@@ -56345,8 +56834,8 @@
     "org-ql",
     "s"
    ],
-   "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84",
-   "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"
+   "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3",
+   "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50"
   }
  },
  {
@@ -58087,8 +58576,8 @@
   "repo": "Wilfred/helpful",
   "unstable": {
    "version": [
-    20231028,
-    516
+    20240613,
+    1523
    ],
    "deps": [
     "dash",
@@ -58096,8 +58585,8 @@
     "f",
     "s"
    ],
-   "commit": "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69",
-   "sha256": "1shv5v0rls38znv64g8h80541qyjqk39fpr7wkq5vis8xpfvvpp5"
+   "commit": "4ba24cac9fb14d5fdc32582cd947572040e82b2c",
+   "sha256": "1xhhm7avgv9iqnc9pdx8dzcx8p5xaqk81j5zp96qbv035mqkpzrx"
   },
   "stable": {
    "version": [
@@ -59226,26 +59715,26 @@
   "repo": "tarsius/hl-todo",
   "unstable": {
    "version": [
-    20240415,
-    1538
+    20240707,
+    1351
    ],
    "deps": [
     "compat"
    ],
-   "commit": "36b66cde5777943ca0f190ad7a33fae3b2f6a404",
-   "sha256": "0v9mrkqxbvjpx1ynx8pja5djghwnix80vkbazrfv39j7shmx2dkh"
+   "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d",
+   "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0"
   },
   "stable": {
    "version": [
     3,
-    6,
+    8,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "70ce48470c85f1441de2c9428a240c3287995846",
-   "sha256": "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq"
+   "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d",
+   "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0"
   }
  },
  {
@@ -59796,11 +60285,11 @@
   "repo": "hniksic/emacs-htmlize",
   "unstable": {
    "version": [
-    20240422,
-    1351
+    20240527,
+    1456
    ],
-   "commit": "54ac89c5edc7a83344cf51d8be08e1e701f88863",
-   "sha256": "0sw9jc860fhlljq9s61qz6cgg2cf43zi2l0ff6mp4np5rdiyrwjd"
+   "commit": "ed5e5b05fd260e8f161a488d56f10e7f6e01fb75",
+   "sha256": "19q4m3bc7dljh04662vm4rr1kz5c11rwyyv27vp01yakwbfig772"
   },
   "stable": {
    "version": [
@@ -59946,11 +60435,11 @@
   "repo": "pnor/huecycle",
   "unstable": {
    "version": [
-    20210830,
-    340
+    20240614,
+    49
    ],
-   "commit": "a05e32351dcff3e61b5f15800556adfe1939c112",
-   "sha256": "1qnid40hmz3yw5jr1i9xr91d57hjh90s98js48nk6m0sjbkkbb4r"
+   "commit": "8f3e8641f950072ebf4bb03afd49b87aad147ad9",
+   "sha256": "0v5d96sgfmglm4q2gi676ardkigdqws5k5cwcg8bk72cc2b35di1"
   },
   "stable": {
    "version": [
@@ -60247,11 +60736,11 @@
   "url": "https://git.savannah.gnu.org/git/hyperbole.git",
   "unstable": {
    "version": [
-    20240519,
-    1800
+    20240713,
+    827
    ],
-   "commit": "61937530ea3713b37ed34b8ad62331a507ccf8c6",
-   "sha256": "0i6h8m04njp9vwzibm2ja299lrgygw222mgknf773dys3bdnf7pm"
+   "commit": "e0504916079e982025ca3d260f53dba2ef122679",
+   "sha256": "10r5dhlq3djw1xiz1i21h5a1va5p0wc2q8rbxl9phcgvkph6mmij"
   }
  },
  {
@@ -60262,19 +60751,20 @@
   "repo": "ushin/hyperdrive.el",
   "unstable": {
    "version": [
-    20240522,
-    627
+    20240713,
+    434
    ],
    "deps": [
     "compat",
     "map",
+    "org",
     "persist",
     "plz",
     "taxy-magit-section",
     "transient"
    ],
-   "commit": "f32525eea6032d3422a4419fe65d6c32eb359b8b",
-   "sha256": "0rs5ij0z82f2aiq5lrr0rkp33cxx2wb149mb2mrjczwrqm9riwbn"
+   "commit": "5afca563c757a7c3ced908f9193beee0cc0b013c",
+   "sha256": "1asaky1r47p1brybjjlcrf6lnwrhxc13m43xq9y08d10r1fvx4ch"
   },
   "stable": {
    "version": [
@@ -60369,6 +60859,30 @@
    "sha256": "1r5h55zcm5n2vx126q16ndhgdchcj59qqcybhsqw69vk02x96arg"
   }
  },
+ {
+  "ename": "hyperstitional-themes",
+  "commit": "0c845614a741c81502707156a4665b41cc504a78",
+  "sha256": "12z2dg035phanfdly1bkl48496yds4zbv7j9cn0211sx7bxfb265",
+  "fetcher": "github",
+  "repo": "precompute/hyperstitional-themes",
+  "unstable": {
+   "version": [
+    20240528,
+    2016
+   ],
+   "commit": "e87e4ca39384c75398c64c920bf4cbc253f6740b",
+   "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g"
+  },
+  "stable": {
+   "version": [
+    1,
+    2,
+    0
+   ],
+   "commit": "e87e4ca39384c75398c64c920bf4cbc253f6740b",
+   "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g"
+  }
+ },
  {
   "ename": "i-ching",
   "commit": "28b05f2e04d286f3115e33e9d3e717caef8a0a46",
@@ -60455,11 +60969,11 @@
   "repo": "mkcms/interactive-align",
   "unstable": {
    "version": [
-    20240326,
-    1233
+    20240531,
+    2023
    ],
-   "commit": "764aea597b8c9292da2d91294bb6a70e7ad7d6d7",
-   "sha256": "1hdkkrcs86xmw6j5z7bqqvk4kdsf4a8ksr9bfzwkfs8sc68314zv"
+   "commit": "96043dff1c542d15cccf5df46b778927fcf5680d",
+   "sha256": "1c9qpygvs5zqrsc2q0sdm6s3yz4qgwa6qin7vax13b1f654hz6mb"
   },
   "stable": {
    "version": [
@@ -61268,15 +61782,15 @@
   "repo": "idris-hackers/idris-mode",
   "unstable": {
    "version": [
-    20240423,
-    1320
+    20240704,
+    1334
    ],
    "deps": [
     "cl-lib",
     "prop-menu"
    ],
-   "commit": "aa580b61eb3d409ae9ceb141547937ad27fae24c",
-   "sha256": "0ylb8my9qs9agqv6i7xj4lgca2pg0cdlqagn345pydjhgd8n5cbx"
+   "commit": "09de86a8f056c61de72c678386039894779a9375",
+   "sha256": "1kdsrbh32dr3j0icnplpd4wjyp0n6d0kp7gfgbz1xcvh21gn8rdb"
   },
   "stable": {
    "version": [
@@ -61378,28 +61892,28 @@
   "repo": "KarimAziev/igist",
   "unstable": {
    "version": [
-    20240322,
-    953
+    20240713,
+    920
    ],
    "deps": [
     "ghub",
     "transient"
    ],
-   "commit": "051a58085cd9593665c59c75208cc10189b53504",
-   "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y"
+   "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc",
+   "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z"
   },
   "stable": {
    "version": [
     1,
     6,
-    1
+    3
    ],
    "deps": [
     "ghub",
     "transient"
    ],
-   "commit": "051a58085cd9593665c59c75208cc10189b53504",
-   "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y"
+   "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc",
+   "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z"
   }
  },
  {
@@ -61554,26 +62068,26 @@
   "repo": "tarsius/imake",
   "unstable": {
    "version": [
-    20240415,
-    1539
+    20240618,
+    1725
    ],
    "deps": [
     "compat"
    ],
-   "commit": "55c86a15fb253c7e351d55e762ece0a15dc816b9",
-   "sha256": "1svvjgp7ndn4i9rrg5idrqinhpfnmw0m5s5f4nr3c0zp44l2xn4i"
+   "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d",
+   "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "96ac809dbe9cae0e620bb5b1d5d1fb391f3f4741",
-   "sha256": "0xxh1jci3gvbiv0kcif1b39gfakgwaqd7a8pfwpw7f7prv44ifp6"
+   "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d",
+   "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz"
   }
  },
  {
@@ -61860,14 +62374,14 @@
   "repo": "jcs-elpa/impatient-showdown",
   "unstable": {
    "version": [
-    20240101,
-    929
+    20240617,
+    1944
    ],
    "deps": [
     "impatient-mode"
    ],
-   "commit": "f24ebb103cd8cba36943f6a41a0fed303bd7ba5c",
-   "sha256": "1hxxygwbs1wc080gs8lm2dij6m5qkzp0f88ifi9309b2gd0grg7n"
+   "commit": "6bdb55c33e99f97a26aab617b686daa6f193eafa",
+   "sha256": "00fh12ryrfvihckrvd9gh1cfxbj8gix0jagw816yzlj6i7530ldl"
   },
   "stable": {
    "version": [
@@ -61980,11 +62494,11 @@
   "repo": "flashcode/impostman",
   "unstable": {
    "version": [
-    20230111,
-    2012
+    20240524,
+    847
    ],
-   "commit": "936575500f733c2428ba878f9400f3eef8c9645e",
-   "sha256": "16zd5bk7s1h9yrrsk0ngpzb4cfyj4gkmq70m0ijsc94az7m9rlx3"
+   "commit": "c0d7b5b0950fd8113f55a02b3ee7e0fc9c431bea",
+   "sha256": "0iydxmv5kawizfi0ibzlz38ycnacgskj6l1mrx47a2hxd5laz71i"
   },
   "stable": {
    "version": [
@@ -62313,11 +62827,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20240509,
-    143
+    20240627,
+    2135
    ],
-   "commit": "1dcaa0aad2eec23582263f934005140ddf70f52c",
-   "sha256": "1rxxn0329c3xvcn931rwb2chfzxm2m9zi2zq6kvgi5bwq2p5b53q"
+   "commit": "b234625c85a48cc71e7045f5d48f079f410d576a",
+   "sha256": "13x6jg89wg0s41p12srv61if9jwz1j0j0q5yfc543lx6ndk1w67g"
   },
   "stable": {
    "version": [
@@ -62749,10 +63263,10 @@
   "repo": "ideasman42/emacs-theme-inkpot",
   "unstable": {
    "version": [
-    20230618,
-    715
+    20240610,
+    1406
    ],
-   "commit": "2f59c524e17f8fb157bdbae5cf10cfe42f63c6bd",
+   "commit": "259272084f8ead2453f83f526ed95061f879d464",
    "sha256": "08lnbvnn56hkm78sxs7k5h8wy4v0c2aynq41bqjr3p2j19hkxssr"
   }
  },
@@ -63156,6 +63670,29 @@
    "sha256": "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3"
   }
  },
+ {
+  "ename": "iosevka-theme",
+  "commit": "82c26e97c7d96817b9ae524a976b243cfe2d9c38",
+  "sha256": "0a6z01qqx63wg95cyvs1yc2mxsyys51j1msvx7myi9z8nqj5l3s7",
+  "fetcher": "codeberg",
+  "repo": "mekeor/iosevka-theme",
+  "unstable": {
+   "version": [
+    20240621,
+    2151
+   ],
+   "commit": "1f17b9cdb48021a0ac1369d9622742e0f5442c9d",
+   "sha256": "0gv79s2v0g5vjqg5xlbxhlqrg7fjymch4skgrnz0ni21h4m9c6gk"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "commit": "4b4fecee994b62c4b2b3d7bc34c181937c41eafc",
+   "sha256": "1ysdq690r8ks86j837dm5v9mlyh3l4mzxfm2dmhl0cg051azv0p2"
+  }
+ },
  {
   "ename": "iota",
   "commit": "4062b8df284ac67c8324c7aee82c6be955e6e3a8",
@@ -63743,11 +64280,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20240519,
-    1636
+    20240524,
+    1139
    ],
-   "commit": "6a98b006f140b588490c24c5f794aac4250bf300",
-   "sha256": "054wjara59jjqrhr7hq0h4h3f3k6gvbx6m8066s5hryvi1ij2p4y"
+   "commit": "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747",
+   "sha256": "1z5975q7a67z2kgnx3klr35magrcgy6idhzhi73in133cff0d21n"
   },
   "stable": {
    "version": [
@@ -64659,11 +65196,11 @@
   "repo": "zellio/j-mode",
   "unstable": {
    "version": [
-    20171224,
-    1856
+    20240611,
+    2211
    ],
-   "commit": "e8725ac8af95498faabb2ca3ab3bd809a8f148e6",
-   "sha256": "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd"
+   "commit": "3f852d1476be5625fea51dcaaad66dd57593101a",
+   "sha256": "05biqy3gdq3k5yldjwpnsn9jabnchmdzcfkpkmcdr3j2dsh7rciw"
   },
   "stable": {
    "version": [
@@ -64683,15 +65220,15 @@
   "repo": "emacs-jabber/emacs-jabber",
   "unstable": {
    "version": [
-    20240522,
-    1532
+    20240624,
+    528
    ],
    "deps": [
     "fsm",
     "srv"
    ],
-   "commit": "02372a6673372779571b524319e08b84241e87c6",
-   "sha256": "0ps998w5z0qs676l29ag47mrrsg9k2g7pgl7fbfc0crbi2ivzj2a"
+   "commit": "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2",
+   "sha256": "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn"
   }
  },
  {
@@ -65480,25 +66017,25 @@
   "repo": "minad/jinx",
   "unstable": {
    "version": [
-    20240515,
-    1016
+    20240708,
+    2122
    ],
    "deps": [
     "compat"
    ],
-   "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966",
-   "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i"
+   "commit": "e39f2682ea902a1d06bd118d5899b2bbadfb6dce",
+   "sha256": "0cy2qsgcg4xbivr5qz573xz00mp34igw5kv01h81n98a17cafga4"
   },
   "stable": {
    "version": [
     1,
-    7
+    9
    ],
    "deps": [
     "compat"
    ],
-   "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966",
-   "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i"
+   "commit": "4580aad8a0267bf30c98d210b6bdc1a08b1aad75",
+   "sha256": "17bygyvllmmnngmbp8grs5nrngiy61c2kbyxykf1hgvmj4hqwkv8"
   }
  },
  {
@@ -65589,11 +66126,11 @@
   "repo": "ideasman42/emacs-jit-lock-stealth-progress",
   "unstable": {
    "version": [
-    20240422,
-    105
+    20240616,
+    2345
    ],
-   "commit": "8f517230266faf1decb8e948110baef7539c9df3",
-   "sha256": "0n78ijl1z1rlyx8y83c71rhwf63lzicc39d05myj25r31may5k2l"
+   "commit": "caf256543cfe5404333f5cf914a478d14b2ec102",
+   "sha256": "1iiinybr3alh0afmyhb2mz7c1r3c360bxy7x6ha2jhjk8ncz946c"
   }
  },
  {
@@ -65634,11 +66171,11 @@
   "repo": "Michael-Allan/Java_Mode_Tamed",
   "unstable": {
    "version": [
-    20240508,
-    951
+    20240617,
+    1034
    ],
-   "commit": "4a0bcf5a8f86e26ce76df0ea984c316e63df13f3",
-   "sha256": "11ka3hcfzh7dzk37zb7lblyq6r5k2f4dpn8c1nkiyzamchbfg4df"
+   "commit": "278db38c30bd556793c9ce0c939045e95dbb6f32",
+   "sha256": "1viiwc8fjazrchbkxr63k4k3m9gsaay64jikq4prrnbpmz9ljng7"
   }
  },
  {
@@ -65752,11 +66289,11 @@
   "repo": "ljos/jq-mode",
   "unstable": {
    "version": [
-    20240304,
-    911
+    20240528,
+    752
    ],
-   "commit": "d533567a680bc87060c56a50f83d80e58646d2f2",
-   "sha256": "02bl5v7y64xl14g396yl9z8bb87aldhg8yb4c72jycqf9xkmanai"
+   "commit": "a0f79eba786d46f01aeabb5913aadc337e985d6c",
+   "sha256": "0x2rgy5f55zrgmcg4rz2ivrb8pws1v5yyy69bfkbqqggniplh5y8"
   },
   "stable": {
    "version": [
@@ -66260,26 +66797,26 @@
   "repo": "taku0/json-par",
   "unstable": {
    "version": [
-    20240217,
-    550
+    20240608,
+    725
    ],
    "deps": [
     "json-mode"
    ],
-   "commit": "52f69108d4eca328f7eb74c2dfb841db2f0ffa8a",
-   "sha256": "0ifsy0016yrh9dkw9zlfd4l7m30fncli954zm3n1qknk6dmyd19r"
+   "commit": "c4a9566142de6b0812cf4dfe0b0bf49b3e35f038",
+   "sha256": "0hhwhlfxrm6qnb99awy3hxm5zdjsz40jifxyp6qjsny5cg418zf9"
   },
   "stable": {
    "version": [
-    4,
+    5,
     0,
     0
    ],
    "deps": [
     "json-mode"
    ],
-   "commit": "8d6f6adb24c08896fbc285b7144202074c2d6244",
-   "sha256": "0himbsm42sgjc576p45r1v5jqpr91lzi2s54lrj45gf0bixgvql3"
+   "commit": "7b346b0f0db62d65f382ce48a9b2ecd9e180b0d7",
+   "sha256": "1rppp5yi3v3jf90di9jsil18fl00l4qlgandzb3bdrv0j9z2lfqc"
   }
  },
  {
@@ -66540,20 +67077,20 @@
   "repo": "llemaitre19/jtsx",
   "unstable": {
    "version": [
-    20240519,
-    1546
+    20240603,
+    1609
    ],
-   "commit": "7bbf02f046e375c23fe5a90eb0a9557e843eba41",
-   "sha256": "1x7w6g535la7fs05v2xil4bggif7j9f3qphc49fz9ay6q6rfsc84"
+   "commit": "2b50a2e0d4c59ec465ba3bd8848743eeea13fc09",
+   "sha256": "0yf44n933k772gmav72l5svbl06pss3hnqqni8mi3vff0cy3sdva"
   },
   "stable": {
    "version": [
     0,
-    4,
-    2
+    5,
+    0
    ],
-   "commit": "32dec6d5d5725a7fe2d50537e46c224349008896",
-   "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv"
+   "commit": "2ad20cef1b2a6fc1e8b282f34127de82f6e463b1",
+   "sha256": "1kia04cs3xm2f3dvas9i6r9vz62xdlx6g5a0pz995gyxw91f7q3g"
   }
  },
  {
@@ -66874,8 +67411,8 @@
   "repo": "emacs-jupyter/jupyter",
   "unstable": {
    "version": [
-    20240418,
-    1642
+    20240420,
+    1918
    ],
    "deps": [
     "cl-lib",
@@ -66884,8 +67421,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "f1394d303be76a1fa44d4135b4f3ceab9387a16b",
-   "sha256": "0346ws7ym873dc3xbmpzlg371v0rgclz93hbfzcld7gv4g1dncfb"
+   "commit": "aec436af541549ccd02e23c066a6c497d1365f6b",
+   "sha256": "1cssm3jrj20n9wjcqq4sz74rx0sm6yg5dbskn9d5h86df00af2zh"
   },
   "stable": {
    "version": [
@@ -66935,8 +67472,8 @@
   "repo": "psibi/justl.el",
   "unstable": {
    "version": [
-    20240224,
-    428
+    20240701,
+    1259
    ],
    "deps": [
     "f",
@@ -66944,8 +67481,8 @@
     "s",
     "transient"
    ],
-   "commit": "1b16ca44b227dc761a2c8631690140f62e024f98",
-   "sha256": "1ciwiamby7w8snkrn6c3s7y5fyfpv6982rihfx6gmbsg0r6vgmwl"
+   "commit": "e74fef3e99c5c9e2e1a8495c539e1eca2cd0676d",
+   "sha256": "07gj3xfwim1df5c1dck9a3w00xg4syywmfzdayby5af79lrbcyrf"
   },
   "stable": {
    "version": [
@@ -67144,14 +67681,14 @@
   "repo": "bram85/kagi.el",
   "unstable": {
    "version": [
-    20240424,
-    2021
+    20240629,
+    557
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "b3d45264fb25aa95130352c65bc87ec4659e6e71",
-   "sha256": "0jm4h2sbj7wn6s520zi62l9iqggp2q5whpncc1mb3ckfvwn0vhfk"
+   "commit": "eb767d1e0dc56b14ebc8f4362890b7fd2be7a542",
+   "sha256": "0gs7lngj5ng6caiafh2hzjjwb3zm95j9kzslxis20lyqmpp64r1l"
   },
   "stable": {
    "version": [
@@ -67272,17 +67809,17 @@
  },
  {
   "ename": "kanagawa-theme",
-  "commit": "e4033364b3a2898858cecee0d6deff5779195f29",
-  "sha256": "00zx1zjvshvld6f1q9lk8j08nng1ra0isyhbyhnic6mhljb20mk3",
+  "commit": "031d8e3e0b3caa06935005d4388c605a2b9a9e7d",
+  "sha256": "0bipgikp4280j46yk91zdyg53yscs93lsdzfm7w8ppfl1c4g6xxh",
   "fetcher": "github",
-  "repo": "meritamen/emacs-kanagawa-theme",
+  "repo": "Fabiokleis/emacs-kanagawa-theme",
   "unstable": {
    "version": [
-    20240501,
-    38
+    20240709,
+    1230
    ],
-   "commit": "3ac33b6a4c7c7ad751ec8f264aa05f135b5d953d",
-   "sha256": "0dbdv64yzhrhhzg0asxnabzhv1jhcihmkby3ilw8hgls0w0r24c0"
+   "commit": "2cad3191be7c574d0fc933a8566468fa520862e0",
+   "sha256": "0pmy0vjd05vvciryjkscpnmknd5kvjm61pybz4nbzckkzqd6r9g2"
   }
  },
  {
@@ -67323,30 +67860,30 @@
   "repo": "magnars/kaocha-runner.el",
   "unstable": {
    "version": [
-    20240410,
-    1348
+    20240625,
+    1010
    ],
    "deps": [
     "cider",
     "parseedn",
     "s"
    ],
-   "commit": "ab5b4f32c733e238bdf08e10cab9a0606675faa4",
-   "sha256": "0qjbaahx04nrasz75ni3s3snhpbrcrv0a6g3gqqjs6f7kw327laj"
+   "commit": "98f45ee396802c2225595c9151d4a941f9dcaa9d",
+   "sha256": "15smw8033hjwg7wh5zcdngr9my7yy8lbjgw5x3kck87chrwyj6fr"
   },
   "stable": {
    "version": [
     0,
     3,
-    0
+    2
    ],
    "deps": [
     "cider",
     "parseedn",
     "s"
    ],
-   "commit": "c4ec9cdc817e5f4c3f8d6013e44ea2df8f3eb07f",
-   "sha256": "062c6j8l2vv2vc23z5iq4b50p92k6bni1rayhhd8j0h5bkiml4w3"
+   "commit": "e5071ce09ec2d8c700bac91c902318035c5489bf",
+   "sha256": "0kxsrk4brk24mlc7fxvv0yrx5piq26fyjqllxx3vkkrzps792z3x"
   }
  },
  {
@@ -67526,11 +68063,11 @@
   "repo": "conao3/keg.el",
   "unstable": {
    "version": [
-    20230709,
-    1321
+    20240713,
+    1007
    ],
-   "commit": "c0d24fdad4248e0291685b47a02df54e9f980aba",
-   "sha256": "0bd5jp1qy4d4v71jfn3qp7rfwfbjvsbcmk9c6m4dympv1w9dp56d"
+   "commit": "e1726f89dab1811a110eebb3f3e4b673742faf05",
+   "sha256": "02wwr40jxny9w0xnjwi4n40hn5jmdkkzng4rml846hw4ih1vxc0k"
   }
  },
  {
@@ -67556,8 +68093,8 @@
   "repo": "jinnovation/kele.el",
   "unstable": {
    "version": [
-    20240428,
-    2141
+    20240621,
+    2110
    ],
    "deps": [
     "async",
@@ -67569,13 +68106,13 @@
     "s",
     "yaml"
    ],
-   "commit": "ee667b6581113be21e7d24935cf8a431eb382432",
-   "sha256": "038zqsgbg4j7mrhw7rf61qp0bja2m675rhxk6y8bbnvkva8z24w9"
+   "commit": "2460094aede77054f3200c61d807a445e3b79c9a",
+   "sha256": "1izyfhabmlqhbn0zv0vxc8c2ncxs26qw17k4772gpksvxxa29i44"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
    "deps": [
@@ -67583,12 +68120,13 @@
     "dash",
     "f",
     "ht",
+    "memoize",
     "plz",
     "s",
     "yaml"
    ],
-   "commit": "642c415a833a7a2aa1fb577261b1e2ae0c4bbb72",
-   "sha256": "07yb4sdgzqwr7snpvmc72zvpc5aq37gmwbjq4b05rwcrhcv88kc6"
+   "commit": "beec4a76c090101d8a98e631c292207be3c3a6a1",
+   "sha256": "0h67jvvql9z969wzzxx8g2hnnzxw5p1wqc211258bgyxm6p25yzq"
   }
  },
  {
@@ -67758,26 +68296,26 @@
   "repo": "tarsius/keycast",
   "unstable": {
    "version": [
-    20240415,
-    1539
+    20240618,
+    1727
    ],
    "deps": [
     "compat"
    ],
-   "commit": "04fa2c65f0ae901ed3015f691ea70f7658ea24b8",
-   "sha256": "088grlq97g5csb1w84mjj7ffc3hjg55aa2i2km63xqx112l7h3m1"
+   "commit": "f04466cd8f8226715f113635204dc978171f63b7",
+   "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml"
   },
   "stable": {
    "version": [
     1,
-    3,
-    3
+    4,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c47fa154c756abd044da4a1353c30b978782f7dc",
-   "sha256": "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7"
+   "commit": "f04466cd8f8226715f113635204dc978171f63b7",
+   "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml"
   }
  },
  {
@@ -67861,26 +68399,26 @@
   "repo": "tarsius/keymap-utils",
   "unstable": {
    "version": [
-    20240415,
-    1539
+    20240628,
+    1857
    ],
    "deps": [
     "compat"
    ],
-   "commit": "06572084a7965b86262d7f1b52c32ed2dde86a9e",
-   "sha256": "1mlf3g1ywbh4xk5fv0nq9fw6c39xh9r87csr8c09dkrjlgp0fagn"
+   "commit": "6605cc638e22865f2c9b98345db4f9f52a2c3d2e",
+   "sha256": "012yhg74r52yx8ma8cid75i4hhqphx63lvjasrszkqmaxlqq2g5i"
   },
   "stable": {
    "version": [
     4,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5",
-   "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g"
+   "commit": "ff539a421f750e6e06ea38a6757461598f857a65",
+   "sha256": "1nb9s5v00r4kx39pa7z7b419xzlv108ilp6b9drx6wzsb1lil6fn"
   }
  },
  {
@@ -68053,20 +68591,20 @@
   "repo": "hperrey/khalel",
   "unstable": {
    "version": [
-    20240314,
-    1347
+    20240527,
+    527
    ],
-   "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f",
-   "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd"
+   "commit": "14ef50352394cd1d62b80bc17ab14f4f801f47cd",
+   "sha256": "017hw2mr810r7hxs8jvnf590n6van8w29ibryz9dwxszrij21gd7"
   },
   "stable": {
    "version": [
     0,
     1,
-    11
+    12
    ],
-   "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f",
-   "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd"
+   "commit": "14ef50352394cd1d62b80bc17ab14f4f801f47cd",
+   "sha256": "017hw2mr810r7hxs8jvnf590n6van8w29ibryz9dwxszrij21gd7"
   }
  },
  {
@@ -68107,28 +68645,28 @@
   "repo": "khoj-ai/khoj",
   "unstable": {
    "version": [
-    20240501,
-    1100
+    20240707,
+    1256
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad",
-   "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h"
+   "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112",
+   "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w"
   },
   "stable": {
    "version": [
     1,
-    12,
+    16,
     0
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad",
-   "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h"
+   "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112",
+   "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w"
   }
  },
  {
@@ -68992,8 +69530,8 @@
   "repo": "isamert/lab.el",
   "unstable": {
    "version": [
-    20240517,
-    1837
+    20240712,
+    2254
    ],
    "deps": [
     "async-await",
@@ -69004,8 +69542,8 @@
     "request",
     "s"
    ],
-   "commit": "fec1d5ad4e09c89c7260dc440f2dce6692b1ec0f",
-   "sha256": "0gfkxxdqli97x81pcxj1p3w1z6q5w7sn7q636hycrj97v3rdv8br"
+   "commit": "0528ca5c9e445700d7361b4263e85f618686fb38",
+   "sha256": "14qaz5grvkhy4sa6743qblg6b1r17zy5cpwsq1qxqml1kaliiv9q"
   },
   "stable": {
    "version": [
@@ -69285,11 +69823,11 @@
   "repo": "lassik/emacs-language-id",
   "unstable": {
    "version": [
-    20240510,
-    1342
+    20240609,
+    1616
    ],
-   "commit": "435114f208b97e97aa1576ef1966a33d90cad01b",
-   "sha256": "1gwdiyvzm3dz1dj5l763f1v68bb15g5qfmy5b9p58695l5hi135z"
+   "commit": "44452e4f7962aca41cc2539fce1d27799d6e656c",
+   "sha256": "1x87qrqyg12w5ncgv6592amp08bpdn4sybhwyf3nwfp8zpfficms"
   },
   "stable": {
    "version": [
@@ -69893,14 +70431,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20210816,
-    1107
+    20240618,
+    10
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "849b579f87c263e2f1d7fb7eda93b6ce441f217e",
-   "sha256": "00fnkk6hl9l64dgmkhsqibhna7gdpazs4j28f7833n1dmg626ki6"
+   "commit": "febda9969046019aae3bf3b7d1f042e9dbef2af9",
+   "sha256": "0d2va4hj66kq0v60caxvl20fpqvz5z9wv1rw54vp765ccslv7y05"
   },
   "stable": {
    "version": [
@@ -70087,11 +70625,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20240423,
-    445
+    20240709,
+    1803
    ],
-   "commit": "c66e3e9adfb5d91f83a401387fad345f12004c8a",
-   "sha256": "1i0rar36xzv2gqkn8cn29m5xz0pwmd5y5in8iac2h2fcxvd48vc5"
+   "commit": "17983be9e9de42eadccd50709ccc1d3c147e85ca",
+   "sha256": "008hb5d9xyq16mfgxg1hll4szf12q4r1i4p6kc3l7xc7ancb7vr6"
   },
   "stable": {
    "version": [
@@ -70179,15 +70717,15 @@
   "repo": "martianh/lem.el",
   "unstable": {
    "version": [
-    20240313,
-    1154
+    20240630,
+    1228
    ],
    "deps": [
     "fedi",
     "markdown-mode"
    ],
-   "commit": "48caf7b856efc0c98f5d735dc605fbe0db793ec5",
-   "sha256": "181n1ng8nlx3dkj9lhjjva80a9i4xz6lj3yajzmf36y2b35va6s9"
+   "commit": "2dc5036f0991db352948ea93ae895654c0fe775d",
+   "sha256": "0zf3wpzqxphzxlgvqhns4yf1aa6yfgkxi5r32wi2gcrwnd97qwqn"
   },
   "stable": {
    "version": [
@@ -70368,20 +70906,20 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20240304,
-    1034
+    20240713,
+    929
    ],
-   "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47",
-   "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c"
+   "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572",
+   "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
-   "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47",
-   "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c"
+   "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572",
+   "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3"
   }
  },
  {
@@ -70779,16 +71317,16 @@
   "repo": "emacs-vs/line-reminder",
   "unstable": {
    "version": [
-    20240101,
-    857
+    20240707,
+    730
    ],
    "deps": [
     "fringe-helper",
     "ht",
     "ov"
    ],
-   "commit": "91d8f57f11f5ddbb5e94cb23877c67a8f59d4d8c",
-   "sha256": "0pvyfnf7qy6m0gwbmr74lvmrki6cpm9k836bbrsjdh7rip4k6xrq"
+   "commit": "9c9248aff4aca8ae09fdcf391a315569d9ed4c65",
+   "sha256": "1xhlrb2wxm9pny79bs6cclmn72bhm1xh4brvqbxk4wannj3w4zkc"
   },
   "stable": {
    "version": [
@@ -70899,11 +71437,11 @@
   "repo": "martianh/lingva.el",
   "unstable": {
    "version": [
-    20220910,
-    1435
+    20240607,
+    1120
    ],
-   "commit": "6c33594068fa33de622172503deeec6778d9c744",
-   "sha256": "0r2f4wrd2v67m7198z0194pg853hbq4vvpd3x96y5ikbypywf426"
+   "commit": "c4cd68fb3ab1ebf419be0ec92b77d9feac921a87",
+   "sha256": "18kl31d5cxxj990vi11b9k0q2hhkchgb5d326h9v912d0bv64qfm"
   }
  },
  {
@@ -70937,14 +71475,14 @@
   "repo": "noctuid/link-hint.el",
   "unstable": {
    "version": [
-    20240409,
-    1250
+    20240626,
+    1159
    ],
    "deps": [
     "avy"
    ],
-   "commit": "9ead085e9e6798ec4ea4791d9906d6655ea2b402",
-   "sha256": "055p9p6qnzhnlm97gnbjwk1dls796zsbsvcphlivkx4zlval099w"
+   "commit": "391930f2010014b9b5bc16bb431db01dd21ca7bd",
+   "sha256": "05arbdh5z3hk9z1h0yyafx51hakm9xgsdf8l1ha4bw686r83zxh6"
   }
  },
  {
@@ -70955,11 +71493,11 @@
   "repo": "erickgnavar/linkode.el",
   "unstable": {
    "version": [
-    20200607,
-    2152
+    20240604,
+    53
    ],
-   "commit": "e31bdae11ff38b736b1869fbe94920e862f29794",
-   "sha256": "1klzqwnfb8f33ycx9nhlmbmmy61lgq1nqkkwr7s2gb9y0bxgfzzl"
+   "commit": "5152aa3ba7a4360133efd5892f0891837af30440",
+   "sha256": "0c9ly7lf1ydn3zjqn265vkjq4n4qn3xvr4lhs66gh2krk8qrm9cm"
   }
  },
  {
@@ -71659,11 +72197,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20240419,
-    404
+    20240602,
+    513
    ],
-   "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7",
-   "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx"
+   "commit": "65eb99ca34c306c9f495ac199b9365f46f50ff03",
+   "sha256": "13d657gdviw6k61ivq8gd8hmapp968bq3vk82giih703isx065md"
   },
   "stable": {
    "version": [
@@ -71773,11 +72311,11 @@
   "repo": "tarsius/llama",
   "unstable": {
    "version": [
-    20240520,
-    1947
+    20240609,
+    1445
    ],
-   "commit": "cea812d16129749deb524771e615a4a831604a83",
-   "sha256": "1wlc1m9w5s03w91i132yzxbd93pdfnxsf0pq56pfsl6xvrqbj82k"
+   "commit": "485949eb0122203b388a2de3a46a7a770a2cb622",
+   "sha256": "1rh3nm9s10pq3l4nyz89f79l5nzrsp6k7p5hlkjqxbk5f6sgcmii"
   },
   "stable": {
    "version": [
@@ -71951,11 +72489,11 @@
   "repo": "fourier/loccur",
   "unstable": {
    "version": [
-    20210224,
-    2041
+    20240610,
+    1830
    ],
-   "commit": "01b7afa62589432a98171074abb8c5a1e089034a",
-   "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2"
+   "commit": "f47c53a24a9d262898517c71284337821dad7ea9",
+   "sha256": "08slwg063x51c2dm742sd7nlq5zf20xrdyprwk3irdanpn9skxjb"
   }
  },
  {
@@ -71973,6 +72511,30 @@
    "sha256": "0sm73w2in65kdb68m9w3jrr5pa392x75bv063r8cdhy868031l49"
   }
  },
+ {
+  "ename": "loco",
+  "commit": "80862bea5a620c338af456f1daff6de13f7650de",
+  "sha256": "0r67b3fd91w6nvifc3hydiihh2456sfiq5wr98shbd76b1zgimjw",
+  "fetcher": "github",
+  "repo": "csmclaren/loco",
+  "unstable": {
+   "version": [
+    20240712,
+    1721
+   ],
+   "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63",
+   "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    12
+   ],
+   "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63",
+   "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm"
+  }
+ },
  {
   "ename": "lodgeit",
   "commit": "c82e72535aefade20e23e38931ca573e3459401e",
@@ -72350,16 +72912,17 @@
   "repo": "okamsn/loopy",
   "unstable": {
    "version": [
-    20240310,
-    50
+    20240708,
+    156
    ],
    "deps": [
     "compat",
     "map",
-    "seq"
+    "seq",
+    "stream"
    ],
-   "commit": "de9a2933f4794d13236236db6165403d722e5105",
-   "sha256": "0ngmp81jd9fnvninw0v52535570np5jy194jwfqz6sp7b7394ijv"
+   "commit": "1c2a2164f24174a87194649f0286e0432594c84d",
+   "sha256": "1hrzyh6lzxl4pl8sg4lkqz3840pw3ngm3zlpq66qnwxqkq11dcsk"
   },
   "stable": {
    "version": [
@@ -72628,15 +73191,15 @@
   "repo": "emacs-lsp/lsp-haskell",
   "unstable": {
    "version": [
-    20231011,
-    1723
+    20240705,
+    832
    ],
    "deps": [
     "haskell-mode",
     "lsp-mode"
    ],
-   "commit": "89d16370434e9a247e95b8b701f524f5abfc884b",
-   "sha256": "0j1a6c1vz57xvk64n32qlaqwpvg91zh14ik7ajpyb7xm8gbw5ahv"
+   "commit": "1d15706321ac86ce2275442fe67c2778ecb567a6",
+   "sha256": "0y56l4ln8l5cg2jidr2vvr3ri729si88yfpfv72zf5dmzvyhlgar"
   }
  },
  {
@@ -72698,8 +73261,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20240501,
-    1928
+    20240524,
+    2207
    ],
    "deps": [
     "dap-mode",
@@ -72711,8 +73274,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "37c95ef7e992001250d893277acfccf4af0099b4",
-   "sha256": "172mp8na5w3dc7k6rl543dar85siz15vlhqidinim8hg9c4v6xqz"
+   "commit": "4909c14b9012eed669a9c3f11a8df055d5bb8a0e",
+   "sha256": "0qw824vdqk92r8hrrjsi7pd00rw60wf5jfjk1x3nhs06hijs0x0s"
   },
   "stable": {
    "version": [
@@ -72932,8 +73495,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20240514,
-    1430
+    20240711,
+    212
    ],
    "deps": [
     "dash",
@@ -72944,8 +73507,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a",
-   "sha256": "17r4jg0i9df74bbphi4809l3q3mqy462syw5msf0sjv7k0f5fml0"
+   "commit": "52987755175042b9569e32d72ae29eba119020d6",
+   "sha256": "0sj9by3xnpc8xdj7df3x2lfkv32hwq9bakcdyyjhzaydkivsqd6s"
   },
   "stable": {
    "version": [
@@ -73093,16 +73656,16 @@
   "repo": "emacs-lsp/lsp-pyright",
   "unstable": {
    "version": [
-    20240416,
-    610
+    20240710,
+    611
    ],
    "deps": [
     "dash",
     "ht",
     "lsp-mode"
    ],
-   "commit": "b891a5071fcb4371d7d817069cbb04f5bd160468",
-   "sha256": "1qiqbjvp315m7mjsyj1ab53fpk6m6qn6pjzkxls1m0rmmjmszzg4"
+   "commit": "b3ed995c335e4195f35322645c2624fdd95673fb",
+   "sha256": "0f8rg6p81rqsglzpgkm97sixgzp76hn0j54q4krrs2gm0cs1651b"
   },
   "stable": {
    "version": [
@@ -73238,16 +73801,16 @@
   "repo": "emacs-lsp/lsp-sonarlint",
   "unstable": {
    "version": [
-    20230814,
-    1954
+    20240628,
+    2255
    ],
    "deps": [
     "dash",
     "ht",
     "lsp-mode"
    ],
-   "commit": "d131779950d5d45c3129eb088cef5fd11099f47c",
-   "sha256": "0qr9cmk148rcvn0swnvhicyy89n6lw8gkchxvvd8lwwl4ky6x9pb"
+   "commit": "043bda7b2210440169a4a551e16ae9a093a14589",
+   "sha256": "00f6sm8z54jl2vka5nyx73qh7lq3d1j565w1jxy98jfvxfjw8jq1"
   },
   "stable": {
    "version": [
@@ -73918,8 +74481,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240522,
-    204
+    20240711,
+    2313
    ],
    "deps": [
     "compat",
@@ -73930,8 +74493,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70",
-   "sha256": "1xghq21qqjb2b31i75rd7j0h4fk7242vhbq976q1hls5j7a7x2mr"
+   "commit": "7b4ab4348ea9ab1022a2717c2bcada62575bf091",
+   "sha256": "1192369nkxb42mfv0bwbjmdmbyg4k624kw6xsycihm0xs7691kzz"
   },
   "stable": {
    "version": [
@@ -74047,30 +74610,30 @@
   "repo": "gekoke/magit-file-icons",
   "unstable": {
    "version": [
-    20240520,
-    216
+    20240627,
+    1228
    ],
    "deps": [
     "el-patch",
     "magit",
     "nerd-icons"
    ],
-   "commit": "d85fad81e74a9b6ce9fd7ab341f265d5a181d2a8",
-   "sha256": "1q03a4zzb2nvxgm84jj3wm4067hp2n4894xmxhc98w981vli41qm"
+   "commit": "861670d448df4fba6fb993941d41953cee230a7b",
+   "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0,
-    2
+    0
    ],
    "deps": [
     "el-patch",
     "magit",
     "nerd-icons"
    ],
-   "commit": "33458112ae3701a82a02a4b88dd52baef48ababe",
-   "sha256": "1whx00jp2rgad2f3zir7qmhjpspsx6zs2hk8wlkv4hlsv9s1knpa"
+   "commit": "861670d448df4fba6fb993941d41953cee230a7b",
+   "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b"
   }
  },
  {
@@ -74233,6 +74796,40 @@
    "sha256": "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"
   }
  },
+ {
+  "ename": "magit-gitlab",
+  "commit": "421a510ea3876c1787ddd46041174190b82a053b",
+  "sha256": "1xm7hxzwg4bq0mjlix1wnqsmz21h1clfsgqngpmawk04628ga01s",
+  "fetcher": "gitlab",
+  "repo": "arvidnl/magit-gitlab",
+  "unstable": {
+   "version": [
+    20240707,
+    1506
+   ],
+   "deps": [
+    "ghub",
+    "magit",
+    "transient"
+   ],
+   "commit": "6f10468f9091d02aa6f1ce4af914443209a7d2a5",
+   "sha256": "0c8wf5cywfqjjhdylcdrb0xq4pp2larfxxiicwp04ffapyq0z5bb"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "ghub",
+    "magit",
+    "transient"
+   ],
+   "commit": "cca91ae8b192bb5b50361aab1f94f4ff2bf9e969",
+   "sha256": "12fma78fv3fp1cmazddll4jp4f1waigsmw55mdi3j6z58m3af6xh"
+  }
+ },
  {
   "ename": "magit-gptcommit",
   "commit": "674e68c28ee0e12e6f2b217b7d140eae22473d16",
@@ -74241,16 +74838,16 @@
   "repo": "douo/magit-gptcommit",
   "unstable": {
    "version": [
-    20240406,
-    807
+    20240625,
+    356
    ],
    "deps": [
     "dash",
-    "gptel",
+    "llm",
     "magit"
    ],
-   "commit": "3584b1036574c704e5bae04274b8849590a097b0",
-   "sha256": "1rfiaqdpkf9xh57gf4vsz65f2mnhzxyadddwxyk1yfzan1il7j01"
+   "commit": "91b23fde4a880566a4e493240865e3582cad7306",
+   "sha256": "0zbj8bk3vdzfpih8242gan7a8i4gkmixxzs952mm15wg2fd98gm5"
   }
  },
  {
@@ -74475,15 +75072,15 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240508,
-    2349
+    20240710,
+    2125
    ],
    "deps": [
     "compat",
     "dash"
    ],
-   "commit": "855d924969eb6231d62ab446f727c9f7ad5c4913",
-   "sha256": "0x13wwm6f93qvaqq7qlx97ahvbvgkqf2xdq7vjn6wm9h2mdkw4hh"
+   "commit": "804c623cf6fa50a291273f582e3355fde408239b",
+   "sha256": "0ml7vg70c7yqn3qy4zjx17psk0cfxp8nj8ck90y9piq6a1kpxwdg"
   },
   "stable": {
    "version": [
@@ -75303,14 +75900,14 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20240404,
-    451
+    20240710,
+    953
    ],
    "deps": [
     "compat"
    ],
-   "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc",
-   "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0"
+   "commit": "40534231fd2805aa17ba3c59fd57e6a34b5a526b",
+   "sha256": "0jvd8vjhwvjv9f2h16dqc3c8ax3mdcfak5lik0p8m8kfzrb4grl1"
   },
   "stable": {
    "version": [
@@ -75445,11 +76042,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20240501,
-    1057
+    20240626,
+    826
    ],
-   "commit": "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89",
-   "sha256": "09v1vkj02l58kz74rqh3vdfy75gi48pvcaz99k9i54wncy61bv5j"
+   "commit": "8aab017f4790f7a1e0d8403239cce989c88412f6",
+   "sha256": "11922fkzsglvmfqzz0vzkg6w7q83qb0fkv2q7xlp1xi995041wqp"
   },
   "stable": {
    "version": [
@@ -75790,28 +76387,28 @@
   "repo": "martianh/mastodon.el",
   "unstable": {
    "version": [
-    20240521,
-    1721
+    20240701,
+    1604
    ],
    "deps": [
     "persist",
     "request"
    ],
-   "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e",
-   "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6"
+   "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53",
+   "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8"
   },
   "stable": {
    "version": [
     1,
     0,
-    21
+    24
    ],
    "deps": [
     "persist",
     "request"
    ],
-   "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e",
-   "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6"
+   "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53",
+   "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8"
   }
  },
  {
@@ -76434,11 +77031,11 @@
   "repo": "gvol/emacs-memento-mori",
   "unstable": {
    "version": [
-    20240429,
-    327
+    20240702,
+    2332
    ],
-   "commit": "424dc591b3dd8fe7f2f3ddef1baa647aa2b0cc7e",
-   "sha256": "1drsc9akr48q5bxrw43fs2lqjp5cdf2nxvng0nvr5v4xvckd1a9x"
+   "commit": "c53707871aa5aeb551c6b9c02bdca6f477bc9c5b",
+   "sha256": "1g70dsfm678jg8r7sg4661w9af0wqdl4csxg6vb76f4n44jy7zvb"
   },
   "stable": {
    "version": [
@@ -76535,11 +77132,11 @@
   "repo": "meow-edit/meow",
   "unstable": {
    "version": [
-    20240407,
-    1642
+    20240712,
+    2221
    ],
-   "commit": "99e08c92bb5d8a695062ce53e2cffeffd3a058a6",
-   "sha256": "12fp6bj38a4rcxrra4w50wb4qrl5jbw1wyp5hhx26ayh99ajaigi"
+   "commit": "369014fd92e44f4cec54a78fa9be11d35b44f277",
+   "sha256": "0aj3hhdff5vbp97j09ch5ajdhdmnvr0gbj0f2xibqxyb8k1pp9jk"
   },
   "stable": {
    "version": [
@@ -76551,6 +77148,36 @@
    "sha256": "0xv6wg4lyi5bv68h5hk5hfxdwxa2g3ybxd8z0l420az4rnhr6zhq"
   }
  },
+ {
+  "ename": "meow-tree-sitter",
+  "commit": "58128354525e09c1707eddd11d34edbe53501a68",
+  "sha256": "0kf47gs65ssazf4xgn39wwkymwf7w4mqq4n9s87g7y20pa7p1b69",
+  "fetcher": "github",
+  "repo": "skissue/meow-tree-sitter",
+  "unstable": {
+   "version": [
+    20240701,
+    1422
+   ],
+   "deps": [
+    "meow"
+   ],
+   "commit": "d8dce964fac631a6d44b650a733075e14854159c",
+   "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "deps": [
+    "meow"
+   ],
+   "commit": "d8dce964fac631a6d44b650a733075e14854159c",
+   "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x"
+  }
+ },
  {
   "ename": "merlin",
   "commit": "17598d9a0e9f88db28014019769f3181c863e99e",
@@ -76559,11 +77186,11 @@
   "repo": "ocaml/merlin",
   "unstable": {
    "version": [
-    20231201,
-    918
+    20240604,
+    1521
    ],
-   "commit": "ad9955c76b1cb031e847e139c5cf7b7cc5cb4696",
-   "sha256": "08p6zx4swycc4wi5rhynyip24skwhg0y1zlz4krrs9ar6m2lmfwm"
+   "commit": "bd900fd6cda97cfd10f2bf520848d0a8b0fe35b7",
+   "sha256": "1866y962v1xpw5klwn9sx8fvfhxg9w5sdj66nms815qkrkd3gvmk"
   },
   "stable": {
    "version": [
@@ -76752,11 +77379,11 @@
   "repo": "wentasah/meson-mode",
   "unstable": {
    "version": [
-    20240218,
-    1834
+    20240601,
+    1647
    ],
-   "commit": "c8f4fbf075bb5db2bc0872afe02af2edac075e4e",
-   "sha256": "135glcrnbr7wmrygrngsxpma8bxajpxlanbkvk08v92p7ar6a21j"
+   "commit": "0449c649daaa9322e1c439c1540d8c290501d455",
+   "sha256": "0mmz5rqb0v668indj132kaiws1lcm1pw81pmq2nwx0d043dsci8k"
   },
   "stable": {
    "version": [
@@ -77055,8 +77682,8 @@
   "repo": "danielsz/meyvn-el",
   "unstable": {
    "version": [
-    20231213,
-    230
+    20240628,
+    2350
    ],
    "deps": [
     "cider",
@@ -77067,16 +77694,25 @@
     "projectile",
     "s"
    ],
-   "commit": "3afb0a4283afd4f63ef7fdd48eb5da972421fd7a",
-   "sha256": "1flxvaj8j5kg4r0cvns8z1xixgvsavq1i27z28j97m8dmndihihf"
+   "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76",
+   "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk"
   },
   "stable": {
    "version": [
     1,
-    0
+    3
    ],
-   "commit": "3119214ff45db630789f9371f956d5ac06229b1d",
-   "sha256": "0mnvc3f56x4icrqmc4kx6bzc9vac40f020npimdgiylbmyxj97vn"
+   "deps": [
+    "cider",
+    "dash",
+    "geiser",
+    "parseclj",
+    "parseedn",
+    "projectile",
+    "s"
+   ],
+   "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76",
+   "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk"
   }
  },
  {
@@ -77284,11 +77920,11 @@
   "repo": "erikbackman/mindre-theme",
   "unstable": {
    "version": [
-    20220827,
-    1031
+    20240610,
+    2131
    ],
-   "commit": "fc9ab1ba03494f2fb8cb8dc4e2ba5120ae35eb31",
-   "sha256": "1xqaxrzq7ws8ilbcmx5kb7g7xhch91lb9cisjydmi0xcfv34sxah"
+   "commit": "cbecece36988f83b7e355a3fcf5229f2494f3688",
+   "sha256": "1xhql4wy7r5f8bx4k1293gawbw83agf1s6va073q1pxqd94rjk6y"
   }
  },
  {
@@ -77361,28 +77997,28 @@
   "repo": "liuyinz/mini-echo.el",
   "unstable": {
    "version": [
-    20240518,
-    849
+    20240612,
+    1328
    ],
    "deps": [
     "dash",
     "hide-mode-line"
    ],
-   "commit": "4e2918225bea7fa7d232260bd0b2de48df68c6f8",
-   "sha256": "1bccmx0sd7qjfgd1p8yskw12phxc89arbiz064xk9jcl1cxaz57x"
+   "commit": "802321f0658b364d4e9d90a4ac43959d46048015",
+   "sha256": "1jkv1bhgiznxaj1jy8si505k86179wdnwipcqr2bgqckpr5dg7rk"
   },
   "stable": {
    "version": [
     0,
-    9,
-    2
+    11,
+    1
    ],
    "deps": [
     "dash",
     "hide-mode-line"
    ],
-   "commit": "f0feae3bbd0becd79ea086d4a1b811162470b162",
-   "sha256": "1wz5ssp480zlfxdvgywxx72gkf7mldrd4gxah18ys09yycawa0hi"
+   "commit": "b556c0fa68dad76a478bd3f508e0501aa6933689",
+   "sha256": "1n00jpr6hyv1hwx36whpim6kzrybk236fhzj6dgnm6icarfmfzfa"
   }
  },
  {
@@ -77592,26 +78228,26 @@
   "repo": "tarsius/minions",
   "unstable": {
    "version": [
-    20240415,
-    1544
+    20240618,
+    1732
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ef234da0625397b994c0a17d1038037732c3c457",
-   "sha256": "1zd1gjg16yggmccpvv7fv32pfmh2a6227p21q2vdh8f1p0bwm10p"
+   "commit": "4566325917791b878430526f42349a644b03089d",
+   "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "62948a4a2951dab0716977421bfe0a87ea2583c5",
-   "sha256": "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m"
+   "commit": "4566325917791b878430526f42349a644b03089d",
+   "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g"
   }
  },
  {
@@ -77760,28 +78396,28 @@
   "repo": "liuyinz/mise.el",
   "unstable": {
    "version": [
-    20240514,
-    452
+    20240707,
+    1428
    ],
    "deps": [
     "dash",
     "inheritenv"
    ],
-   "commit": "cb19405eba3cfd679a5e3ac75c8c4c1146b16015",
-   "sha256": "0h0xkps9m1g7q21hij23rli7jq1ygzc74h8fn9am9rmj4dgy5dkg"
+   "commit": "20179a58132e5518a0868eac01dcd1d72db2e254",
+   "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp"
   },
   "stable": {
    "version": [
     0,
-    1,
+    3,
     0
    ],
    "deps": [
     "dash",
     "inheritenv"
    ],
-   "commit": "e2db0d204890721e372ed89deb554d9a75385486",
-   "sha256": "02j067pyqf2xx48qg383wvhk267pj9wd6ckv1azsa20cm713bph4"
+   "commit": "20179a58132e5518a0868eac01dcd1d72db2e254",
+   "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp"
   }
  },
  {
@@ -77872,20 +78508,20 @@
   "repo": "jdtsmith/mlscroll",
   "unstable": {
    "version": [
-    20240420,
-    1515
+    20240606,
+    1855
    ],
-   "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16",
-   "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss"
+   "commit": "805d913771270f8157730f634108a237ca03137e",
+   "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4"
   },
   "stable": {
    "version": [
     0,
-    1,
-    10
+    2,
+    1
    ],
-   "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16",
-   "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss"
+   "commit": "805d913771270f8157730f634108a237ca03137e",
+   "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4"
   }
  },
  {
@@ -78215,26 +78851,26 @@
   "repo": "tarsius/mode-line-debug",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240618,
+    1733
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0ff591110c9db0bbc1372234902e28486c168a86",
-   "sha256": "0whjiadyygq8i3mf325zha8jl6hxm1q44rwvmlzvxzmjm42ag2gg"
+   "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b",
+   "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj"
   },
   "stable": {
    "version": [
     1,
     4,
-    2
+    3
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8e58bd51f1a8292c5df92e75a8c4a470e11a03e4",
-   "sha256": "157zssn9f5jd1b011x66ii97vmd9a16ng556xwlbnmqkcw2w42gq"
+   "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b",
+   "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj"
   }
  },
  {
@@ -78389,11 +79025,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20240505,
-    331
+    20240709,
+    638
    ],
-   "commit": "d2762db19ed48bd0cbba61c41940be479760a35e",
-   "sha256": "1y8z4yfnqic9gg2nm0rqldhwkfz134zxv1x57x3jh9k04p1nblc1"
+   "commit": "a9f709e3448ff3def66328db74f5ca41366da957",
+   "sha256": "1ybhq9xpm3p7h9nk2a9069b7sw8v0qvwjjk1447gf26p5ah39dgl"
   },
   "stable": {
    "version": [
@@ -78580,11 +79216,11 @@
   "repo": "ideasman42/emacs-mono-complete",
   "unstable": {
    "version": [
-    20240421,
-    1234
+    20240627,
+    317
    ],
-   "commit": "3cb92a75cf20e1a5394e77e0e44a6b1c14cf315b",
-   "sha256": "1jzjy4pwwlyphj0warfywfqm2025wfkb8hvnn0478j26hs7141xs"
+   "commit": "3db3fa4ff88fc77fb56a54eee345bf326e0fa963",
+   "sha256": "0il28846vkql28a0dxsfncji9i2zmbqy4y6mdh4hbhg6xl16qbvk"
   }
  },
  {
@@ -78640,11 +79276,11 @@
   "repo": "oneKelvinSmith/monokai-emacs",
   "unstable": {
    "version": [
-    20240324,
-    1830
+    20240710,
+    1027
    ],
-   "commit": "df6c23d14e52f9d7f5bc2265facfbedfb07a444e",
-   "sha256": "0l0cc5qxr9fg7qs2fs2yk0nbgm6xnp2i0wvyxdnjzz6mz6c84ngk"
+   "commit": "9222cdf8209f0c3329f857ccb9edc1c79b06041a",
+   "sha256": "19zv7q9ixrvf3qbfj8xchcn7n0in6rpnkl4dd2vzbvic2lhg7nnr"
   },
   "stable": {
    "version": [
@@ -78751,26 +79387,26 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20240520,
-    1715
+    20240618,
+    1736
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1faf8c16073bb62ade53906eef549ed8ac79ae70",
-   "sha256": "1jbly23pr5lhgd9i6c0619v9pfrppk6614czf0wvz8ibkgdwsk2c"
+   "commit": "7f7d390bd082c0786cc52618866905f28e31ec98",
+   "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "888e6fb37eb5122803c70ae60d28fc54589e26c0",
-   "sha256": "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z"
+   "commit": "7f7d390bd082c0786cc52618866905f28e31ec98",
+   "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03"
   }
  },
  {
@@ -78878,26 +79514,26 @@
   "repo": "tarsius/morlock",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240618,
+    1737
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ea728ba7dbae47d8516a6026038c305092d38078",
-   "sha256": "0qa4i6hx9xljrmhds7xfnyq391p7hkzdmkfa16yhfs75479dw805"
+   "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0",
+   "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf"
   },
   "stable": {
    "version": [
     1,
-    0,
-    5
+    1,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b7e2066a69c059c5d4c72e829b615a6b15cef4dc",
-   "sha256": "03q388lkbs1fx0x0wb0n06f9bfl4k67qvbhkxkw59kdlhxi7qwqm"
+   "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0",
+   "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf"
   }
  },
  {
@@ -78959,6 +79595,29 @@
    "sha256": "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5"
   }
  },
+ {
+  "ename": "most-faces",
+  "commit": "30ccf0c8f688679815bfebaed6a5c122f9fb6616",
+  "sha256": "1fjr0jb1n8p4jlp1sdf338yj9iq5pmgwc2j4ljrhwzvp90szag6f",
+  "fetcher": "codeberg",
+  "repo": "mekeor/most-faces",
+  "unstable": {
+   "version": [
+    20240620,
+    2145
+   ],
+   "commit": "846ca6db64527fe26d21421b8eaf7a63d8844c3e",
+   "sha256": "1r3gzrryd1pnhplnwzgh9x31hmm8bw9fys2mqfr40sbwzqphsdna"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "commit": "e37cd1baa74f1bdf3230a9174e5c6cde73e3474c",
+   "sha256": "0yr6r7dxrkh3r7sh7qwgd33px1ckxqxjbjxcz5frdbvxlhg0npp7"
+  }
+ },
  {
   "ename": "most-used-words",
   "commit": "934e64df7fba95b6dc06e76382013dc4a9ced82f",
@@ -79115,6 +79774,30 @@
    "sha256": "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g"
   }
  },
+ {
+  "ename": "mowie",
+  "commit": "e995f6ce91c578a14966092246b6f48729500c10",
+  "sha256": "071agnqd4m3hzy3dh8plg7xk66n2b5ampa0djmf47lwnyy15va76",
+  "fetcher": "codeberg",
+  "repo": "mekeor/mowie",
+  "unstable": {
+   "version": [
+    20240626,
+    717
+   ],
+   "commit": "5236a231c172ffe3a831bb649031f4a1aaec5b15",
+   "sha256": "0kz0av456mzp3cblvkdwr6l6xwi9ibw7jhd7wjfypjajz5bzb9d1"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "commit": "7b826c751014a294b493a6bfebe1cda6a1832ab0",
+   "sha256": "19k89z6ji2j99q72b3dc28w2d9pqhcfwnzfll1yqd8sc1dkkd03k"
+  }
+ },
  {
   "ename": "mozc",
   "commit": "30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c",
@@ -80585,11 +81268,11 @@
   "repo": "kenranunderscore/emacs-naga-theme",
   "unstable": {
    "version": [
-    20240327,
-    819
+    20240607,
+    1946
    ],
-   "commit": "a044e5eb5bf9bbefe34982ae9cc80ac9739a3e58",
-   "sha256": "13m17vwwrcs44xhzkh80nssgsn9p84f5vl50zk4y1712d087pc0d"
+   "commit": "84b28f3f5dcdd03205d5ff4764704806019ff332",
+   "sha256": "14816rkx6xws5gx9az4g3dk06cg8wpa3zc2iixyr4q6qc9xbp6yq"
   }
  },
  {
@@ -80934,11 +81617,11 @@
   "repo": "skeeto/nasm-mode",
   "unstable": {
    "version": [
-    20190410,
-    342
+    20240610,
+    1505
    ],
-   "commit": "65ca6546fc395711fac5b3b4299e76c2303d43a8",
-   "sha256": "00rv6m004hcsn71hv3p3rxmrpwajdy02qpi2ymhxx2w3r49ba562"
+   "commit": "7079eb4ce14d94830513facf9bf2fca9e030a4d1",
+   "sha256": "1dacd8yvbl6arvrxwdjws42nnvwflvwxz366y295izf00pl0knaj"
   },
   "stable": {
    "version": [
@@ -80958,11 +81641,11 @@
   "repo": "CeleritasCelery/emacs-native-shell-complete",
   "unstable": {
    "version": [
-    20231218,
-    316
+    20240628,
+    1901
    ],
-   "commit": "56b20b414a9298f45b0923edf633c7153b97892b",
-   "sha256": "0d4h36ns13fra744nhk9azxqmxw14fwn908i3f1h2f4ll3hqbpfa"
+   "commit": "14e0a434cffa5688992b30d1b29bb21c561f8cd0",
+   "sha256": "14zrrvwppv12wj6rrp1agsmbpx9cmx1zr03jpc9162xz7sdq1szk"
   }
  },
  {
@@ -81186,20 +81869,20 @@
   "repo": "babashka/neil",
   "unstable": {
    "version": [
-    20240402,
-    1032
+    20240701,
+    1458
    ],
-   "commit": "9a795828e4c201a47c5851157868c06f2ca37448",
-   "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2"
+   "commit": "054ca51542837fec87e289a74ab139b4ae6e108b",
+   "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb"
   },
   "stable": {
    "version": [
     0,
     3,
-    65
+    67
    ],
-   "commit": "9a795828e4c201a47c5851157868c06f2ca37448",
-   "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2"
+   "commit": "054ca51542837fec87e289a74ab139b4ae6e108b",
+   "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb"
   }
  },
  {
@@ -81287,11 +81970,11 @@
   "repo": "rainstormstudio/nerd-icons.el",
   "unstable": {
    "version": [
-    20240520,
-    1050
+    20240524,
+    311
    ],
-   "commit": "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e",
-   "sha256": "0x0zipfdm6w861kmw3jjjsc1jqxdw0ggpylvwxbgbspfngl83awj"
+   "commit": "3dac80b712fb3043ec2bd7510f587548074484a3",
+   "sha256": "1nf6hjjkp6r9cnf6gzb2hsxp1z638b04h4yl5gsl0knby3zpip1x"
   },
   "stable": {
    "version": [
@@ -81594,11 +82277,11 @@
   "repo": "vekatze/neut-mode",
   "unstable": {
    "version": [
-    20240414,
-    2254
+    20240610,
+    2326
    ],
-   "commit": "e75f5f6bbcab4c042f331fcb2d0a628516cfec5f",
-   "sha256": "16iv3vn3inwjh29zk00w1l1cm8jqp96n2hrkgpmhcj0kbliy298h"
+   "commit": "c723e0a2e1f14b7f41d824ca354b0590399e2bc0",
+   "sha256": "0gcw7s3phyyidll37dm7cfrrvj7b7j5iqsbam5a0lpbi1p38rnlj"
   }
  },
  {
@@ -81922,11 +82605,11 @@
   "repo": "ninja-build/ninja",
   "unstable": {
    "version": [
-    20230421,
-    1748
+    20240528,
+    1945
    ],
-   "commit": "adf9bddd73869084a505fac83246e55c35880079",
-   "sha256": "1p6nrqsjlpr1kkndihdkjl9cm37xblaky3jda6484y6d51mixgrv"
+   "commit": "0b4b43aa3e2fee391443dcc0c961c9d2354d8954",
+   "sha256": "1g779g7x1d0f7vi7d2sraqmd9zsccnmglp9fn7w5146swqpgsvqp"
   },
   "stable": {
    "version": [
@@ -82090,11 +82773,11 @@
   "repo": "nix-community/nix-ts-mode",
   "unstable": {
    "version": [
-    20240514,
-    1605
+    20240710,
+    1039
    ],
-   "commit": "49d890e86a4597911366208930af6457ce1d46e7",
-   "sha256": "1s2kcm8rg35cl3vgbqny0ac2l00nqj5xdpll4z0is7zbhib74ll5"
+   "commit": "59ad17690576190811e0746c12ad6809596ca3ac",
+   "sha256": "0c9hxvh8v1pz4ni087dw84wzr7db057fgb37rk1qhjca0yq01mhf"
   },
   "stable": {
    "version": [
@@ -82291,8 +82974,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20230705,
-    1328
+    20240629,
+    2347
    ],
    "deps": [
     "anaphora",
@@ -82302,8 +82985,8 @@
     "s",
     "virtualenvwrapper"
    ],
-   "commit": "221963fb0b7116729829145f055ed750d0e2f961",
-   "sha256": "1sha2sdamq583xaaiqx40vl12ahbsk93ksx7xwp5mmvgsns7wppk"
+   "commit": "f8e26834b523c03dfcb0c751373123ffd32b8522",
+   "sha256": "1a0b0dk578kw33qgfbb4zvqnc4cmix4mfwrlqy2rcg13z3ax39c7"
   }
  },
  {
@@ -82334,14 +83017,14 @@
   "repo": "ranmaru22/no-clown-fiesta-theme.el",
   "unstable": {
    "version": [
-    20231214,
-    2115
+    20240708,
+    1611
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "0cd04a72aa5dcf61e82e2a613670334816326b02",
-   "sha256": "0ly95561skwfkn3kpv3269ffk7sd6p92dm1q6p4cq2fbm3v0w6xd"
+   "commit": "857c6261b6047855c9ccb4e9af3ba6b456566fd5",
+   "sha256": "12d7fzax3nkn2mnhaq980zkfmwzy5spa2shgam7pq5y5ay0bi754"
   }
  },
  {
@@ -82367,26 +83050,26 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240624,
+    1447
    ],
    "deps": [
     "compat"
    ],
-   "commit": "554d890c5d5b59ebcf83c67256d0012e23cd07f0",
-   "sha256": "0x0dk7yvrzcw1pjn86gqck5ksg48dnipvwir6va20i7cgi060qfy"
+   "commit": "f45335ede7c1246f922816610139face112e236b",
+   "sha256": "010ldsn75xrbjj82115gxib150knj9q76k1jwpz1rd1alx0l16qj"
   },
   "stable": {
    "version": [
     1,
-    5,
+    7,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1773beeb23c43ce52428957814a2be62532870f8",
-   "sha256": "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr"
+   "commit": "9078334e44393696c78c6acb4484480fd4cf4b5d",
+   "sha256": "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4"
   }
  },
  {
@@ -82636,6 +83319,29 @@
    "sha256": "1hhhspkxpgr8sa12bvahq4i4dl3apjwar2ais6lkpplknqzr2ddw"
   }
  },
+ {
+  "ename": "noman",
+  "commit": "e3c3445e29450f72a13543c888da5488b6fc2e08",
+  "sha256": "0g8l6clky05qxl7ql6nrkfvpfhl9p2m8r60kjmygm0p61z6brmnl",
+  "fetcher": "github",
+  "repo": "andykuszyk/noman.el",
+  "unstable": {
+   "version": [
+    20240610,
+    1145
+   ],
+   "commit": "61ab9c52273fc03b28881a5ce814b863cf050571",
+   "sha256": "0lxvl8mmmk01i14x7jjn3cq55620x420vxzsrqnbsmcpgzn5g6l5"
+  },
+  "stable": {
+   "version": [
+    0,
+    6
+   ],
+   "commit": "953e3761b05874dee49952fad63ce1cb3c91d707",
+   "sha256": "0rh1p9nlhkmhfqmp507rz8hwfgwrdvxx0zba41lxsd2admai90wv"
+  }
+ },
  {
   "ename": "non-edit-mode",
   "commit": "6b0aafa28b53c49796016c34b6e35d6e8af974cf",
@@ -82692,11 +83398,11 @@
   "repo": "ashton314/nordic-night",
   "unstable": {
    "version": [
-    20240311,
-    2147
+    20240626,
+    1936
    ],
-   "commit": "a9e5918c7755ccb1fa20d3d8e3a3ea069455f87b",
-   "sha256": "079685xsh9jpariiagns06z8zqbna7s3pr054s1lx4y701bmxmss"
+   "commit": "72043ab206dea50b366b3848e8f66c0a7737bda4",
+   "sha256": "0mlpqzql5jghssnx9i474gvc0rdj2sw9wsd46pgs2xn7lcqfjgrf"
   },
   "stable": {
    "version": [
@@ -82798,11 +83504,11 @@
   "repo": "MetroWind/notink-theme",
   "unstable": {
    "version": [
-    20220114,
-    1955
+    20240625,
+    326
    ],
-   "commit": "6115857fe75c1adbbce4165a2b77a11a271aaf31",
-   "sha256": "07gr1apbhd4kli2g0ld4yzpsc9hvkrh054b2dk47l2p9d1ki1j7g"
+   "commit": "d1e84622a491bb570d6a450706833fafaad74f39",
+   "sha256": "1xqjh28hpavk1lq51fs4nmpm8zkz8i7skrf034460kilnzyh2csr"
   }
  },
  {
@@ -82813,11 +83519,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20240406,
-    1803
+    20240619,
+    1038
    ],
-   "commit": "cd89065dc36e36b22a2a53832d2cac9b06fba41c",
-   "sha256": "179x3kz1504zlilh5y5h50sk5d0d9rhl6r6ccfgp4am2nn0d1qp7"
+   "commit": "b526c5ef0e1ae78380e68e5a24170542b884cbe3",
+   "sha256": "0is93vccnhz1gliiz6xh35xxwr2ginvgr094dkz5r920lhvc5s61"
   },
   "stable": {
    "version": [
@@ -82837,28 +83543,28 @@
   "repo": "tarsius/notmuch-addr",
   "unstable": {
    "version": [
-    20240422,
-    15
+    20240618,
+    1830
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "e5755c5a752d2026b1c847bc5944bdd5f015c1a6",
-   "sha256": "0ysb99rda0ix6lcb8z8p72wb6z35agyn9jd1z0jxhqpp5xyajjsl"
+   "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4",
+   "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y"
   },
   "stable": {
    "version": [
     0,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "89ced49cf3fb4d62bd4fea8bf9bd53ec8e4c7176",
-   "sha256": "0wggx4cqh1zgmax99bx2g90h51f2jxahqr5f35d0k1770zsds7f5"
+   "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4",
+   "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y"
   }
  },
  {
@@ -82929,28 +83635,28 @@
   "repo": "tarsius/notmuch-maildir",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240618,
+    1831
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "3a7240e6728731b427a763228c60104602f0fe4b",
-   "sha256": "13cajk4pb0x5r9azxilibc4v9xg3pxqiy0cx14b6kh6l9b0f26pq"
+   "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6",
+   "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"
   },
   "stable": {
    "version": [
     0,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "4686e8e7b6d88439d4b0c39c7b17502b102a6f58",
-   "sha256": "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5"
+   "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6",
+   "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"
   }
  },
  {
@@ -82961,30 +83667,30 @@
   "repo": "tarsius/notmuch-transient",
   "unstable": {
    "version": [
-    20240421,
-    2351
+    20240618,
+    1832
    ],
    "deps": [
     "compat",
     "notmuch",
     "transient"
    ],
-   "commit": "ef7a977a16e2c6a0ed3e139bdd6cc00a42b8c758",
-   "sha256": "1njy6cq7b9n2shvcgzrl8b3iclcyhx24bq1li1p292ipj3x3rkg4"
+   "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3",
+   "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym"
   },
   "stable": {
    "version": [
     0,
     2,
-    1
+    2
    ],
    "deps": [
     "compat",
     "notmuch",
     "transient"
    ],
-   "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d",
-   "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3"
+   "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3",
+   "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym"
   }
  },
  {
@@ -85166,8 +85872,8 @@
   "repo": "licht1stein/obsidian.el",
   "unstable": {
    "version": [
-    20231218,
-    1043
+    20240713,
+    906
    ],
    "deps": [
     "dash",
@@ -85177,8 +85883,8 @@
     "s",
     "yaml"
    ],
-   "commit": "24ff6ef051ba1f1a1e80a2132fdada37e77eaad6",
-   "sha256": "12va9svwgsjwakqw17ik8xzpda1w9fjplfj5i7aq10ic8yq6fkyx"
+   "commit": "5730759eb22d6d3bc78761865dd0f2fdb4100e37",
+   "sha256": "0llf7ahgf2rb0b2znq99mr1wkvxnh1lb0lppk2zcklqhdw05ylzk"
   },
   "stable": {
    "version": [
@@ -85521,30 +86227,30 @@
   "repo": "tarsius/ol-notmuch",
   "unstable": {
    "version": [
-    20240503,
-    1711
+    20240618,
+    1833
    ],
    "deps": [
     "compat",
     "notmuch",
     "org"
    ],
-   "commit": "f176ad73496ee086688ec5eeafcfff9372a833bc",
-   "sha256": "0gychpz53nhrrbs9w67400hbpyxp3q5jmhpj84fnqhnmf9q2dmnz"
+   "commit": "f58197816a6c7e2576696415aefad93bd778a224",
+   "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"
   },
   "stable": {
    "version": [
     2,
     0,
-    1
+    2
    ],
    "deps": [
     "compat",
     "notmuch",
     "org"
    ],
-   "commit": "781c3518a537da2a8b5e8a4424f9441df463a147",
-   "sha256": "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd"
+   "commit": "f58197816a6c7e2576696415aefad93bd778a224",
+   "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"
   }
  },
  {
@@ -85630,7 +86336,7 @@
     20240519,
     914
    ],
-   "commit": "5a7bd951d6135ff7ee3b45086308c14abce0936f",
+   "commit": "683a13adc4197af632b35484d2b58bdb1d6c9b5e",
    "sha256": "1hww0900rfvfj43bn86ybzyc745js1xabp2whqd6dxajiklynky1"
   },
   "stable": {
@@ -85639,7 +86345,7 @@
     0,
     5
    ],
-   "commit": "1f8b3d5cb155f7497083001037a09a972befab21",
+   "commit": "c5ca99bcffd3f92444c182622ff2c7f161a01fcf",
    "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1"
   }
  },
@@ -86103,26 +86809,18 @@
   }
  },
  {
-  "ename": "opencl-mode",
-  "commit": "d97575fdae88d55b55686aa6814f858813cad171",
-  "sha256": "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79",
+  "ename": "opencl-c-mode",
+  "commit": "b32886c36b1953c1448cee2d0c9536b2ebfdacaa",
+  "sha256": "0hf6ibgiw391cqvs1hkdsiwcdagv2kv98239avqmrrw3z26yp9iq",
   "fetcher": "github",
   "repo": "salmanebah/opencl-mode",
   "unstable": {
    "version": [
-    20201025,
-    1656
+    20240621,
+    1714
    ],
-   "commit": "15091eff92c33ee0d1ece40eb99299ef79fee92d",
-   "sha256": "1zn6rr48w0ai0sn51zzyp546va6flfgf9lm12vfrdb6kkiiiq403"
-  },
-  "stable": {
-   "version": [
-    1,
-    0
-   ],
-   "commit": "14109a4bb56105a9c052ae49ad4c638b4cc210b2",
-   "sha256": "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21"
+   "commit": "d33ce29c19629e9c2f42e468d2687a475915f531",
+   "sha256": "085a16i7n5ph2spvvf60pg2bn42nfr017dy4zx6zzhghazmw7xzs"
   }
  },
  {
@@ -86350,11 +87048,11 @@
   "repo": "oantolin/orderless",
   "unstable": {
    "version": [
-    20240401,
-    959
+    20240711,
+    2002
    ],
-   "commit": "ac4aeb66f331f4c4a430d5556071e33177304c37",
-   "sha256": "1nphxjsxd6bi7lbhx5r1nzay6gkkwhm1q995k90gg9zcnyxz9k0c"
+   "commit": "178b0c55f2cb49f27cd972f731ea45e5d3aea262",
+   "sha256": "1pm4xaf7394gbjg5g9vwdn99ii7swvna88g40h1safhbbbc60ga6"
   },
   "stable": {
    "version": [
@@ -86506,26 +87204,26 @@
   "repo": "rksm/org-ai",
   "unstable": {
    "version": [
-    20240517,
-    1114
+    20240710,
+    155
    ],
    "deps": [
     "websocket"
    ],
-   "commit": "fdcff489ef11bbc4b54c87b34a97bcc02f3994d4",
-   "sha256": "1j6rr8kn10j9wxqwhs4yd9k4fzjf2rz545if23xwqlg6ca39l16x"
+   "commit": "812b59f88851536ed3ded199fb55d303c16c7c12",
+   "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk"
   },
   "stable": {
    "version": [
     0,
-    4,
-    7
+    5,
+    1
    ],
    "deps": [
     "websocket"
    ],
-   "commit": "44e1298fd1b6ca9466f13ab6aadb08be6bde0b12",
-   "sha256": "0bag3ysg94l8dbvn7qnpyv2cd9f164aipmvkmxpvrgw4xl41lcqw"
+   "commit": "812b59f88851536ed3ded199fb55d303c16c7c12",
+   "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk"
   }
  },
  {
@@ -86536,15 +87234,15 @@
   "repo": "spegoraro/org-alert",
   "unstable": {
    "version": [
-    20240122,
-    1728
+    20240612,
+    137
    ],
    "deps": [
     "alert",
     "org"
    ],
-   "commit": "b4bfd4cead89215cc9a46162234f7a4836da4dad",
-   "sha256": "0l4h5hi37s0b28v2ds8m01li0z80adlnhnvqhd6jszdsxv44fw5f"
+   "commit": "9d54b9d0956b2f9e199d8add48d544d09e58794c",
+   "sha256": "1nhbr8f137c2hxysc2sggnz095ah8qchrmx6g9ligq6gl3v0k7fj"
   },
   "stable": {
    "version": [
@@ -86592,30 +87290,30 @@
   "repo": "eyeinsky/org-anki",
   "unstable": {
    "version": [
-    20240427,
-    1628
+    20240630,
+    1401
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b",
-   "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5"
+   "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128",
+   "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys"
   },
   "stable": {
    "version": [
     3,
     3,
-    0
+    2
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b",
-   "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5"
+   "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128",
+   "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys"
   }
  },
  {
@@ -86881,20 +87579,26 @@
   "repo": "alphapapa/org-bookmark-heading",
   "unstable": {
    "version": [
-    20231216,
-    1234
+    20240622,
+    947
    ],
-   "commit": "ed8b7fe2a08b06a1d750d1e1230e6728815e0bcd",
-   "sha256": "19fayjglgr3vk365a2f0c2mdnww30cxpzmi1sl2p2n3mic21av37"
+   "deps": [
+    "compat"
+   ],
+   "commit": "b667cfdde7631c656778473e6c87bc51e46280cd",
+   "sha256": "06pwxlhqcvz6fb8y4mm54r851x8gcqrwj3pgfnag7ydw881rlqg3"
   },
   "stable": {
    "version": [
     1,
     3,
-    1
+    2
    ],
-   "commit": "3e95313837898ec8660c7a8b0f601ec7edda7bfc",
-   "sha256": "0dixym930mxsl954rbjay2wk4p0r5d90jgz2cyv5hs3pa40msgdl"
+   "deps": [
+    "compat"
+   ],
+   "commit": "c7c7dcc52d3ad78084ea15e95bd7f6037bf02543",
+   "sha256": "1xzwbvhj6x5vszxbrf1sws37i8m3kff3sf1xkzijvjn8c8da9r97"
   }
  },
  {
@@ -86905,19 +87609,19 @@
   "url": "https://repo.or.cz/org-bookmarks.git",
   "unstable": {
    "version": [
-    20240520,
-    16
+    20240710,
+    1738
    ],
-   "commit": "774b2cad8b77920e5ea2089d7dd11c8ccab4a471",
-   "sha256": "0z2703qjwbvivpqxqdxjb7rzv3yrcxvzksrpm768wdazvrk7gq9b"
+   "commit": "23942cd3f14f691a35bfb71e0559ed5eb5100909",
+   "sha256": "1l61v51hk1bs0rn7r3nw7pjmxccg9ghx1hf4y24363a70wkl45qw"
   },
   "stable": {
    "version": [
     1,
-    1
+    2
    ],
-   "commit": "cdd57bf2aee9a26883312a2c5e48701e4b60802f",
-   "sha256": "04ydqa930b4xkk67i1ql59man08pc9y6l3nx3bpsi6va2djh0zjz"
+   "commit": "340319879d43e0a90c8f29f2b896ce28a69ec205",
+   "sha256": "13yk5j8461nz89bd0yi113wrhyc55g12yxzjqnrr7i0z7s09k9ni"
   }
  },
  {
@@ -87048,14 +87752,14 @@
   "repo": "dengste/org-caldav",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240525,
+    2231
    ],
    "deps": [
     "org"
    ],
-   "commit": "086a8f385138ef71f7e29f78f19fb3a65f8ee27c",
-   "sha256": "09j9sbjpj9bgxx2rrrmsyz9vk0xmhsljy6qrdjjzm230k80817xw"
+   "commit": "f406828d3945c434de13e8aa9f7707d3466aee1b",
+   "sha256": "05j098b74zkkibhl4h5pplnqf584py90lccsg7alnx0isgld28bx"
   },
   "stable": {
    "version": [
@@ -87173,14 +87877,26 @@
   "repo": "swflint/org-cite-overlay",
   "unstable": {
    "version": [
-    20240207,
-    1611
+    20240523,
+    100
    ],
    "deps": [
     "citeproc"
    ],
-   "commit": "cb401787b4569f43815cac55be8a319c489de3de",
-   "sha256": "1f4n67hlfaaxz12cyjj759kjkr1vxh8dfbaq987c5dzh5afjjzsj"
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "citeproc"
+   ],
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
   }
  },
  {
@@ -87191,8 +87907,8 @@
   "repo": "swflint/org-cite-overlay",
   "unstable": {
    "version": [
-    20240213,
-    1802
+    20240523,
+    100
    ],
    "deps": [
     "citeproc",
@@ -87200,8 +87916,23 @@
     "universal-sidecar",
     "universal-sidecar-citeproc"
    ],
-   "commit": "bb23142f5d0d390196839fa9b3ce27ce4d149b59",
-   "sha256": "1vjmygl9gm1syikf06iarri1yb8hrp3zvk0c9sm46h2wj476v4dy"
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "citeproc",
+    "org-cite-overlay",
+    "universal-sidecar",
+    "universal-sidecar-citeproc"
+   ],
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
   }
  },
  {
@@ -87371,14 +88102,14 @@
   "url": "https://repo.or.cz/org-contacts.git",
   "unstable": {
    "version": [
-    20240521,
-    1144
+    20240609,
+    1058
    ],
    "deps": [
     "org"
    ],
-   "commit": "722bc2ec91ca66a33f6b57cd02010f4fdbf542a9",
-   "sha256": "0750kckr7qfwnz5c3vr0s0d4nnfx3dshpgj19wh9yijq92v6q6mf"
+   "commit": "d0cb221502c9e104b6e3c358128b28761ffddb55",
+   "sha256": "12a5lmmblx644sav0jbhffqhw0ylqjwvy4p90wfy5ha4m4gkm279"
   }
  },
  {
@@ -87982,15 +88713,15 @@
   "repo": "conao3/org-generate.el",
   "unstable": {
    "version": [
-    20200815,
-    736
+    20240713,
+    159
    ],
    "deps": [
     "mustache",
     "org"
    ],
-   "commit": "98825efb73c4537f05f653ce40e639a220d2ee5d",
-   "sha256": "0p4xc4rznkq0vp0bbm1k69bfbmlp46lap12q75wdpkdrn5k4sr2p"
+   "commit": "39dbf8b5c3d225438f7d65e0dc7e9766d61d4c81",
+   "sha256": "03xd0cm0splhiznd8sdaipjvifc8pvsyj82s7mj5f3nzpqvv1m9m"
   },
   "stable": {
    "version": [
@@ -88406,30 +89137,30 @@
   "repo": "ahungry/org-jira",
   "unstable": {
    "version": [
-    20230915,
-    57
+    20240712,
+    2234
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "295b01ede42952c848bd8d76bc8c456a87876cbc",
-   "sha256": "1qyabrz49fmzyylf2kpm2ygwzlxx3v3aa71pi8r7dnxc5fzcc5z1"
+   "commit": "bd573584a9d93b320d5adbfc09dee30e83e5120d",
+   "sha256": "1g48n7m1ind29vixzgyj615d484w073bkr4p0sdz8flrnlvsfdyd"
   },
   "stable": {
    "version": [
     4,
     4,
-    1
+    2
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "fce9f8f28788d1d422fff2e17eb059e6ea546622",
-   "sha256": "1pkqyvziwp2573hnr8s41chsbm40564f76i3l8ynjr7955nccsms"
+   "commit": "ac625b080545a1ade22d070c23624f71b7ab02b5",
+   "sha256": "1mg7p9y4d4m6b6qkjvdz6lqby3kvvdb7qcjqgkrf75rzv0rsn1h2"
   }
  },
  {
@@ -88519,29 +89250,28 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20240430,
-    944
+    20240607,
+    1612
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "e316be6a4f64c4869b911d2cbdc4673a0e398a5f",
-   "sha256": "10hczqx620vhf93y61rf4hliqpasrw3r12sxsh6z03x2zv6jhl0s"
+   "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30",
+   "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr"
   },
   "stable": {
    "version": [
     0,
     6,
-    6
+    9
    ],
    "deps": [
     "dash",
-    "org",
     "s"
    ],
-   "commit": "83d5a657d4c190c62663c9b2357105002795b2e3",
-   "sha256": "1ma1grcwjfkps3chs1f0md33hkkl4bj7s9apws61anr2yfcj5j7k"
+   "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30",
+   "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr"
   }
  },
  {
@@ -88592,15 +89322,15 @@
   "repo": "seokbeomKim/org-linenote",
   "unstable": {
    "version": [
-    20240325,
-    320
+    20240410,
+    410
    ],
    "deps": [
     "projectile",
     "vertico"
    ],
-   "commit": "4c081f4bbe13c48df7cb17f2f006465b8b95196b",
-   "sha256": "0a8pcds5vv5px47gzvmv94ymvhki7kjqah8i4w43f0lpx9dhwqzx"
+   "commit": "a015295ebf271c8b518238f7969a0b6e60429805",
+   "sha256": "1jn22rvlxy5d2p56vm2jgs5jz4nm76ji4xmd71pnc18x2ci2p2c8"
   }
  },
  {
@@ -88611,16 +89341,16 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20240312,
-    529
+    20240713,
+    844
    ],
    "deps": [
     "fb2-reader",
     "nerd-icons",
     "qrencode"
    ],
-   "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4",
-   "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9"
+   "commit": "73b74b9e5006934f1ef302142512f51396ae2761",
+   "sha256": "0cm33d57hygwk4rlvvzaqkkz4hz35i1pgs8apsymsf482hx3w0az"
   },
   "stable": {
    "version": [
@@ -88875,25 +89605,25 @@
   "repo": "minad/org-modern",
   "unstable": {
    "version": [
-    20240515,
-    1932
+    20240708,
+    2157
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ea829ce4b3ac035808d411b1a088e0947d75f554",
-   "sha256": "1igv0ph5nk0b6bav5fndgl5jrnf20hml0vkx81ia1amhv7isbiax"
+   "commit": "bf2cec740dcf41fe8b4cc1ecc537c4fc4c7e9403",
+   "sha256": "15lh3hlf9hgc2xjzr6p5myp512a9arfma3p9hlh7m10bhfpabxgb"
   },
   "stable": {
    "version": [
     1,
-    2
+    3
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea",
-   "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm"
+   "commit": "0b7af08548e586c0d3b0ca4a683253da407220d1",
+   "sha256": "0bk8mz3va5vwkkvgvq761bnm9id8sb70rnf3ydq62ap27k0ab967"
   }
  },
  {
@@ -89079,14 +89809,14 @@
   "repo": "AntonHakansson/org-nix-shell",
   "unstable": {
    "version": [
-    20240205,
-    1642
+    20240603,
+    859
    ],
    "deps": [
     "org"
    ],
-   "commit": "d9843aa0f62a39b9938a89388e25129ecb39a4cc",
-   "sha256": "1ci8galz7cc8y2fdq1nl1wbpbid2ixvz77744yxxk43977gbpn1c"
+   "commit": "f359d9e1053fadee86dd668f4789ae2e700d8e8a",
+   "sha256": "1zbp2qwkj23nf4k3in9cb8rmymw7cg0v22b1wwbqlfh4b6h3jakm"
   },
   "stable": {
    "version": [
@@ -89627,8 +90357,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20240403,
-    2027
+    20240627,
+    1432
    ],
    "deps": [
     "compat",
@@ -89643,14 +90373,14 @@
     "transient",
     "ts"
    ],
-   "commit": "c9370982bfd4df04b590762bd795a7da3012c4dd",
-   "sha256": "1df7qd9f74gvpixpqchn1j47g4iwq6r9cvpc2g9cnb9mb16r2mjk"
+   "commit": "b7d4856f926cb71e01427a940dc948a48b0a702d",
+   "sha256": "07d8zq0a89qc3yrvq8qkvdqgw4rvbrrhwgj08qqdk698ny96qiwr"
   },
   "stable": {
    "version": [
     0,
     8,
-    6
+    7
    ],
    "deps": [
     "compat",
@@ -89665,8 +90395,8 @@
     "transient",
     "ts"
    ],
-   "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84",
-   "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"
+   "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3",
+   "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50"
   }
  },
  {
@@ -89939,8 +90669,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20240509,
-    1211
+    20240610,
+    1833
    ],
    "deps": [
     "avy",
@@ -89956,8 +90686,8 @@
     "request",
     "s"
    ],
-   "commit": "e435bc60228b985806ea7ea0856ceef1e5262c83",
-   "sha256": "1d13p33aypa3jip4xs5lx6vsimv7xg0m766nm35xapbmjjfihjkv"
+   "commit": "7ab51359954648c20753f66039a33d3b4993eeed",
+   "sha256": "08y302fb5xbcg5sfxsf8xk956lr8qrvwmj5kfvbn9x0mc7v1jgmp"
   },
   "stable": {
    "version": [
@@ -90033,28 +90763,29 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20221203,
-    259
+    20240619,
+    1307
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "fca95cd22ed29653f3217034c71ec0ab0a7c7734",
-   "sha256": "15jymjfdsmbcr5l03c605kbi68afcnwandhpgkcn912add9iqczr"
+   "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0",
+   "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii"
   },
   "stable": {
    "version": [
     0,
     4,
+    2,
     2
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "6e5240f54423a3b98167e2fb7bbe51a1f15b7f75",
-   "sha256": "09xvkw2h7i702wr4k5zqcd91sc4jwqzawwqsxf13qiwdm4kfxfk8"
+   "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0",
+   "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii"
   }
  },
  {
@@ -90104,8 +90835,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20240114,
-    1941
+    20240703,
+    1856
    ],
    "deps": [
     "dash",
@@ -90113,8 +90844,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "2e94f55cc58f6dce2772a6f33521eb5afcf67265",
-   "sha256": "0hhq2qfdhp2nlnz3ldx9y36s95n6nmywmbfjrqgn2viwzap23xgn"
+   "commit": "6644cb27a902b2ceeca89e83fde31e6ad01be79e",
+   "sha256": "05l15xfv1cdyqmqw2y6m1rb68y4h0g8f6lv6qzqlxim7w17ja10c"
   },
   "stable": {
    "version": [
@@ -90388,11 +91119,11 @@
   "repo": "lordnik22/org-shoplist",
   "unstable": {
    "version": [
-    20210629,
-    2157
+    20240605,
+    2257
    ],
-   "commit": "71ea7643e66c97d21df49fb8b600578ca0464f83",
-   "sha256": "0pjcpry9hzma87f8isyi0q5si0i67g0gd8shj2y3qyizi9ns64a2"
+   "commit": "6c2daa0b663d01a498dca2f2f4f4b645be1c365a",
+   "sha256": "0i71mgmvvsfycqlqj046184k3fzrqszhfffrjxfg2ai4lp9a8aql"
   }
  },
  {
@@ -90403,11 +91134,11 @@
   "repo": "localauthor/org-side-tree",
   "unstable": {
    "version": [
-    20240130,
-    656
+    20240601,
+    1001
    ],
-   "commit": "62169a26edfafacd681ecaf84289dd6b58be6c32",
-   "sha256": "1cjypg5fvvdd8flcbi4jyaql2bpd5xq283lxhgp9kr51x2ibzdnb"
+   "commit": "e8da5217ce23440a62f4a46ef60e2082b6284b28",
+   "sha256": "0cbnmw0ha6sbs1hvxv1j7mirdzy9kq3b1h60jx8a83gwgsbihzbg"
   }
  },
  {
@@ -90456,14 +91187,14 @@
   "repo": "jcfk/org-sliced-images",
   "unstable": {
    "version": [
-    20240325,
-    710
+    20240624,
+    428
    ],
    "deps": [
     "org"
    ],
-   "commit": "f3964d4ba421953fe9f109a99811b6d884ca56ab",
-   "sha256": "0lf275dqvgjfsh6kfmrb05gxcv78ng6pdijj2b1c2arw4pwsjb0r"
+   "commit": "b98b88a55eff07e998e7789e0bf7307dd71db050",
+   "sha256": "0iq03zp3bm1ph5ryhx6zpjm830sliqj6bb7i0h2v0nfn07l0cby2"
   }
  },
  {
@@ -90686,8 +91417,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20240301,
-    1602
+    20240630,
+    18
    ],
    "deps": [
     "compat",
@@ -90697,8 +91428,8 @@
     "s",
     "ts"
    ],
-   "commit": "51c9da5ce7b791150758984bab469d2222516844",
-   "sha256": "1mddkfd6xiy2q0907dzyy3vf77yamm6pa608dhdy2chgc26l0ji4"
+   "commit": "17954dc4b064d7fb09719222045d31feae8aa923",
+   "sha256": "0bha2mfvfyz57lv02pkn0lk92qq7vmvxdpd43jfmcynzipia1b9p"
   },
   "stable": {
    "version": [
@@ -90875,14 +91606,14 @@
   "url": "https://repo.or.cz/org-tag-beautify.git",
   "unstable": {
    "version": [
-    20240422,
-    607
+    20240712,
+    439
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "2f8b66e7aa2227411665f36d96bfc8a1b184bfbb",
-   "sha256": "0qz3f8phczmpyj8n6m9851cscwb7z0nkn4b5w79k21pgfhcmp6zf"
+   "commit": "52f09a8c363b75dd8554285e61025aeb9c0d945c",
+   "sha256": "1146x53j9yl38w1j04q2zxyk8ca2q4v4z8akxgd0vcxcalicyg4l"
   }
  },
  {
@@ -91137,6 +91868,37 @@
    "sha256": "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"
   }
  },
+ {
+  "ename": "org-transclusion-http",
+  "commit": "d733b6eb2fe02b098f3c49f6bafb809156114cc5",
+  "sha256": "1nc31djfdyhfkr6yybx308dihp7kfbih58zwrxzkg4pl63sbmkyq",
+  "fetcher": "sourcehut",
+  "repo": "ushin/org-transclusion-http",
+  "unstable": {
+   "version": [
+    20240619,
+    2130
+   ],
+   "deps": [
+    "org-transclusion",
+    "plz"
+   ],
+   "commit": "65caad0d9b19bf19c815bd7c033ffb907c3ebb12",
+   "sha256": "1cksd818yjxsydpmxb6744km8q97ykix071s7iqhzjamg8c7l6ca"
+  },
+  "stable": {
+   "version": [
+    0,
+    4
+   ],
+   "deps": [
+    "org-transclusion",
+    "plz"
+   ],
+   "commit": "a764f05a9eaeca002c76b85d090ca6b036e9dbaf",
+   "sha256": "0cz67lkm8dajvyxhzj5mchav5dxif3pk3bs03fz9jna6yc1v2fja"
+  }
+ },
  {
   "ename": "org-transform-tree-table",
   "commit": "afca0e652a993848610606866609edbf2f5f76ae",
@@ -91503,30 +92265,28 @@
   "repo": "p-snow/org-web-track",
   "unstable": {
    "version": [
-    20240424,
-    756
+    20240628,
+    1032
    ],
    "deps": [
     "enlive",
     "request"
    ],
-   "commit": "92e97112aa63cbe14f7727b157eb3c11239bf86c",
-   "sha256": "1ni3l38zh2lzr2ri7vh6khp9c6fn4hafgc6234y707ysniz9dryx"
+   "commit": "bca3a6e159b1b939906f9fc033c7a93e6be3c41c",
+   "sha256": "0wgv5ikgdp7m6lx2y0p6cxb7zcqdflr99ymk9fz105f2adnv7c6c"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    2
    ],
    "deps": [
     "enlive",
-    "org",
-    "org-agenda",
     "request"
    ],
-   "commit": "dab6a42982ad290564b09d2c1c3dbe3c63295964",
-   "sha256": "1v6zj6hkhn5xjq318vs5yhsdg6mgaw4qjd9fgi2fps7ry79drzf3"
+   "commit": "ee15faf47c308f37bfcfffe38e8f4ee55661af3e",
+   "sha256": "0g86fqn08lgxz71snfnbgmyihnfl50m0zr7ysh25w4b4bla234jy"
   }
  },
  {
@@ -91642,14 +92402,14 @@
   "repo": "ymherklotz/org-zettelkasten",
   "unstable": {
    "version": [
-    20230613,
-    1924
+    20240708,
+    1242
    ],
    "deps": [
     "org"
    ],
-   "commit": "5863a057f9b41dfa4cbf383c325b3fcddbbe5449",
-   "sha256": "1ibwcwn47pgf6dpqz71cm6azwdngb3blkwclii0y876fmyqhywsw"
+   "commit": "ab31cf4436fabc7e44addf60f383a2ee6a4558e3",
+   "sha256": "06hn6j3rk279ys9k7izvm2176xm82y3j6hl3r4dqfg7ak3k52amp"
   },
   "stable": {
    "version": [
@@ -91995,30 +92755,30 @@
   "repo": "tarsius/orglink",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240618,
+    1835
    ],
    "deps": [
     "compat",
     "org",
     "seq"
    ],
-   "commit": "e513f25024b2db082dbdbd8bd713d57a2b7456eb",
-   "sha256": "0dmh9j9dz3j7h881126zj9bpbzh5sr444qw5029wfmsq4x5ls0yg"
+   "commit": "6d482393c45f52c793b7ccfac871c87937a58640",
+   "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j"
   },
   "stable": {
    "version": [
     1,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
     "org",
     "seq"
    ],
-   "commit": "afbeffdfa15a9fc532bba2e03626b9e82768ba2c",
-   "sha256": "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him"
+   "commit": "6d482393c45f52c793b7ccfac871c87937a58640",
+   "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j"
   }
  },
  {
@@ -92136,11 +92896,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20240228,
-    720
+    20240616,
+    506
    ],
-   "commit": "cc129b543c472c704c8dc074500a8192ac3d9f88",
-   "sha256": "1kcw09k5ga1sc8p4zzlcp3mnmqs6kx626vkk29awm0b1qyg8pk92"
+   "commit": "f343b6009d87630588d39dc3d92651008c1bad13",
+   "sha256": "0dig8axp5isv39nxmx1387yg9dy8cwl47qk8a1m0jv2dsybagw4s"
   }
  },
  {
@@ -92181,11 +92941,11 @@
   "repo": "tbanel/orgtbljoin",
   "unstable": {
    "version": [
-    20240228,
-    719
+    20240616,
+    528
    ],
-   "commit": "f243511ec4b3a712d0b868ecbc4c7b1310a3382d",
-   "sha256": "1lpgprrcwhzglddkr9q4v4qlr503wvvg1ri31445vp8fd4ldz0aa"
+   "commit": "441a426447965e9b4dc1b0a1fc010c07192f73b6",
+   "sha256": "16isqgnysbp64wvgl9skyhfqlwjxsvs4i8k5zzaxm5c7jrcwc78l"
   }
  },
  {
@@ -92344,14 +93104,14 @@
   "repo": "minad/osm",
   "unstable": {
    "version": [
-    20240122,
-    2255
+    20240708,
+    2157
    ],
    "deps": [
     "compat"
    ],
-   "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30",
-   "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx"
+   "commit": "17dfc017cdb0cf21325a9e636fd23e912aea84b3",
+   "sha256": "17zk9mrh7w1bj0z0a95rfa41zp2a1lygf6khls77z58gfvffqfjk"
   },
   "stable": {
    "version": [
@@ -92649,26 +93409,26 @@
   "repo": "tarsius/outline-minor-faces",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240628,
+    2016
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9f5c75e996388ead3472cd0dce8e9fc00407e210",
-   "sha256": "11jn4y2pa5v6bkijaf0d6ahg9zbz4mn11v9g1j46ldjwg3c7mbsf"
+   "commit": "8f1b8ab4c49b30d0a58b55666463ed2318150178",
+   "sha256": "0zw7qmrq2sh01av4871gkybn24nh5j64g04h5axvhls6znyv7pxq"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "57c4a0fac36a26cfa8d1296e76afbcf7a5b87a57",
-   "sha256": "1pavzlb48a7062mrv9ldfwh1fl7pbhwy1i4j24lgmynbnv1kk96n"
+   "commit": "4a264ffed9dae7d04ce1c72b07c9566b4bb8b6a6",
+   "sha256": "14h7idc160w38h82r4q1cq9rcbaw73dpqrxmp905wvnkvbncwhdk"
   }
  },
  {
@@ -93357,11 +94117,11 @@
   "repo": "DamienCassou/ox-linuxmag-fr",
   "unstable": {
    "version": [
-    20240326,
-    722
+    20240624,
+    1829
    ],
-   "commit": "893a401db7d3b93e977b3c2608169dbb6e3fbdce",
-   "sha256": "1fh36w8iyrh5pqrfrcrh0f6clrmin5vg7r7hcg70z8s6w08ylzfy"
+   "commit": "3319c309f6fb0b0771363bec80557bc387243a82",
+   "sha256": "0iq63n4r78s4v75iadaqk06m37pg3allzrrdz2r1x3pm3br24nz0"
   },
   "stable": {
    "version": [
@@ -93452,16 +94212,16 @@
   "repo": "emacsorphanage/ox-pandoc",
   "unstable": {
    "version": [
-    20231222,
-    1103
+    20240710,
+    1424
    ],
    "deps": [
     "dash",
     "ht",
     "org"
    ],
-   "commit": "399d787b6e2124bd782615338b845c3724a47718",
-   "sha256": "0267m5n08w3h0zpniiwp4ngpmxkjwzndl9kg88k0cknkbqhg27ps"
+   "commit": "34e6ea97b586e20529d07158a73af3cf33cdd1d5",
+   "sha256": "0s4d639vfvqb6spnr3b0isrspbl876h22977pkb943ygd93bzx4p"
   },
   "stable": {
    "version": [
@@ -93951,11 +94711,11 @@
   "repo": "phillord/pabbrev",
   "unstable": {
    "version": [
-    20240216,
-    439
+    20240617,
+    1622
    ],
-   "commit": "bf8a498f2ddd268981d43fb71cf98aa2e4be3942",
-   "sha256": "1ilj6zm85hq95xlnx6b7sbzxdrkk5pdbcnd26igmy6z0z3br2kl3"
+   "commit": "d5f120c523ddce2e8dea1868150248cd188d8ad8",
+   "sha256": "1givc7d5wvq1chfbi2rdkwn36jfvdm930qzy5gzyav1ywdcm5sis"
   },
   "stable": {
    "version": [
@@ -94066,14 +94826,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240628,
+    1901
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d9ce37b82529827ce720ad3ccf4af887d19fcfb0",
-   "sha256": "1hnv0yjc0yyjcp369z9nlvyxiqmzs0zqz5g6ly9cc3g43bjfavbj"
+   "commit": "33221b6a0aaf4d7648b50afbc66b5691d90b6924",
+   "sha256": "0321sx2va3r3paivv72s45pnw26n02silhk8f43hkw0il46d07vl"
   },
   "stable": {
    "version": [
@@ -94203,36 +94963,6 @@
    "sha256": "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd"
   }
  },
- {
-  "ename": "packed",
-  "commit": "f7cc44a1b339829cf7ee9b0cb4b2f113befd2c0d",
-  "sha256": "166s0kff4jn38xi1ygcalpqd90y124zscjvf5szqwxyjrrpqhdx8",
-  "fetcher": "github",
-  "repo": "emacsorphanage/packed",
-  "unstable": {
-   "version": [
-    20221130,
-    2228
-   ],
-   "deps": [
-    "compat"
-   ],
-   "commit": "169064f7acfe198cc7dd43d02518b773691e1314",
-   "sha256": "1y3dbyaxr5smw9zxvy0cgfcg1i3ciq7r40njf8dkra4080ibxdnx"
-  },
-  "stable": {
-   "version": [
-    3,
-    1,
-    0
-   ],
-   "deps": [
-    "compat"
-   ],
-   "commit": "c0d075fa02424b39bd5a3492167f914b8522f686",
-   "sha256": "0i2j5yk6xhv4rh3317f241y9llwf4wk18a6a4lkqrvbjpvi9yvn0"
-  }
- },
  {
   "ename": "pacmacs",
   "commit": "52ce427e046267655dd9f836e57176d59f23e601",
@@ -94416,11 +95146,19 @@
   "repo": "danielsz/Palimpsest",
   "unstable": {
    "version": [
-    20200804,
-    2308
+    20200805,
+    1048
    ],
-   "commit": "5310c4a026954254ab82e5f3fe9f98dde2bb5c8b",
-   "sha256": "191d4x7fk5kl30fcgzfm6xn4mwxfpx65p5811ybyxci3rddd8al6"
+   "commit": "f474b3ad706373d9953abdc401d683a2a023d28e",
+   "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "f474b3ad706373d9953abdc401d683a2a023d28e",
+   "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh"
   }
  },
  {
@@ -94513,15 +95251,15 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20240311,
-    2218
+    20240602,
+    1006
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "c7fa568ab9cfbb2abfb9b22f419d28ce570d7b22",
-   "sha256": "00l4vh8mx899k330fvkplz77rg502j406gjc3v2nyakfmf67h85h"
+   "commit": "18214fc2df357b50e62c79993aac4ff0cf1d9499",
+   "sha256": "01rpbvxpdmqrrdy6h3m86xng6vmnlavbhrl9p9ydg2x00iv8l09a"
   },
   "stable": {
    "version": [
@@ -94682,11 +95420,11 @@
   "url": "https://mumble.net/~campbell/git/paredit.git",
   "unstable": {
    "version": [
-    20221127,
-    1452
+    20230718,
+    2027
    ],
-   "commit": "d700549d8aad684f1fabcfff565a9ad8b468199b",
-   "sha256": "0lx0l07psdm4dypvfadgdsx2wsjd7xpsdlagfbr7jr2nbgjkxzy7"
+   "commit": "037b9b8acbca75151f133b6c0f7f3ff97d9042e5",
+   "sha256": "0s3ia5yrhcl0wr4y7v70a68bhsvgkkfm3wvm3kmj37i84bb0nlrc"
   },
   "stable": {
    "version": [
@@ -94766,26 +95504,26 @@
   "repo": "tarsius/paren-face",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240618,
+    1837
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0cad6a4657ebfcdd2902746b99f01fea7cc05bd7",
-   "sha256": "17r70dwlg23kpv2dx4j7bs3pshisgz1j8k70vv3izyq0qg0n6vlp"
+   "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff",
+   "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8b575bc215e715525644ed66152a9bcefde3bd08",
-   "sha256": "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba"
+   "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff",
+   "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v"
   }
  },
  {
@@ -94820,26 +95558,26 @@
   "repo": "justinbarclay/parinfer-rust-mode",
   "unstable": {
    "version": [
-    20240506,
-    816
+    20240625,
+    740
    ],
    "deps": [
     "track-changes"
    ],
-   "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec",
-   "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a"
+   "commit": "7f7fa030e3ca51eb0a060df2694cbab2eb3b27b7",
+   "sha256": "1rdwzsgwv50dy4rqnydwlaihvv6fdg2sysig571f0sh049in8iqq"
   },
   "stable": {
    "version": [
     0,
     9,
-    0
+    2
    ],
    "deps": [
     "track-changes"
    ],
-   "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec",
-   "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a"
+   "commit": "a96c768e9dc4427c9ea18812a2f09e209a5e1a5e",
+   "sha256": "17kkyqkn0r3s2rbgc6v5jygrq5bm5jcw54byjfkhnif90zvdch0n"
   }
  },
  {
@@ -95530,21 +96268,6 @@
    "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi"
   }
  },
- {
-  "ename": "pcmpl-git",
-  "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
-  "sha256": "078ajwsalirr9xkqfbbbmc5z3fdh9n5jckc6z7r90g899cxwcyzz",
-  "fetcher": "github",
-  "repo": "leoliu/pcmpl-git-el",
-  "unstable": {
-   "version": [
-    20170121,
-    59
-   ],
-   "commit": "9472ac70baeda025ef7becd1cf141d72aec93f32",
-   "sha256": "17y3rdp7fgyg4i9hwyzgpv1d19i5c6rqdf1gm5bdm2csk12vfg9n"
-  }
- },
  {
   "ename": "pcmpl-homebrew",
   "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -95617,10 +96340,10 @@
   "repo": "joddie/pcre2el",
   "unstable": {
    "version": [
-    20240220,
-    1530
+    20240629,
+    2322
    ],
-   "commit": "380723b2701cceb75c266440fb8db918f3340d50",
+   "commit": "b4d846d80dddb313042131cf2b8fbf647567e000",
    "sha256": "0h73d9f1zj74vjir2kiq4s2g5rai7b59z7da20kh862xnldfcxsx"
   },
   "stable": {
@@ -96003,11 +96726,11 @@
   "repo": "bram85/emacs-persist-state",
   "unstable": {
    "version": [
-    20230728,
-    714
+    20240703,
+    2100
    ],
-   "commit": "0b0dd8dca90414db3395860c2bf32a4c736acfb4",
-   "sha256": "0ib6racii2wrpf9j63bi29r2y54dy7hhwj40ys74isiysk2r8x07"
+   "commit": "2d3d81717fbb2fac26362e8308f33d589818d7f0",
+   "sha256": "0kv05j8zi8msnx9ibw923c03z9bx8ckhvxf7sxazdlmf2clxyfkz"
   },
   "stable": {
    "version": [
@@ -96356,21 +97079,21 @@
   "repo": "wyuenho/emacs-pet",
   "unstable": {
    "version": [
-    20230906,
-    46
+    20240713,
+    1406
    ],
    "deps": [
     "f",
     "map",
     "seq"
    ],
-   "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a",
-   "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds"
+   "commit": "a3c74988c2ae89695026e6d314b5eb27c35fbc3a",
+   "sha256": "0dsyr2w5md86w8kpf8y2qk5rgsy58abza4wm1fb6k7rxfbds16p2"
   },
   "stable": {
    "version": [
-    2,
-    0,
+    3,
+    1,
     0
    ],
    "deps": [
@@ -96378,8 +97101,8 @@
     "map",
     "seq"
    ],
-   "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a",
-   "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds"
+   "commit": "2041ba1caee94242362c955e697a3c03bfbc0402",
+   "sha256": "18mz7nhsii9l1iqa9yk97xbf6dn4mladwrnl5w7ksa2zcpcpph61"
   }
  },
  {
@@ -96414,25 +97137,25 @@
   "repo": "emarsden/pg-el",
   "unstable": {
    "version": [
-    20240520,
-    1322
+    20240710,
+    2114
    ],
    "deps": [
     "peg"
    ],
-   "commit": "0f20a0051ab898ea53903284c47a4703555380ca",
-   "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h"
+   "commit": "614becd4182d2411e17acf4f88918d7c5df75548",
+   "sha256": "0bi2sh6901ylwgy9znv10j5vd3hgryvx3hc3yijs67n41qf4zryi"
   },
   "stable": {
    "version": [
     0,
-    34
+    37
    ],
    "deps": [
     "peg"
    ],
-   "commit": "0f20a0051ab898ea53903284c47a4703555380ca",
-   "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h"
+   "commit": "3d16f2e30e3dc2ec5c283d80f58730bc8ef4d6cf",
+   "sha256": "04zhy0wp6rk5x55ja5danyf3rpb59k35lpw7b07bn25rngmqjmid"
   }
  },
  {
@@ -96786,11 +97509,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20240118,
-    1458
+    20240621,
+    742
    ],
-   "commit": "f0a14387427244251883889ba616c7f042323f6d",
-   "sha256": "1r3vgzfrq87ffp7g0xx44iwjpakcp23fhd5cxbbnwvia0y49vv8l"
+   "commit": "4792988a120d6ac515ba16605278d04cb8be0d69",
+   "sha256": "0w9amslw2hpf0znfmn4cki3c6xqxjs11mayvzqiycfc6pabw4hzq"
   },
   "stable": {
    "version": [
@@ -96898,8 +97621,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20240407,
-    1500
+    20240527,
+    459
    ],
    "deps": [
     "async",
@@ -96907,8 +97630,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "1916e35e08d746a6ff8a2cd88ae43bdb6842feab",
-   "sha256": "0c9diqgy8v0bcx5011z2sd0q7s2xn2f4y7mpgv0x5fi0qh2a1mw1"
+   "commit": "6b5269ff82785a9bd1e648b2f91e5128353d5a67",
+   "sha256": "0ygnl1xpms8cnp5s7i9ng99azyzg0k3h830mazkhhpwlqhkjffyl"
   },
   "stable": {
    "version": [
@@ -96932,16 +97655,16 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20230417,
-    1142
+    20240527,
+    2142
    ],
    "deps": [
     "compat",
     "php-mode",
     "php-runtime"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456",
+   "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj"
   },
   "stable": {
    "version": [
@@ -97393,14 +98116,14 @@
   "repo": "Wilfred/pip-requirements.el",
   "unstable": {
    "version": [
-    20181027,
-    1629
+    20240621,
+    2151
    ],
    "deps": [
     "dash"
    ],
-   "commit": "216cd1690f80cc965d4ae47b8753fc185f778ff6",
-   "sha256": "0da3q0n5nn0l96kk49kanw5knx3jmga439zbmiii76na16bg5y3i"
+   "commit": "31e0dc62abb2d88fa765e0ea88b919d756cc0e4f",
+   "sha256": "08q225h8kahh632qkzpb1ih3jqg5imlzgrrh8ynkyxrr710madkl"
   },
   "stable": {
    "version": [
@@ -97581,11 +98304,11 @@
   "repo": "juergenhoetzel/pkgbuild-mode",
   "unstable": {
    "version": [
-    20220802,
-    1951
+    20240531,
+    1602
    ],
-   "commit": "9525be8ecbd3a0d0bc7cc27e6d0f403e111aa067",
-   "sha256": "03rhhmwwigvych4qfn0hly0z2hihs57yjapvfinbkrmw8ajgnl01"
+   "commit": "8ef396d8fa9187b65c065a6bc2ca15dfaf3255df",
+   "sha256": "1p5xgq0mnyqxjmapki60xv1jns0pxszd04r0c1kdyk1bcdcpjm93"
   },
   "stable": {
    "version": [
@@ -98115,8 +98838,8 @@
   "repo": "alphapapa/pocket-lib.el",
   "unstable": {
    "version": [
-    20240407,
-    2247
+    20240713,
+    1324
    ],
    "deps": [
     "dash",
@@ -98124,8 +98847,8 @@
     "plz",
     "s"
    ],
-   "commit": "b13c899223a15481738c3105f07ee2205dcc937c",
-   "sha256": "0b5451fwsjqb603mmgw6kpd8w4gvndg3fxbdb44ib2245ynr5mms"
+   "commit": "21f69179ad254ab64cb876115719e5d7d043f88d",
+   "sha256": "1hh987aflyjjddinx790g09c6l5yfd2wbihh83pvmrair6pj68rd"
   },
   "stable": {
    "version": [
@@ -98406,8 +99129,8 @@
   "repo": "mavit/poly-ansible",
   "unstable": {
    "version": [
-    20240520,
-    1500
+    20240626,
+    1320
    ],
    "deps": [
     "ansible",
@@ -98416,8 +99139,8 @@
     "polymode",
     "yaml-mode"
    ],
-   "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57",
-   "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8"
+   "commit": "24a17c6b965a085c737bee857eff919dfd0f961d",
+   "sha256": "0k36pydhrrhzs46vcn5lsqxvz66j7nws5vfhwlh60vshkic2rfhx"
   },
   "stable": {
    "version": [
@@ -98720,15 +99443,15 @@
   "repo": "TatriX/pomidor",
   "unstable": {
    "version": [
-    20220714,
-    1932
+    20240601,
+    1617
    ],
    "deps": [
     "alert",
     "dash"
    ],
-   "commit": "394a52f95587b1d10d0c3bdca503d2cc876db35b",
-   "sha256": "1y64xs74p39rr1d4i1s0zjhqlcips9k11fr8z6wy1j7s9b142570"
+   "commit": "de71c34a1a9aff745181107094d3389816dbeca5",
+   "sha256": "00jh2hww8xpvnj9hqlgfg9rgqspwpp6nsqzjdsny96dps8myki1s"
   }
  },
  {
@@ -98739,16 +99462,16 @@
   "repo": "SqrtMinusOne/pomm.el",
   "unstable": {
    "version": [
-    20240130,
-    2126
+    20240709,
+    2156
    ],
    "deps": [
     "alert",
     "seq",
     "transient"
    ],
-   "commit": "a95343f643b5674ad7714dc62f8436ba87ad8335",
-   "sha256": "08g28lx8rqvcff7dhcgrxavx59hx507gn6flsx39v0b865i52bmv"
+   "commit": "ba0b30888614a8dc932bd0ab198e08f78950c0e1",
+   "sha256": "1zd351gx3k31vmrs4g4q8fcqdwxp8zlqch40z4vhqy80alzlg88g"
   },
   "stable": {
    "version": [
@@ -99177,8 +99900,8 @@
     4,
     7
    ],
-   "commit": "90a9babc829b298af36be695009894fc00a97935",
-   "sha256": "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy"
+   "commit": "4889e08cf9077c8589ea6fea4e2ce558614dfcde",
+   "sha256": "0wnmh9a9ks0pmcjy9df5higfbz9gy1ydj4n8s84hkhd4wq4fndvv"
   }
  },
  {
@@ -99189,11 +99912,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20240507,
-    148
+    20240703,
+    359
    ],
-   "commit": "f4e9e509ba96ceb3c2b2b054957291607fb52651",
-   "sha256": "0hz7jgpsg3adgwg2qqgd9vy1mhbkr3c9rsy0zx5kmn42npdcf4az"
+   "commit": "493b17f74ad41104d0c4d648e8c96dc495279ac8",
+   "sha256": "1yjpkx5h8wm5hs448hri8zvhzq44g4qgb5g1ji6yj99x8vdpf5al"
   },
   "stable": {
    "version": [
@@ -99615,16 +100338,16 @@
   "repo": "jscheid/prettier.el",
   "unstable": {
    "version": [
-    20231002,
-    1153
+    20240601,
+    1316
    ],
    "deps": [
     "editorconfig",
     "iter2",
     "nvm"
    ],
-   "commit": "d6d7a6ac9e8a08ab497d2cf4d7e2317f6b93dfbf",
-   "sha256": "0612snvsf6y0g6qfirjvnxk0labnm35wgbxvidyy0rzsasfszl9l"
+   "commit": "53327f039f2d4f3fd1eabece190857059b3765b5",
+   "sha256": "09rxd93pg9lx2gidyy1bb91hfla3df29y7hl2p1l4pwbf1rgmim1"
   },
   "stable": {
    "version": [
@@ -99851,26 +100574,28 @@
   "repo": "alphapapa/prism.el",
   "unstable": {
    "version": [
-    20230524,
-    1130
+    20240611,
+    305
    ],
    "deps": [
+    "compat",
     "dash"
    ],
-   "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35",
-   "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2"
+   "commit": "73deba1a4a719f740827c000cf46bfecacb44adb",
+   "sha256": "1p0v2rd9wiz13ckwkj77v8bpzg01cjsgfqkqqyrf1hkv7b0ki2z9"
   },
   "stable": {
    "version": [
     0,
     3,
-    2
+    5
    ],
    "deps": [
+    "compat",
     "dash"
    ],
-   "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35",
-   "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2"
+   "commit": "3a61852dd01c738dc18b88a7be524db67a2d5520",
+   "sha256": "1p4vqyc4jm0pg4999i0k04pl0sa9nhrczxf4bng4id1r19sxm6dh"
   }
  },
  {
@@ -100678,8 +101403,8 @@
   "repo": "mohkale/projection",
   "unstable": {
    "version": [
-    20240517,
-    2023
+    20240707,
+    1857
    ],
    "deps": [
     "compat",
@@ -100687,8 +101412,8 @@
     "project",
     "s"
    ],
-   "commit": "c6df3b19204113642ee14a87598d65c03688f0fa",
-   "sha256": "1f78nq135waqgkr5z9m5gxhplb2spbkap0diykb6h9j8l6g8xij7"
+   "commit": "9ee93e65d987cfaecaf87e74a6716d84154a698c",
+   "sha256": "148gdrjv6swi8garawjb9w5mnif2agl4j5w3glrz13jmagxmmpb8"
   }
  },
  {
@@ -100912,11 +101637,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20240513,
-    720
+    20240708,
+    1525
    ],
-   "commit": "55e133360c1b66b834f9ae2c4478d2c81b2d33ef",
-   "sha256": "00r3zyrc08j5a5np0xc6jkzvlpjxnax7dg2br8h85hk3fml2gihf"
+   "commit": "eca47ea8afdfcd94b4c8d88ee640f6631cfe5c5d",
+   "sha256": "1vr8k4s7dk5y5c7rmnparrigsih6cz9w01d8z1gmfp55adhyjvli"
   },
   "stable": {
    "version": [
@@ -101024,11 +101749,11 @@
   },
   "stable": {
    "version": [
-    26,
-    1
+    27,
+    2
    ],
-   "commit": "2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5",
-   "sha256": "1n7w40wypayplykxhknm6sljzbfbm64mg1zysrjidac3hwqkxh7n"
+   "commit": "63def39e881afa496502d9c410f4ea948e59490d",
+   "sha256": "0rbbwydw97gxbbq9gm32lp9rn44safqzywk4jjdmbrq19asdxazm"
   }
  },
  {
@@ -101197,15 +101922,15 @@
   "repo": "thierryvolpiatto/psession",
   "unstable": {
    "version": [
-    20240515,
-    1449
+    20240612,
+    1242
    ],
    "deps": [
     "async",
     "cl-lib"
    ],
-   "commit": "5a5b11df882339b4474ab0cc6dd847aaab6a84b6",
-   "sha256": "1cgx1k9vgq8avpjr1ig87wf6mv042504bf770x46dba3zswwy98z"
+   "commit": "cddba290ce39440a2e00bb92130030fe0f068f2c",
+   "sha256": "1z1kdgr3y5wgn8xqgr5ilpbzjqm54jz2icg34p6qc8d8s12chw8c"
   },
   "stable": {
    "version": [
@@ -101576,6 +102301,21 @@
    "sha256": "0c5q8qmbligzjsn05di4wh6ggpd3944j4yqb78vzd441b8ssq70i"
   }
  },
+ {
+  "ename": "puppet-ts-mode",
+  "commit": "bf4dcc1a451a3bf5908f4a3b6f9636b4b958a804",
+  "sha256": "1ppzzbkvcq2wf725cb3cxl47q3i87x6d7ph2hngh29nw707nn8jv",
+  "fetcher": "github",
+  "repo": "smoeding/puppet-ts-mode",
+  "unstable": {
+   "version": [
+    20240626,
+    646
+   ],
+   "commit": "9622188612f3be347bd92f5a195999b36f95f988",
+   "sha256": "0jrrmd77i5md8psxq313i8amw2f8hmmh518f1bsajm4wg46pfh3c"
+  }
+ },
  {
   "ename": "purescript-mode",
   "commit": "55462ed7e9bf353f26c5315015436b2a1b37f9bc",
@@ -102399,16 +103139,16 @@
   "repo": "wbolster/emacs-python-coverage",
   "unstable": {
    "version": [
-    20240509,
-    856
+    20240703,
+    917
    ],
    "deps": [
     "dash",
     "s",
     "xml+"
    ],
-   "commit": "7f130066460ab8a58c2667d9f76a3e2c168e0759",
-   "sha256": "0dxc09422nqpwdcvh90j41631198dxsxc6np1hhs5m6qf3fjsx1m"
+   "commit": "7077dabdee59efe1d7116149cdc0ef40e6816c2b",
+   "sha256": "0pf01b9xnzzibkbfx1l3i25ckljf73vr20fpnmfc9giaiz5lzl5l"
   }
  },
  {
@@ -102532,14 +103272,14 @@
   "repo": "jdtsmith/python-mls",
   "unstable": {
    "version": [
-    20230920,
-    1915
+    20240621,
+    2114
    ],
    "deps": [
     "compat"
    ],
-   "commit": "821b93ff7c94a13090598c22fd92bd19b5ad951b",
-   "sha256": "1p9dcjz8hgjb8gz742pxqdrjh68mnyr2hssy6glhd2qb78d4927y"
+   "commit": "3ebacc6c46e9f7de25279783001ca3fc8964d7a8",
+   "sha256": "0qspqx1jlpcq64d5j05xfn6xdfnxixb654pczilxp6bqhyca8ln4"
   },
   "stable": {
    "version": [
@@ -102586,17 +103326,16 @@
   "repo": "wbolster/emacs-python-pytest",
   "unstable": {
    "version": [
-    20240416,
-    1128
+    20240704,
+    1054
    ],
    "deps": [
     "dash",
-    "projectile",
     "s",
     "transient"
    ],
-   "commit": "9f850e22df93812a5b109968c549f9b3dd828ed1",
-   "sha256": "1f5b7ffcpmry2xiphclc4vv1zqva9rrhn08fgjq8qhdq3x0i5jah"
+   "commit": "1ecfb4461615374aac7786a07359c2d3d561f3c7",
+   "sha256": "1crdx42rdqyczccl5wqxnblqrs9ijskh5zj970800lk3xhsr4kql"
   },
   "stable": {
    "version": [
@@ -102727,6 +103466,21 @@
    "sha256": "0hbvy8wdi5dgxn86j8z54y2fhcvm605xxm6xv054nl6fw2hh2h5h"
   }
  },
+ {
+  "ename": "pythontest",
+  "commit": "cac44f0b664c362935aa1c6b6045a92721cda174",
+  "sha256": "0k2byrlr85phyy814dcd5fxpjs5pa716bd5w1kr50wfv58xayx4y",
+  "fetcher": "github",
+  "repo": "erickgnavar/pythontest.el",
+  "unstable": {
+   "version": [
+    20240610,
+    2226
+   ],
+   "commit": "5b46552a7afdd91070ac528909e032d0df5aa2da",
+   "sha256": "13x8gjc4zg7fwi8a7z3cwa1v5slwfw14wynkv1hdp8rmm4j5zvz3"
+  }
+ },
  {
   "ename": "pyvenv",
   "commit": "e37236b89b9705ba7a9d134b1fb2c3c003953a9b",
@@ -103218,6 +103972,24 @@
    "sha256": "1f752fsrk7z8q2dd40r46hzhhf1kyj0vid9g0vv5dkkzmabms59q"
   }
  },
+ {
+  "ename": "qwen-chat-shell",
+  "commit": "c20f88160b4caeed30a78ecddd738f18acae39ae",
+  "sha256": "17c7bi0yvmpz23qpdhw78dy566b0f5jzr49k65jaxjrb0820g02c",
+  "fetcher": "github",
+  "repo": "Pavinberg/qwen-chat-shell",
+  "unstable": {
+   "version": [
+    20240612,
+    343
+   ],
+   "deps": [
+    "shell-maker"
+   ],
+   "commit": "2d6562c8a75aebf7a59e554011571ba5883cf4fd",
+   "sha256": "1l43z5s3jfx6cxwf93yl6k9jpg7dlvlh3jmspa59jm5395cnvrh9"
+  }
+ },
  {
   "ename": "r-autoyas",
   "commit": "3a095d3a687055c6ac43a4338826542d14a25127",
@@ -103289,11 +104061,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20240514,
-    1524
+    20240621,
+    1647
    ],
-   "commit": "d2cff2b7f210846108875c7eccb1b5ab98bceb74",
-   "sha256": "0gxjm594k1i0xiavmk27z9mv9qh5q4k5h3ih198pm637k31ziviy"
+   "commit": "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7",
+   "sha256": "0g57p95zqyxcryrzcc16q6w5xv9i9y4dncqb4h7ixdgw6bcvlhqk"
   }
  },
  {
@@ -104513,11 +105285,11 @@
   "repo": "ideasman42/emacs-recomplete",
   "unstable": {
    "version": [
-    20240422,
-    15
+    20240616,
+    2345
    ],
-   "commit": "9b4ab842e37eed9b8314ba81b4eac49beeea8c1c",
-   "sha256": "1m9cz4g672wzsf2np7lzksgxl75bc790nq51gy97qrsjbwn6gj99"
+   "commit": "7a5c4c86cdbf8ba6b045d5ace466e5dcb2f10db0",
+   "sha256": "0j9ir47ny9m0kq4da7jvmv5qf282i0imm3xwfbjyxnhmmq5nj3zv"
   }
  },
  {
@@ -104628,14 +105400,14 @@
   "repo": "minad/recursion-indicator",
   "unstable": {
    "version": [
-    20240122,
-    2254
+    20240708,
+    2119
    ],
    "deps": [
     "compat"
    ],
-   "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f",
-   "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l"
+   "commit": "e0eccd3b4b7d7bb162767d4c5a028e646437555c",
+   "sha256": "0pzwyrsdpsrrnchxk8qihqr8blx366yw9snrcy1l1fj9hhsks7bs"
   },
   "stable": {
    "version": [
@@ -104965,11 +105737,11 @@
   "repo": "alvarogonzalezsotillo/region-occurrences-highlighter",
   "unstable": {
    "version": [
-    20240417,
-    2146
+    20240626,
+    1101
    ],
-   "commit": "a1ade7985656faf00f8a6afda885e8bdf959d133",
-   "sha256": "01j8i1z6mf7c2g59yzx6hrd799pxk6rdq2dvsl1r0bppgi5kv8dy"
+   "commit": "55f9d100ef67f174c55209f8d4cef1962a9adfc2",
+   "sha256": "0cay4dsqrcpwml0bpsmpnx0mkprr8jj1m6a027m7dfpmhf2xlrmn"
   }
  },
  {
@@ -105052,6 +105824,21 @@
    "sha256": "1lm53zg30n96bq8z5g836dhk0y02njdyp8c6vjgsrcii4ff42jp5"
   }
  },
+ {
+  "ename": "regswap",
+  "commit": "ec1df4dd5d259b86ab7b726e482ad6ca7f0db63c",
+  "sha256": "0sh27hf69kqc34bb6syidk4x414h2liv3k0ilv976s3djs97wlf2",
+  "fetcher": "github",
+  "repo": "skitov/regswap",
+  "unstable": {
+   "version": [
+    20240602,
+    2051
+   ],
+   "commit": "65e2319e013c5d59f338edde12b98ef1c737e870",
+   "sha256": "0hbvf0f72a2icyi503iypqcy98pa5fkxxbv141r73xi53s1g2vqr"
+  }
+ },
  {
   "ename": "related",
   "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8",
@@ -106454,11 +107241,11 @@
   "repo": "jgkamat/rmsbolt",
   "unstable": {
    "version": [
-    20240507,
-    47
+    20240622,
+    1704
    ],
-   "commit": "32604147643dbfebe499ea8a4b139cc68acd2746",
-   "sha256": "07l5c1apdck8a73z4mh3r7jpwz1c97p4i6qz1lg5ygmr1wnhpncy"
+   "commit": "484d9c06f0544532336ad2ac2ddf46a1a81272ef",
+   "sha256": "1sky9qvrycqjmhlhrd3jn2mpdgii3m9m6r48nb6m6s7pshwlydw3"
   }
  },
  {
@@ -106523,11 +107310,11 @@
   "repo": "kopoli/robot-mode",
   "unstable": {
    "version": [
-    20231118,
-    826
+    20240711,
+    2007
    ],
-   "commit": "cb12e5adcba3379a67483e268229c152e0a8405f",
-   "sha256": "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa"
+   "commit": "03bd436ff88c41e9c4d6b1df865d5abb062f5e37",
+   "sha256": "056n3jwpnb3fgczn38hsg0vs6969rjz11dma38mip8icr20ysllb"
   },
   "stable": {
    "version": [
@@ -107322,16 +108109,16 @@
   "repo": "semenInRussia/emacs-run-command-recipes",
   "unstable": {
    "version": [
-    20231219,
-    1331
+    20240708,
+    1555
    ],
    "deps": [
     "dash",
     "f",
     "run-command"
    ],
-   "commit": "63405333f23b33ecda08e716eca8588c8950952d",
-   "sha256": "0wlg7qx7r94cnnrhp99wfiwna1zwccshg93r32zj2ah9j4mba500"
+   "commit": "5a249052933dfa5e8f768da6c73d926e167d6175",
+   "sha256": "0cpg31wm7r171ra86w3x2va08qx7b49mv397x13q7c1fkd3xxfx1"
   }
  },
  {
@@ -107498,29 +108285,29 @@
  },
  {
   "ename": "rustic",
-  "commit": "716c14a2ed8f5817c09c1ff530a4980c17b44bb3",
-  "sha256": "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n",
+  "commit": "3cc337cbfdd1f09e6a18bbbe8f8cf470601a2db4",
+  "sha256": "1azn2m6vac8zinykzw8nhzmg16in3h4f0p6jl08sskgb6lc722kp",
   "fetcher": "github",
-  "repo": "brotzeit/rustic",
+  "repo": "emacs-rustic/rustic",
   "unstable": {
    "version": [
-    20230130,
-    912
+    20240708,
+    2105
    ],
    "deps": [
     "dash",
     "f",
+    "flycheck",
     "let-alist",
     "markdown-mode",
     "project",
     "rust-mode",
     "s",
-    "seq",
     "spinner",
     "xterm-color"
    ],
-   "commit": "a5fc66c8167a827a57c4426e4b8dbe717b3be43c",
-   "sha256": "1kg1brqy6bv8z2qw4q3f70az3mcz26pb387qrjlx2ik027zyr0ih"
+   "commit": "c1893528ad6b8e8ca795b547f326ec52dacf8728",
+   "sha256": "001iv1ymiz0bgq14nzysyzamw46zgiap0vgkj9a3rfi68cky524w"
   },
   "stable": {
    "version": [
@@ -108086,25 +108873,25 @@
   "repo": "openscad/emacs-scad-mode",
   "unstable": {
    "version": [
-    20240429,
-    1628
+    20240708,
+    2120
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8b830727c343bf762d9469b413f0c2a4c1996fe2",
-   "sha256": "07rk69b0sbcwh4mjpapzv93awwl4w5n0q73915rrxifqf6n3bjsp"
+   "commit": "17a8158cc55fed473aa87d53f3f2b42e1c249d11",
+   "sha256": "13h58abcpyykv136pfn7735jhx73dni91smmk52rv0p5cf8rd3qk"
   },
   "stable": {
    "version": [
-    93,
-    3
+    94,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8d5650c5cfee96c42d64427bfcadb89f6bda66be",
-   "sha256": "08yia0q18b0w3lkr4wh1bd1v606cksi6hpz72nqjvv59qyjfmg01"
+   "commit": "3c32b141f083c31539bb24700eb0aa23ea55918c",
+   "sha256": "1fgnvshyyxyhp4qxc29iqdzvdg2cj2d94lbgsii2bby3k18fzqxc"
   }
  },
  {
@@ -108172,11 +108959,11 @@
   "repo": "KaranAhlawat/scala-ts-mode",
   "unstable": {
    "version": [
-    20240420,
-    1150
+    20240630,
+    1733
    ],
-   "commit": "d9424fa74acf930664c43d4c9f9625d8bfdd4d21",
-   "sha256": "0sc2sx3pgifcnd2zw7nvk3f8z3v1zh2q94d9rnlayvwr6y4cnlq4"
+   "commit": "8c4ace721fb525d1a790121a8625bc2623c9f207",
+   "sha256": "100zx8f57f8gdi8wmkcj38nannyzgpybc63jzs466c61f7li5wjg"
   }
  },
  {
@@ -108684,6 +109471,25 @@
    "sha256": "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc"
   }
  },
+ {
+  "ename": "sdml-mode",
+  "commit": "3ef7d39f3984edd3e50db8fe36ea496aec844648",
+  "sha256": "02ja7qa98r8azdkgbiqc8vg8lyba7qhqm2ng0aia739bpxqxac97",
+  "fetcher": "github",
+  "repo": "sdm-lang/emacs-sdml-mode",
+  "unstable": {
+   "version": [
+    20240708,
+    1403
+   ],
+   "deps": [
+    "tree-sitter",
+    "tree-sitter-indent"
+   ],
+   "commit": "33e44bfe8fddefc16538407d55da3ca85cfc1a6d",
+   "sha256": "1nv97ffwvaqgh2vycm0cgn1nra6qyajl25fwx1kl0psfb3k7kfiv"
+  }
+ },
  {
   "ename": "search-web",
   "commit": "1f1a3697649ccf69c8eb177c31ec4246b98f503b",
@@ -108944,14 +109750,11 @@
   "repo": "captainflasmr/selected-window-accent-mode",
   "unstable": {
    "version": [
-    20240427,
-    833
+    20240709,
+    1942
    ],
-   "deps": [
-    "visual-fill-column"
-   ],
-   "commit": "79397e634a89c5e16de1d317f735aafe75c78aea",
-   "sha256": "0dwb4j62n13dg8kl2maci1668v0nsnc55xfjfva3wm5singb72zl"
+   "commit": "0c09d2aeb778ac3a03f2c3d99dfada9ba67e40ae",
+   "sha256": "0mqjgdym0nqlzrjwjmm6qzbmd51kv0z7mxxacsl3fzbwyj364g19"
   },
   "stable": {
    "version": [
@@ -109104,15 +109907,15 @@
   "repo": "wanderlust/semi",
   "unstable": {
    "version": [
-    20231102,
-    1035
+    20240606,
+    1327
    ],
    "deps": [
     "apel",
     "flim"
    ],
-   "commit": "9063a4485b148a767ea924f0e7cc78d3524ba256",
-   "sha256": "18km8jdxjcqnh378xxd7ivvvcxzrif8zpq9zgki9i7f0q8lsx677"
+   "commit": "85a52b899ac89be504d9e38d8d406bba98f4b0b3",
+   "sha256": "13sfwv889i99l5zv10ibzm221wvwbp3m45nf4nsr0dhvln90zrjj"
   }
  },
  {
@@ -109881,11 +110684,11 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240227,
-    2310
+    20240623,
+    1713
    ],
-   "commit": "03afa7339930e5715c217455f3070c88a7fac55c",
-   "sha256": "1n6gpfyq13180k41jn3xnar0gz3a9qz08nz8v5xjj0qxdgml02g6"
+   "commit": "f3307e7ffac399e36cb70d7663181dd53caf712a",
+   "sha256": "1i0w4izfzggnhr99wy6nb9zkc5p31pfxn2s962kkba6r2zvv435y"
   }
  },
  {
@@ -110208,11 +111011,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20240423,
-    31
+    20240712,
+    215
    ],
-   "commit": "1da8d4f11cc5f79bce124d0a32be59be18359373",
-   "sha256": "063klgl664n8qw82g7c31vsbw1npw7l2jc5n2g9bndhhq8hg5g2g"
+   "commit": "3c8530d29e54b64023d8c038e5046e085b052fa8",
+   "sha256": "1160a99djlixcxx1sh3jhpxxx96k9v2jnx7b67ar1rn5s2qc7dzb"
   }
  },
  {
@@ -110239,6 +111042,21 @@
    "sha256": "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk"
   }
  },
+ {
+  "ename": "shortcuts-mode",
+  "commit": "e4c72fcc02373dab446c14eae1e518a4706bb993",
+  "sha256": "191s3r3ydl1mbchicq24vch2qcr57f480ypcy0zzrdjlw34jyl0n",
+  "fetcher": "github",
+  "repo": "tetron/shortcuts-mode",
+  "unstable": {
+   "version": [
+    20240707,
+    1606
+   ],
+   "commit": "a781ae97e33f5a0bf75058c21a7784032e22b28d",
+   "sha256": "1na0qmpq5z5fx3b84s9bxkfskny92bl7ny6lbmnbvhs3b0v84fk0"
+  }
+ },
  {
   "ename": "shoulda",
   "commit": "41497a876c80d81d9562ea4b2cc2a83dba98ae8a",
@@ -110398,15 +111216,15 @@
   "repo": "chenyanming/shrface",
   "unstable": {
    "version": [
-    20240401,
-    957
+    20240622,
+    712
    ],
    "deps": [
     "language-detection",
     "org"
    ],
-   "commit": "b82a174ee33f19ed96c7e8c85ec362eab147d4aa",
-   "sha256": "0qspg55r397p6p16c4cps547x2w7gdplshy3scr810iwphrzsvfy"
+   "commit": "a684fda3485684714a87b637c76b843fc15cecbb",
+   "sha256": "0x0x4plkmphz2qwxsv3vrgvhy2hcqbgs0aa03iqvxnyg22ih6pjk"
   },
   "stable": {
    "version": [
@@ -110608,14 +111426,14 @@
   "repo": "rnkn/side-hustle",
   "unstable": {
    "version": [
-    20240325,
-    205
+    20240625,
+    1228
    ],
    "deps": [
     "seq"
    ],
-   "commit": "903380cf9e08d98689c2c116965f8e47d002fad6",
-   "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn"
+   "commit": "94450b58cec1b809afe08d0754a6662839efbc9d",
+   "sha256": "1lhvp1vqkkxrx1fl9xp1q0dvwgh8iidz6w0sznjvc0dbl15vx55q"
   },
   "stable": {
    "version": [
@@ -110626,7 +111444,7 @@
    "deps": [
     "seq"
    ],
-   "commit": "903380cf9e08d98689c2c116965f8e47d002fad6",
+   "commit": "0ac8dfa02ddd33cfa0e3cff834b68e32185db9ee",
    "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn"
   }
  },
@@ -110638,11 +111456,11 @@
   "repo": "rnkn/side-notes",
   "unstable": {
    "version": [
-    20230814,
-    302
+    20240629,
+    1008
    ],
-   "commit": "fbe409066df83a7e64a6a9ddf6d99ce7177fcdbb",
-   "sha256": "14jmki9lrcf78g362sxjvs1a55cz99p2pvnrvvr0hnn7lh6rfd4l"
+   "commit": "96a142dfd5768d66b1d574027e13c572e4c82a87",
+   "sha256": "09nisfdlib6n94pv5axvj64znh77jsdifv55d69kb71azpjl7r68"
   },
   "stable": {
    "version": [
@@ -110650,7 +111468,7 @@
     4,
     1
    ],
-   "commit": "d41255fc2b8cadfc7882c617c7d1aff71524ed46",
+   "commit": "452378c68b7e95b9e8244d20ace073a0be27ccb2",
    "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr"
   }
  },
@@ -110677,14 +111495,14 @@
   "repo": "emacs-sideline/sideline",
   "unstable": {
    "version": [
-    20240521,
-    31
+    20240627,
+    47
    ],
    "deps": [
     "ht"
    ],
-   "commit": "31ef3c21d99785e7a066ad8c188ddcd2b478b5fe",
-   "sha256": "17qflpmc7kwn0cikysardxda25wanmax55hc6ifwgcp330wp4742"
+   "commit": "ba55945617f04763f9e93525fdf1e2826e4d667a",
+   "sha256": "1iizibw9aai04ni0g074a7yb5bidmwvq2ygw72gwxdg4v6h2wldy"
   },
   "stable": {
    "version": [
@@ -110736,16 +111554,16 @@
   "repo": "emacs-sideline/sideline-flycheck",
   "unstable": {
    "version": [
-    20240509,
-    742
+    20240629,
+    840
    ],
    "deps": [
     "flycheck",
     "ht",
     "sideline"
    ],
-   "commit": "f809e627e433bd9a58471e4dea1ed50305eef7f2",
-   "sha256": "0z0152cnkb8bwc3j0gi1zyasvwxc7anlrj2qr0zj6pbxyl61k5m3"
+   "commit": "4147f2754c353e0b7920caf385b8dccc5e6301f7",
+   "sha256": "1978b149d7mza2r2mknp01zvpf55sz49addaxd153fqdsmf8hxq8"
   },
   "stable": {
    "version": [
@@ -110946,14 +111764,14 @@
   "repo": "vapniks/simple-call-tree",
   "unstable": {
    "version": [
-    20210625,
-    2001
+    20240713,
+    1008
    ],
    "deps": [
     "anaphora"
    ],
-   "commit": "26de24bcde0eae911a0185bb5a6b74b9864fcfc3",
-   "sha256": "0589ns2v6jxyd7adjkj34zlcnnxbfs6c7hm56yskbs2s4qkkf369"
+   "commit": "90de7cb42e1dbfe295516e696df928966f1eede9",
+   "sha256": "19nbwrc2pg44qqryslm3mzjc3isxx1indmdxms39j71qzwgig6ad"
   }
  },
  {
@@ -111230,6 +112048,21 @@
    "sha256": "0ydgx94wxv6x81yqzy5bwrs06cx8hsrw2c1y4gw3awm953m9259g"
   }
  },
+ {
+  "ename": "sink",
+  "commit": "9f6b09154d54b3bfbc16ef606fc7dfefb4762014",
+  "sha256": "0wqxm6qs736q856w4niy7zfi2bvb31dg8zw24xr42qr07irk4x84",
+  "fetcher": "github",
+  "repo": "alcah/sink.el",
+  "unstable": {
+   "version": [
+    20240523,
+    747
+   ],
+   "commit": "a14e1cc0a051543723c043a5ece081ce9a567ddd",
+   "sha256": "17pk3zqy1zddcdhfm0ybff41l1plx4cypv9sxaydgl3yyi34zwkv"
+  }
+ },
  {
   "ename": "siri-shortcuts",
   "commit": "f3a67195c63059fbc2d2714b540505bb9cde49d1",
@@ -111592,14 +112425,14 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20240516,
-    319
+    20240705,
+    2255
    ],
    "deps": [
     "macrostep"
    ],
-   "commit": "5ced74ab35d91f6be7d8fa10e1098aaae6b749e3",
-   "sha256": "0bq0vi22mr43l64q501hkv11sp58bmn8hgxmc61if0xc1rlcs68v"
+   "commit": "eb30f9f7bae4f8eed27a060390ff8aadcf69174e",
+   "sha256": "09wz5pdgdq2md0m1z6c47sab3xxvwl897mci1axw44ny8g914f9z"
   },
   "stable": {
    "version": [
@@ -112389,15 +113222,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20240416,
-    2253
+    20240713,
+    1002
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "d3b616843167f04b8a9f53dd25e84818c9f6fbce",
-   "sha256": "04vv9swkn3l2lcdb4ncmc6vr3967mglfgiabn1978gyhv4xp9nwm"
+   "commit": "c7519a1b69f196050a13e2230b7532893b077086",
+   "sha256": "06bdr3vcywg6k89d5dmvj4sdxh95y0jgh5xlddvmv2x0i8d7g69b"
   },
   "stable": {
    "version": [
@@ -113421,23 +114254,20 @@
   "repo": "djgoku/sops",
   "unstable": {
    "version": [
-    20240315,
-    2226
+    20240621,
+    1919
    ],
-   "deps": [
-    "s"
-   ],
-   "commit": "9ed9f02ff83ab6e0cb0173f0578be1a5b71e3b66",
-   "sha256": "1120zfpnask7p3jspyk7yk1qq1g1m7vwp6kfxk7vd3yz9v732cds"
+   "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030",
+   "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi"
   },
   "stable": {
    "version": [
     0,
     1,
-    0
+    4
    ],
-   "commit": "b7b6784fb53659c3e8d103dbb027b12cf4846d8c",
-   "sha256": "1bls67w733cgpnm3b3rrw93jpkckrc4g7a4pprgnm96b3w4qrrkp"
+   "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030",
+   "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi"
   }
  },
  {
@@ -113466,11 +114296,11 @@
   "repo": "mssola/soria",
   "unstable": {
    "version": [
-    20230227,
-    1454
+    20240603,
+    903
    ],
-   "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab",
-   "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81"
+   "commit": "c6dbabc1b4f956e19c7e80f16e69f3d6c57b84b4",
+   "sha256": "1zsazml4qsbvnqb418fiknpj3zcnicl6m6x65i29ipwrjsi41i6j"
   },
   "stable": {
    "version": [
@@ -113870,11 +114700,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20230530,
-    1751
+    20240623,
+    2202
    ],
-   "commit": "319ad1cd6aa05dcb43e4edca50eca339892e0865",
-   "sha256": "1kmfmf7d5qw06y5hrfspzmds13r9ijvsh9f2fnahg1mr3a6g3bjl"
+   "commit": "7b06ef8fb26825e0035c70c81ac130b930d81bbc",
+   "sha256": "0idlbwnf4zk1sf0jqbx9r1m3j9bjsl1gzxmbsziz4xjp769y1z5b"
   },
   "stable": {
    "version": [
@@ -114013,11 +114843,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20240522,
-    104
+    20240629,
+    106
    ],
-   "commit": "448e0e5e491e2447da2590ff216675e083d910ff",
-   "sha256": "160h11025fkxg734ri944l2jndfpmg9mlar0jy8aqk3bys3mc85i"
+   "commit": "70aa416c65bb8487f3cee6dd170b451fc489e902",
+   "sha256": "1kzvav066mp5i4f5y8wc6c1zy6aa3zfhhamzlw7d26j378wcb5vv"
   }
  },
  {
@@ -114141,11 +114971,11 @@
   "repo": "ideasman42/emacs-spell-fu",
   "unstable": {
    "version": [
-    20240421,
-    2351
+    20240616,
+    2345
    ],
-   "commit": "7f9332a299b41e1fa4da9a82669f5981f6ffd3cc",
-   "sha256": "19155y36mxdqrrnqw62hmysprvw1dajap1y4rcx1nr7j9xkwjs6h"
+   "commit": "74d2701d78c1759074566f150d96a3596072359a",
+   "sha256": "1fg6nyfw1hwfx8gxwkqyyy4b6hhb4nhvxpzq2zv89zqwkvn0byhc"
   }
  },
  {
@@ -114287,6 +115117,30 @@
    "sha256": "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"
   }
  },
+ {
+  "ename": "splunk-mode",
+  "commit": "d1338dc75894d9494d769f220b836f98189b7254",
+  "sha256": "0k7vbcxwr4pfab8dh7kmnrqzbkfd5779icn8l5a3f8knzgs6w07r",
+  "fetcher": "github",
+  "repo": "jakewilliami/splunk-mode",
+  "unstable": {
+   "version": [
+    20240422,
+    828
+   ],
+   "commit": "3a9b114fdbabb6e7d6206b1863c54de438bf506b",
+   "sha256": "02xqingvciigy9bhl1348h0cidx09wcq6fi6rws71jsw99ppfls1"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "commit": "fbc0b5faa2f33a3656f7c549ed9f064a01530dc9",
+   "sha256": "1bwrq579jm6w23p8hblqm0yrgapqlh9zc63c8d1v5g6kv9hdblb9"
+  }
+ },
  {
   "ename": "spotify",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -114718,11 +115572,11 @@
   "repo": "emacsorphanage/sr-speedbar",
   "unstable": {
    "version": [
-    20161025,
-    831
+    20220705,
+    1231
    ],
-   "commit": "77a83fb50f763a465c021eca7343243f465b4a47",
-   "sha256": "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153"
+   "commit": "73ecfc21cf38f0cb1dfbbebebdc3cf573eccf7d2",
+   "sha256": "1f8gh4csg4p160r9rawm0m8xgdyskarhnmdsly46f6zci3yc35z3"
   },
   "stable": {
    "version": [
@@ -115056,8 +115910,8 @@
   "repo": "daanturo/starhugger.el",
   "unstable": {
    "version": [
-    20231202,
-    235
+    20240523,
+    326
    ],
    "deps": [
     "compat",
@@ -115065,8 +115919,8 @@
     "s",
     "spinner"
    ],
-   "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79",
-   "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d"
+   "commit": "17c3847566447e2a860d5837d35380160276bed6",
+   "sha256": "0cx256mxn6s0nz7cgmc7iadqshj3flmhzc78v61ci21r999j3kpz"
   },
   "stable": {
    "version": [
@@ -116120,11 +116974,11 @@
   "repo": "matsl/sv-kalender-namnsdagar",
   "unstable": {
    "version": [
-    20190421,
-    1521
+    20240620,
+    1416
    ],
-   "commit": "fff970f49c77abfc69e37817f25a939818420971",
-   "sha256": "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2"
+   "commit": "743aa9eec1364fa4194e11f7f10c29688cdd636b",
+   "sha256": "0mliqsd5s5vb229kn7813vq5crg1wlbbyjkkvq6841sk6y0x2mjn"
   }
  },
  {
@@ -116180,14 +117034,14 @@
   "repo": "rougier/svg-tag-mode",
   "unstable": {
    "version": [
-    20240429,
-    1052
+    20240624,
+    857
    ],
    "deps": [
     "svg-lib"
    ],
-   "commit": "a152bc90a7c9dc17112893a19ddf91078b909057",
-   "sha256": "12spnrblv3h7yzc0cpk0xj6sbcfcq2y4j3mg7a16m2nhafw2kn0y"
+   "commit": "ece58da9362d34be48ac658107bd9b99ac250162",
+   "sha256": "0d1bkdqwawscdi1xfh54rv19sxfdagnxy1gz0xqkq8lhgs6asdsy"
   }
  },
  {
@@ -116478,14 +117332,14 @@
   "repo": "swift-emacs/swift-mode",
   "unstable": {
    "version": [
-    20240217,
-    631
+    20240622,
+    935
    ],
    "deps": [
     "seq"
    ],
-   "commit": "25cf8237312bf5eddc2c90001feb8f73633ab523",
-   "sha256": "0p7rfzyysmxzwvy595b72jlbl2gjb4b6pgm21qdg9dg00hmf3c1n"
+   "commit": "b06c97b909418b5dca3d15351b2ce86a04df32fb",
+   "sha256": "03b7n4sw5q7dhl06bm9bkdzhlzn5kyvlsc149jplc4c9xxnvnki6"
   },
   "stable": {
    "version": [
@@ -116508,11 +117362,11 @@
   "repo": "rechsteiner/swift-ts-mode",
   "unstable": {
    "version": [
-    20240414,
-    949
+    20240603,
+    735
    ],
-   "commit": "a62f4d84b836fe208d912c26fb561c93a0c8e296",
-   "sha256": "0zzx8fg17vzh0r8ln884zg2kd7qj1bn9mnnvcr4fiv0x4dc16sgg"
+   "commit": "5e198d306bd4d49e4dddab39195fe99e1caf8892",
+   "sha256": "1amxdcy7f8ixs7wq5jrmd8kca5a5vdijfv9jlz6ffvl3wqb01c3k"
   }
  },
  {
@@ -116858,11 +117712,11 @@
   "repo": "liushihao456/symbols-outline.el",
   "unstable": {
    "version": [
-    20240517,
-    819
+    20240701,
+    849
    ],
-   "commit": "bfebe73b1322cdc32353375b55f5f56aad85fb57",
-   "sha256": "0gnmqw3gdgjqb0vfzl2vi3zvk89mnx2yxq8sdz7rn4y8hbyxsmh0"
+   "commit": "9664a1338b5755fe811eddd59f20a64a23da4063",
+   "sha256": "172hnb2jgc5z3c89sdb3jnif4lwisrj7yanr2kl418mg61ngm024"
   }
  },
  {
@@ -116899,8 +117753,8 @@
   "repo": "drym-org/symex.el",
   "unstable": {
    "version": [
-    20240418,
-    806
+    20240627,
+    419
    ],
    "deps": [
     "evil",
@@ -116913,8 +117767,8 @@
     "tree-sitter",
     "tsc"
    ],
-   "commit": "db8ac5b3039b91e28d4c403c98fcb799ec94369e",
-   "sha256": "065njm2610vhvsg1f0pm7ri51fp93f8234in1p791iqmmykdk7jx"
+   "commit": "6ef879ca83c111a0863c71dea29461138ae6331d",
+   "sha256": "0ypsk3k3s3y302zygm0im2g2cr7l753yn5ymr99rkzli629framz"
   },
   "stable": {
    "version": [
@@ -117572,8 +118426,8 @@
   "repo": "shuxiao9058/tabnine",
   "unstable": {
    "version": [
-    20240426,
-    516
+    20240629,
+    1347
    ],
    "deps": [
     "dash",
@@ -117582,8 +118436,8 @@
     "s",
     "transient"
    ],
-   "commit": "06804c5fea50d79de458a99699a16adaf3c52498",
-   "sha256": "1k9qv7w9065j4k601yy5jk0ypx5vk4ji6viv61ss9z1b1fq37yiq"
+   "commit": "64b1556e5acd165112827e4219d29cb0f5d24c7b",
+   "sha256": "1r7n1ksjvxi8gpk7a5s4vblxm6hrsc9s6gmfgn37wykxfmdad8yb"
   }
  },
  {
@@ -117716,11 +118570,11 @@
   "repo": "tmalsburg/tango-plus-theme",
   "unstable": {
    "version": [
-    20221011,
-    1012
+    20240703,
+    1443
    ],
-   "commit": "30495d1ab1df6213ecac008c599b91e6f9244c12",
-   "sha256": "1qdz7nf4wqv58ck02ralp7l4an1ashh1bnjgqkp444as3vyli2c4"
+   "commit": "e042de79ba009a55aeebe30aafed01234c925be2",
+   "sha256": "109g4w47bx17rpl4n96bcx254xiai89gbi4j89yhzf5cbldmj764"
   }
  },
  {
@@ -117761,11 +118615,11 @@
   "repo": "11111000000/tao-theme-emacs",
   "unstable": {
    "version": [
-    20240426,
-    439
+    20240615,
+    517
    ],
-   "commit": "af5926c53aebc591f1c77eb8ca8ff1ea9a73eaa5",
-   "sha256": "1jb2klplyngmv6pl6v39y0072hqgpgs22i7yk3097kbxv8llmk5c"
+   "commit": "cd8ac4aee9fff55bc092ce78d93bd40517fa2c2a",
+   "sha256": "1r27zvymbgq50akhj6l7s1aj0sz81a375lxdhl8cl9jg74w31i6i"
   },
   "stable": {
    "version": [
@@ -117800,11 +118654,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20240112,
-    1656
+    20240710,
+    1449
    ],
-   "commit": "70897b621ab541dc4b7874a55378aa5a75095e2e",
-   "sha256": "1g5lpl8jr58c225rhvjjzrnarv30n0f3xk58srrqwzrcdvqzywmm"
+   "commit": "db698431a55bb68b8d756de3be7fe4a235ccf55c",
+   "sha256": "1ndka7dmf5p01nwz72r4cs3npl7zv3hixz6kwyf324n9xfar79z4"
   },
   "stable": {
    "version": [
@@ -117991,16 +118845,16 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20240515,
-    2217
+    20240527,
+    606
    ],
    "deps": [
     "rainbow-identifiers",
     "transient",
     "visual-fill-column"
    ],
-   "commit": "3d2e5ee323366906b00d8ed40e818d41e82b73e5",
-   "sha256": "117mck96hd0ai0ra7kv8kv78v88vms55ac64dqbrqndiwna4c6sl"
+   "commit": "58b4963b292ceb723d665df100b519eb5a99c676",
+   "sha256": "1q3ydbm0jhrsyvvdn0mpmxvskq0l53jkh40a5hlx7i3qkinbhbry"
   },
   "stable": {
    "version": [
@@ -118080,14 +118934,14 @@
   "repo": "caramelhooves/teleport.el",
   "unstable": {
    "version": [
-    20240501,
-    740
+    20240712,
+    1820
    ],
    "deps": [
     "dash"
    ],
-   "commit": "7a99ec17e5c1d3bab3bc842e045b06ea335c97b9",
-   "sha256": "15kns3478xvwnn0dl883swh7x7k043b71zrv3gk0jazh60vn3q6j"
+   "commit": "bfdeb5c5e89665cbce24a1d04fc6cf62835bd18f",
+   "sha256": "1as20k8fg4wspa4icfpx1mc76j9lgqdh7qvb0jwaikq9cm7s8ls7"
   }
  },
  {
@@ -118131,14 +118985,14 @@
   "repo": "minad/tempel",
   "unstable": {
    "version": [
-    20240216,
-    1543
+    20240708,
+    2120
    ],
    "deps": [
     "compat"
    ],
-   "commit": "bcc3185202edce67c7f7fc74287cc2ecbeef10c6",
-   "sha256": "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5"
+   "commit": "51eff558b986aa80e816bb00fbaf310f03f017c0",
+   "sha256": "18rbkzvd0c6dnbgggy6lvgv0baznkzviz2738ixa3y3b8mws4333"
   },
   "stable": {
    "version": [
@@ -118193,6 +119047,25 @@
    "sha256": "077hk4ssb1bvjxs6f7v78kyqiypx6rv00j3ij61an8z0l878p4yw"
   }
  },
+ {
+  "ename": "template-dumper",
+  "commit": "64632d1e754d4ad72db299a3e6f88b56091b9a9d",
+  "sha256": "0czf0cpszgpjbjpq56hmffhzkv3hbmg2q7nbfbp77s23v1wdfdln",
+  "fetcher": "github",
+  "repo": "natelastname/template-dumper",
+  "unstable": {
+   "version": [
+    20240630,
+    2236
+   ],
+   "deps": [
+    "f",
+    "yasnippet"
+   ],
+   "commit": "92fb170d572f044aaedaa2535990eba556347dfe",
+   "sha256": "1ai27rlll766vp1njwzhvayad4k386j9x1hx550j1a8in9kk3wbh"
+  }
+ },
  {
   "ename": "template-overlays",
   "commit": "8856e67aae1f623714bc2a61a7b4773ed1fb2934",
@@ -118213,10 +119086,10 @@
  },
  {
   "ename": "templatel",
-  "commit": "0e43ad23f7b58ddb82bc08066d8b48e04708b5ba",
-  "sha256": "10sx3kd22z4qa1g60c3fzxpc55xlddmb4iqqdbiqkn6bqzdzrslq",
+  "commit": "28df3fa5bb95c17d1423532e156025cd64b59151",
+  "sha256": "0016yv3vcjakqax3b2pf6h4a9pac3xnmqb72d3mc8z35xzr02pcs",
   "fetcher": "github",
-  "repo": "clarete/templatel",
+  "repo": "emacs-love/templatel",
   "unstable": {
    "version": [
     20210902,
@@ -118413,14 +119286,14 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20230727,
-    2308
+    20240602,
+    2356
    ],
    "deps": [
     "dash"
    ],
-   "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8",
-   "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0"
+   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
+   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
   },
   "stable": {
    "version": [
@@ -118443,14 +119316,14 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20230727,
-    2308
+    20240602,
+    2356
    ],
    "deps": [
     "term-manager"
    ],
-   "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8",
-   "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0"
+   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
+   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
   },
   "stable": {
    "version": [
@@ -118473,15 +119346,15 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20230727,
-    2308
+    20240602,
+    2356
    ],
    "deps": [
     "projectile",
     "term-manager"
    ],
-   "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8",
-   "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0"
+   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
+   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
   },
   "stable": {
    "version": [
@@ -118829,15 +119702,15 @@
   "repo": "johannes-mueller/test-cockpit.el",
   "unstable": {
    "version": [
-    20240519,
-    1747
+    20240604,
+    1943
    ],
    "deps": [
     "projectile",
     "toml"
    ],
-   "commit": "2b836e5f954059210b6efaecebfe5fd7c72e726c",
-   "sha256": "0f62xly0pvsfqnkzm0yfflbd54mljbfc6jzp8kqk8w8598j548ak"
+   "commit": "068d3a393cebdc871236b8d1e45e06f997e2b0d0",
+   "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw"
   }
  },
  {
@@ -119322,21 +120195,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20240519,
+    20240707,
     1631
    ],
-   "commit": "8baf3aed99934494267647ee8f309f9d712d4325",
-   "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88"
+   "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003",
+   "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2"
   },
   "stable": {
    "version": [
     2024,
-    5,
-    20,
+    7,
+    8,
     0
    ],
-   "commit": "8baf3aed99934494267647ee8f309f9d712d4325",
-   "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88"
+   "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003",
+   "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2"
   }
  },
  {
@@ -119587,6 +120460,21 @@
    "sha256": "0sxsvcvxrmyaqp4r5khqv29i7a61kxg4z439b5xc40sfxsljk9pp"
   }
  },
+ {
+  "ename": "timeout",
+  "commit": "2d6d0964343cd9e23babbcc71b1dee07ca1ccf4c",
+  "sha256": "1zna80pa1csnigkz2nfvwrjnqnji1cj8dmbgq4wkbjg66hk7fbmn",
+  "fetcher": "github",
+  "repo": "karthink/timeout",
+  "unstable": {
+   "version": [
+    20240623,
+    2023
+   ],
+   "commit": "d59ca149307182b20e9843db0dd1738e01504cf1",
+   "sha256": "1adbcam0cz7gkijjzgajybz9z2cfizxylfggamqp23w52c1nbrxm"
+  }
+ },
  {
   "ename": "timer-revert",
   "commit": "991e68c59d1fbaef06ba2583f07499ecad05586d",
@@ -120064,16 +120952,16 @@
   "repo": "abrochard/emacs-todoist",
   "unstable": {
    "version": [
-    20240113,
-    1729
+    20240624,
+    1512
    ],
    "deps": [
     "dash",
     "org",
     "transient"
    ],
-   "commit": "e756a345d213d93fbb965d1314c4dec62566c653",
-   "sha256": "18hnpmbbmn939s0z0ynjxl3fkgg9xzpj82rvks81xvv8nf19wfsx"
+   "commit": "205c730a4615dec20ea71ccd0a09479a420cb974",
+   "sha256": "11hgxg5q84ql9hhcz5wiqsx4hd6s2mrvzvl1axh6l7li8mji67r7"
   }
  },
  {
@@ -120139,6 +121027,21 @@
    "sha256": "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg"
   }
  },
+ {
+  "ename": "toggle-term",
+  "commit": "e93a5811bdce0beeacc539b702ca4afd53508fda",
+  "sha256": "1i37alcpsziyidxzm6dvcc29gd6fbminhj1sq7xmwrznpl4ja1m1",
+  "fetcher": "github",
+  "repo": "justinlime/toggle-term.el",
+  "unstable": {
+   "version": [
+    20240616,
+    722
+   ],
+   "commit": "d17596b8ed52e6a2f0c7f6754ee6fa233d28c146",
+   "sha256": "041p36p0g0qpdfhwh9b1zy0lp2m1w8f3zk9z7m8cpdj87ddqva45"
+  }
+ },
  {
   "ename": "toggle-test",
   "commit": "8ea51a54b745d9978c5177182cd8501912aa2d01",
@@ -120285,6 +121188,30 @@
    "sha256": "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay"
   }
  },
+ {
+  "ename": "tomorrow-night-deepblue-theme",
+  "commit": "5de4420ac32b3f10b7ab5a5dff2c6a7a8f22aeb2",
+  "sha256": "0bzg8m0bqmgvfhz4xcrpsiy7wfbls1sq6fjh2yj02nnfmkgzqcs1",
+  "fetcher": "github",
+  "repo": "jamescherti/tomorrow-night-deepblue-theme.el",
+  "unstable": {
+   "version": [
+    20240712,
+    1635
+   ],
+   "commit": "5359e32f641ba4f2d596999d32a702182a1add73",
+   "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    2
+   ],
+   "commit": "5359e32f641ba4f2d596999d32a702182a1add73",
+   "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp"
+  }
+ },
  {
   "ename": "tongbu",
   "commit": "e97578be9aa9bdadc6bdf6c7105242ca9d23bf80",
@@ -120747,28 +121674,28 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20240509,
-    1849
+    20240629,
+    1508
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e",
-   "sha256": "1vrnxd95dmf6v6nzvzcf4nxz4sag9qwl1hj2ciiffl2d420shjsh"
+   "commit": "32b7a99bf25fbf43fcc6efb9712a2c0888edd3eb",
+   "sha256": "0xjasyipbw1sx1yy81ywdqmz8pmngmyc50n1pacyys771zd96dxq"
   },
   "stable": {
    "version": [
     0,
-    6,
-    0
+    7,
+    2
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724",
-   "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai"
+   "commit": "2d6fae0ca232c2423facbbbf8ece18c856e7d31d",
+   "sha256": "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989"
   }
  },
  {
@@ -121044,28 +121971,28 @@
   "repo": "tarsius/tray",
   "unstable": {
    "version": [
-    20240415,
-    1549
+    20240618,
+    1838
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "1ce8c7c74dec199e1045fec3c79cb9ff433b1735",
-   "sha256": "1b1i5hb9r8z6r1npbip8swgfizdkhwl1x5b6b9k9552i6gxm1qbz"
+   "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea",
+   "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw"
   },
   "stable": {
    "version": [
     0,
     1,
-    2
+    3
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "b8d48c81de06261926420d75608cc69f99970563",
-   "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr"
+   "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea",
+   "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw"
   }
  },
  {
@@ -121205,14 +122132,14 @@
   "repo": "erickgnavar/tree-sitter-ispell.el",
   "unstable": {
    "version": [
-    20240522,
-    1356
+    20240610,
+    2252
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "960e68d6c4a296e5ecf10d27bfd8bac42ba4a2ed",
-   "sha256": "1v0v6m5g03ydv38a9465nx3i5qfi106macwd5s63rllx88m395xg"
+   "commit": "a06eff00affff85992d2a8ad0019034747ffeb70",
+   "sha256": "19x25a1plwnrc68hxvdnbra7djlikq8vz590bvyvwvq0g66khfpq"
   }
  },
  {
@@ -121223,26 +122150,26 @@
   "repo": "emacs-tree-sitter/tree-sitter-langs",
   "unstable": {
    "version": [
-    20240519,
-    717
+    20240707,
+    727
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df",
-   "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8"
+   "commit": "b2739d07fadf45520a25862342a1790cd905cff9",
+   "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk"
   },
   "stable": {
    "version": [
     0,
     12,
-    196
+    204
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df",
-   "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8"
+   "commit": "b2739d07fadf45520a25862342a1790cd905cff9",
+   "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk"
   }
  },
  {
@@ -121253,14 +122180,14 @@
   "repo": "purplg/treebundel",
   "unstable": {
    "version": [
-    20240210,
-    343
+    20240531,
+    2321
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2d6c69cb7798a8cb7fcf9923c4580220dd48b3d4",
-   "sha256": "18winxkh1934jr19prp2yxlnl2vgh1yhrrvy1flg0l2r2pb5zrch"
+   "commit": "b0a5d1bf924d8cadde5bae50b8d9ac131279b828",
+   "sha256": "0smcnpmchm6kgxbdirfw6y17ad4innppab4xzpvvnixhnqbnr655"
   },
   "stable": {
    "version": [
@@ -121319,8 +122246,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240518,
-    932
+    20240613,
+    2014
    ],
    "deps": [
     "ace-window",
@@ -121332,8 +122259,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "923fbbdea57b27ed3293079b13846206add85d9d",
-   "sha256": "1dw8igrag918c9s2pz80nmri09kxay10v617zafg91kdqzpnwgyy"
+   "commit": "54ef590b7621032a76f8f3e307032fc13c802371",
+   "sha256": "116qwsyvb105in31f62an3zvsfah8ncl8bwh2hw0kwbvnrm387vk"
   },
   "stable": {
    "version": [
@@ -121673,6 +122600,21 @@
    "sha256": "1a2d49chymhfbd9w0msksyyqgsywn17mkzqglaw0k794sb1gzx2q"
   }
  },
+ {
+  "ename": "treesit-ispell",
+  "commit": "08692fd0e799bbe2afe086e5fa146628cd97bdc1",
+  "sha256": "1dnzmw3vr59l7n2rryf6w4sfx9vay1626cb62yvk3zjxl2kpn0wj",
+  "fetcher": "github",
+  "repo": "erickgnavar/treesit-ispell.el",
+  "unstable": {
+   "version": [
+    20240611,
+    117
+   ],
+   "commit": "56740dccd5a72277fa05f19491e032e0c4701ad2",
+   "sha256": "162q3i1c8v6k8zzbwfm7h6yn4w0r1xvw9039pn3z7widpcz5mczw"
+  }
+ },
  {
   "ename": "treeview",
   "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52",
@@ -121708,6 +122650,29 @@
    "sha256": "0blbxjaddzhkvzlys46yrzszywmyjkmfhwks52v4laya76rgxm45"
   }
  },
+ {
+  "ename": "trimspace-mode",
+  "commit": "d960195dbd955244478aaac43db4ef924efb9b58",
+  "sha256": "016blxasn2ghrj49dq6bn8w1p8d3vglqf9f6bz74nq5iccy18kg4",
+  "fetcher": "sourcehut",
+  "repo": "bkhl/trimspace-mode",
+  "unstable": {
+   "version": [
+    20240629,
+    1843
+   ],
+   "commit": "68fb627ba552644ddee0cf9048b2fefd722a59fb",
+   "sha256": "1p86w9imcpmx1ck64782agrz6b00qm2w2h5xkg0kx2507l2zd3ci"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "ea7dd0d4847e10c77d174f537051db70233ecf6e",
+   "sha256": "0jj3jj4wc48jf23qxc3avg9acmapi4gzhjpqdzi68y2mx3bdrrz4"
+  }
+ },
  {
   "ename": "trinary",
   "commit": "48fff02dde8a678e151f2765ea7c3a383912c68b",
@@ -122278,11 +123243,11 @@
   "repo": "emacs-typescript/typescript.el",
   "unstable": {
    "version": [
-    20240507,
-    617
+    20240603,
+    630
    ],
-   "commit": "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0",
-   "sha256": "1f2sba6ld55w6mdbwwz4kqfp2rsgmbdm88apxjfglsa5nlh7g50b"
+   "commit": "5bb294411ff06ad40186bb7ca141fdbfff902e09",
+   "sha256": "1gspkch0dv9fx22n1sp0yq0qj61lg43hc1n5x0nz8mzy6bxc6bsx"
   },
   "stable": {
    "version": [
@@ -122612,14 +123577,14 @@
   "repo": "crmsnbleyd/uiua-mode",
   "unstable": {
    "version": [
-    20231219,
-    1706
+    20240711,
+    852
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "24115f187212a89e600dfb870fc34880355846ed",
-   "sha256": "11lagjk8vwbls5dxqfcrrljn82f0rbljn9x4fz0sf96svja8j2va"
+   "commit": "20344ddaa401ed172e4b3649076ae33c117918a0",
+   "sha256": "0qnnwkbgx013zfiihw5lfahmqbcp8ic8d03a7z1d3ic5lx439phh"
   }
  },
  {
@@ -122814,11 +123779,11 @@
   "repo": "ideasman42/emacs-undo-fu",
   "unstable": {
    "version": [
-    20240422,
-    6
+    20240707,
+    1410
    ],
-   "commit": "d935af2c57ecfa14248a70b3fe8a84fb78fef209",
-   "sha256": "1zy4sxllmh0qa876qnc4h89f5fda3vcrgs4xpy7y1bgbfcpwks0q"
+   "commit": "dbb3e4b699dd488497ef9b32a04b8e928a6bc8ef",
+   "sha256": "1f4vsg68fylcp2cqc74mbw4zls3n0zq8wvyd0vahy9km7fr753p4"
   }
  },
  {
@@ -122829,11 +123794,11 @@
   "repo": "ideasman42/emacs-undo-fu-session",
   "unstable": {
    "version": [
-    20240421,
-    834
+    20240709,
+    1418
    ],
-   "commit": "75d78310c86901f01b35d47f3ac1a5c8368abba4",
-   "sha256": "0ywyjg8zpa8dzz6sw5zvzfck44iapr0iymmpbxh4ymli663fmw9p"
+   "commit": "ae94c87b3f6f0ac0639005f506762866e65dcf9a",
+   "sha256": "1irqs9sl0lsjkwxknv54nkwcrq788hz1h4jmh2xx1xn25gfh7nmw"
   }
  },
  {
@@ -123548,6 +124513,35 @@
    "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1"
   }
  },
+ {
+  "ename": "unspecified-theme",
+  "commit": "07bc4820654e760404593662ec75e5490b7e60e4",
+  "sha256": "0vh492v3hls2ahhwky7zi01blrkjpsfwi8ya9gjn1y55hmjicnr1",
+  "fetcher": "codeberg",
+  "repo": "mekeor/unspecified-theme",
+  "unstable": {
+   "version": [
+    20240620,
+    2310
+   ],
+   "deps": [
+    "most-faces"
+   ],
+   "commit": "822f461bb04b4f8751bc2431140197a077d6c4a6",
+   "sha256": "1haa2ikg71q3irf7vsm1kbxvkn24hkmws33ci2c5lm39f81rz7f0"
+  },
+  "stable": {
+   "version": [
+    0,
+    3
+   ],
+   "deps": [
+    "most-faces"
+   ],
+   "commit": "822f461bb04b4f8751bc2431140197a077d6c4a6",
+   "sha256": "1haa2ikg71q3irf7vsm1kbxvkn24hkmws33ci2c5lm39f81rz7f0"
+  }
+ },
  {
   "ename": "untappd",
   "commit": "0d7b1541a317cc253a55696d752ea57453475b8f",
@@ -124749,11 +125743,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20240426,
-    2014
+    20240708,
+    2311
    ],
-   "commit": "24784e7a81a937b4b294a2a57238999c53d6e5d1",
-   "sha256": "1z47qjhb427hrdmpxmjq4h5q20lzppy35im46dl5m3yzvx3k5aha"
+   "commit": "8a2d425ea7b2287090d6464c05f24b8894cfd09b",
+   "sha256": "1v9hsqnfah87zgxpl21867k1lh9ljazjsrdid60qr6s4hxjjn97m"
   },
   "stable": {
    "version": [
@@ -124944,14 +125938,14 @@
   "repo": "baron42bba/vertica-snippets",
   "unstable": {
    "version": [
-    20240327,
-    1013
+    20240625,
+    1023
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "11dd101eb431b7fc7695e5ad3b2a6444ac49e7a4",
-   "sha256": "03zba07d7d1c96ygkw1779v9ybnaap2668ss5w92zfzc8b45yvdr"
+   "commit": "4d3019e72a62dcbfede3d4812c913d5e6210c488",
+   "sha256": "0kxx08nl39qs35i086lxmh8kw8ljl7npi86djpr7ksl6p3sx5m7k"
   }
  },
  {
@@ -124962,14 +125956,14 @@
   "repo": "minad/vertico",
   "unstable": {
    "version": [
-    20240511,
-    2047
+    20240708,
+    2157
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ba650a7ab90d66686ba787937ac9e71f749c598e",
-   "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr"
+   "commit": "c971c5106b2ce001b0d263683aa51eaaf7606e10",
+   "sha256": "0pllcx67l5wmb8iyj6ilam3m26qdm9x7cpb7qygsdda3am3grn6h"
   },
   "stable": {
    "version": [
@@ -125251,6 +126245,30 @@
    "sha256": "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9"
   }
  },
+ {
+  "ename": "vim-tab-bar",
+  "commit": "bf6f8f47c5cab38b0cfb0a5bd3f4b02cc4968f3a",
+  "sha256": "0v103a25ilc3hkh5n15rw5a2gs6i3m35cazsw5fd77756s5ix44l",
+  "fetcher": "github",
+  "repo": "jamescherti/vim-tab-bar.el",
+  "unstable": {
+   "version": [
+    20240710,
+    1928
+   ],
+   "commit": "1fec194e7890135c5e06b61a31c78612eec3b546",
+   "sha256": "0gg6wc4cz6g49h356l3ks3hgx3pvlbf976gvl0585c88f4rwvg4p"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    5
+   ],
+   "commit": "ba0d914f725db86c67ddf0469d3f34fdd0f4f2aa",
+   "sha256": "0nahsm1pynsipq0ym2p73rxc90i0sxsj86an207h8d2ag7j37kc6"
+  }
+ },
  {
   "ename": "vimgolf",
   "commit": "1de0a1cdc8fd33601ecca982fa9aa66f4400843b",
@@ -125685,11 +126703,11 @@
   "repo": "emacs-vs/vs-dark-theme",
   "unstable": {
    "version": [
-    20240521,
-    2336
+    20240605,
+    134
    ],
-   "commit": "d0d9fb57582677fc1f9a4a1467ec3f6470aff0d6",
-   "sha256": "03qy8d7vbnkx2ssfby7kgdjmz691rqw4vlikhpb37xkmhsqa0w0d"
+   "commit": "351300bad1a28f5e86f39f6fae9ca5d8a0cfb24d",
+   "sha256": "1jhczlfnw00iqkyb0952fj330wn0ipa9hiyhjc7a3g1c2swp9mql"
   },
   "stable": {
    "version": [
@@ -125708,11 +126726,11 @@
   "repo": "emacs-vs/vs-light-theme",
   "unstable": {
    "version": [
-    20240521,
-    2340
+    20240605,
+    133
    ],
-   "commit": "bc0250f261c066f576fa13112dcfbb10a4e5c6ef",
-   "sha256": "1ys5xhll909zfx02hf2gqbwcf3jcq83b5xxvajrr6xxqwa4mk9h3"
+   "commit": "5eeb6e5df24172497c844da750697b2ca3b750fe",
+   "sha256": "19kizkrqpw7m18pmfr4gi3pzxmkf9vc900z10079crrdw90lqjs4"
   },
   "stable": {
    "version": [
@@ -125785,11 +126803,29 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20240520,
-    231
+    20240705,
+    1533
    ],
-   "commit": "df057b1af2bb89a1deb288086f13be296af42090",
-   "sha256": "11j89pldhmw9v2g1sqcg4piniijz4wzgmim1jv46iwnaiwzw20fi"
+   "commit": "d9ea29fb10aed20512bd95dc5b8c1a01684044b1",
+   "sha256": "1q62yav93i3485iy7d4v1y00s0zyc0r9v06xb9r49rw70j6x4vmf"
+  }
+ },
+ {
+  "ename": "vterm-hotkey",
+  "commit": "16c2db3a88115057c3ca6814046c3b63ef4fd00e",
+  "sha256": "1w0a7rzgws43i2hm2pgmcx5kzd7g4y531s7c761lb1dvf6a94s9d",
+  "fetcher": "github",
+  "repo": "rootatpixel/vterm-hotkey",
+  "unstable": {
+   "version": [
+    20240702,
+    1445
+   ],
+   "deps": [
+    "vterm"
+   ],
+   "commit": "039033a4c30dabca625d6924d1796bb9e13d85c7",
+   "sha256": "15xgb48q3jhhxn2il9bvldmsd8y0ffsc2ccjv1sf4xks7csj14l3"
   }
  },
  {
@@ -125929,8 +126965,8 @@
   "repo": "d12frosted/vulpea",
   "unstable": {
    "version": [
-    20231113,
-    717
+    20240712,
+    1635
    ],
    "deps": [
     "dash",
@@ -125938,8 +126974,8 @@
     "org-roam",
     "s"
    ],
-   "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a",
-   "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6"
+   "commit": "c9eadce7fc85eb170d6319088d021a07f1218521",
+   "sha256": "14c2dkwh3q4nkdk8g22hs0ija22546gx9gwi13mj6nmrc34dyba6"
   },
   "stable": {
    "version": [
@@ -126044,11 +127080,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20231023,
-    653
+    20240712,
+    248
    ],
-   "commit": "55baf2bcb1a583d3baae1d37ad0e17b0480ffd02",
-   "sha256": "1vqr7bmairp70lrx9gm80w7qr2jxiijg5w1na36k7if4wikfg4kl"
+   "commit": "a3dd9b16224893ef1d75ee9bf0c2b088bc2a5d92",
+   "sha256": "1sb2p0gxb8z9im0h5pky0fhvcxjhajsyd1gicfnhl8cqxmjjf907"
   }
  },
  {
@@ -126121,11 +127157,11 @@
   "repo": "wakatime/wakatime-mode",
   "unstable": {
    "version": [
-    20240203,
-    1221
+    20240623,
+    653
    ],
-   "commit": "25fb775178d16decb818b75f32fd23301c0f5da0",
-   "sha256": "0l8y0xinbh3l7d7klwvxrrc6q9zp51x7p8brapx56knh819w1bvk"
+   "commit": "1c5b2254dd72f2ff504d6a6189a8c10be03a98d1",
+   "sha256": "00qv6b756qiaqrmfg1w03psnsdj0iaz3sp50ib4kmdm2g9vgxl1s"
   }
  },
  {
@@ -126803,14 +127839,14 @@
   "repo": "emacs-love/weblorg",
   "unstable": {
    "version": [
-    20230828,
-    150
+    20240711,
+    940
    ],
    "deps": [
     "templatel"
    ],
-   "commit": "a889b29fc6e0d06a1480b1bf524f06a5be2022d7",
-   "sha256": "1zgmb6sjba71l5pb8ajqnm1sjaav291y849l3mwc50pv7b7pzch6"
+   "commit": "0db218bd6b2e083546d3a69a022dfb1a08900acd",
+   "sha256": "0fijrzc96p3jkq53i65bzhmxqyg28a49n21glkzb5b21agy0cdqh"
   },
   "stable": {
    "version": [
@@ -127232,6 +128268,25 @@
    "sha256": "10396w84a22zfcgihqhpri5q2w7z0g4n08kbhg03v0zclfb5dgwz"
   }
  },
+ {
+  "ename": "whaler",
+  "commit": "b93a326420601a67a932315566b6bb6f25091800",
+  "sha256": "196qna6zrvsjy4x5f1i034a30b6935wmaklzdlgvadd1cz24nr94",
+  "fetcher": "github",
+  "repo": "SalOrak/whaler.el",
+  "unstable": {
+   "version": [
+    20240609,
+    1850
+   ],
+   "deps": [
+    "f",
+    "ivy"
+   ],
+   "commit": "18791f9b5cfa05f7eabd686d572fa37f210ebe85",
+   "sha256": "0gjc9hqq1wz2npk2gw8nfkg2ikfhl3bcmlc0d3jzlpizc9mk6w7f"
+  }
+ },
  {
   "ename": "what-the-commit",
   "commit": "9af2c90af887e37c080a4a70e84ec5691c599d94",
@@ -127255,11 +128310,11 @@
   "repo": "justbur/emacs-which-key",
   "unstable": {
    "version": [
-    20240501,
-    1251
+    20240620,
+    2145
    ],
-   "commit": "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a",
-   "sha256": "01g5fgrbdgzh302ah7pqdrf98hxgah40140jjwfrx3mwcdicj7f1"
+   "commit": "ed389312170df955aaf10c2e120cc533ed5c509e",
+   "sha256": "084alfpigq5jdsdr7qh47xl3b8bwqv2ncm4df4gry1hxzpjrcjsw"
   },
   "stable": {
    "version": [
@@ -127462,14 +128517,11 @@
   "repo": "purcell/whole-line-or-region",
   "unstable": {
    "version": [
-    20201214,
-    650
+    20240630,
+    804
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "ba193b2034388bbc384cb04093150fca56f7e262",
-   "sha256": "0k6x3x9a9wgq94aiil4jdn84py2mqvmmwrjc1s0mx2qvhgwln2q1"
+   "commit": "f39fd03cf563ffdf57144a7586a5e845969fc641",
+   "sha256": "1l8xpfssvcfdm6q606h5sriais5i8a6j8s0i8gd6gjafby11s59y"
   },
   "stable": {
    "version": [
@@ -128082,26 +129134,26 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20240415,
-    1558
+    20240702,
+    1952
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1b4526453ef6bdee30635f469aa26085c02b1ac1",
-   "sha256": "1qv84lg4g4kihv53vrklm0rmh9hqiwk23bynldiwvmiq39fqasyw"
+   "commit": "6c9a51b72fa7f454a5a123f738a6a067972eca4e",
+   "sha256": "0y7k3qb53mcy24z3hdmkvnmy0fhnkmsli1b686bx605w2ilqqdif"
   },
   "stable": {
    "version": [
     3,
     3,
-    2
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d5f3f06cb830311e60c58f656988ef37c05a99e0",
-   "sha256": "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a"
+   "commit": "322ee26d3a7d3d67840293041837b7e70cffa8d1",
+   "sha256": "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b"
   }
  },
  {
@@ -128236,6 +129288,36 @@
    "sha256": "1wwj5pyhb3vxrpyqxrmfayjkyamf0v84jq6bb7j2kl90aa8b2m90"
   }
  },
+ {
+  "ename": "wiz",
+  "commit": "a197e0ebe77fc4d4b93bef2d92be41901eb7fba7",
+  "sha256": "0d5v4wrvy706pg8gkhijljhddpxxr69mlnd7an32ibw79zpbn19y",
+  "fetcher": "github",
+  "repo": "zonuexe/emacs-wiz",
+  "unstable": {
+   "version": [
+    20240629,
+    447
+   ],
+   "deps": [
+    "exec-path-from-shell"
+   ],
+   "commit": "4f48029d39b870c9e6545516af1be9764e08cccc",
+   "sha256": "1cq12w81gbw2gmv92y9grh7fbfwhab73z9gwxwycz300xzakzydz"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    5
+   ],
+   "deps": [
+    "exec-path-from-shell"
+   ],
+   "commit": "2c88a65205b11f97d20c3de907ccb19aa5830175",
+   "sha256": "0gi36imnx6gpv3jbjkd1dx2y7273cbn2a0lwzyczr17h6mq97h4r"
+  }
+ },
  {
   "ename": "wn-mode",
   "commit": "6213c01e6954985daff8cd1a5a3ef004431f0477",
@@ -129526,11 +130608,11 @@
   "repo": "canatella/xwwp",
   "unstable": {
    "version": [
-    20200917,
-    643
+    20240701,
+    1040
    ],
-   "commit": "f67e070a6e1b233e60274deb717274b000923231",
-   "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg"
+   "commit": "0c875e460d1c0637766204dc289ffbd0f2284194",
+   "sha256": "0a5rl4p0kywzpwmawi8cwyk47nawblan0y01s6v6vbnyb8ylcgs3"
   }
  },
  {
@@ -129778,26 +130860,26 @@
   "repo": "zkry/yaml-pro",
   "unstable": {
    "version": [
-    20240520,
-    1215
+    20240623,
+    1904
    ],
    "deps": [
     "yaml"
    ],
-   "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39",
-   "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3"
+   "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726",
+   "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "yaml"
    ],
-   "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39",
-   "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3"
+   "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726",
+   "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2"
   }
  },
  {
@@ -130063,25 +131145,25 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20240507,
-    943
+    20240603,
+    757
+   ],
+   "deps": [
+    "yasnippet"
+   ],
+   "commit": "1bf034887c4048c38266842686b7f9c8384f72e7",
+   "sha256": "17r0p2yk0164i1sc4rl55sykpgk5f21kv958dqdhrf39r4gj0r4k"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
    ],
    "deps": [
     "yasnippet"
    ],
    "commit": "6fafad13bb4689600285d9e38c61958dd63c356d",
    "sha256": "0p38k8a3l9vpph1g2a6wz40y30wb2nhp770rv8947bxzjc5xc0gf"
-  },
-  "stable": {
-   "version": [
-    1,
-    0
-   ],
-   "deps": [
-    "yasnippet"
-   ],
-   "commit": "c0ef1e8cfd05ef77b9240f3d9e8f0798bbcf9a58",
-   "sha256": "0m78jxhjyf4212ig2ncxr6bhhd6yx4c3nc8x4ylamzq21x4fl21r"
   }
  },
  {
@@ -130256,26 +131338,26 @@
   "url": "https://git.thanosapollo.org/yeetube",
   "unstable": {
    "version": [
-    20240411,
-    1328
+    20240708,
+    2037
    ],
    "deps": [
     "compat"
    ],
-   "commit": "dfcbb8498b30b83d6f97d5777603d5f2dce39298",
-   "sha256": "013j8nm736lpkp2ygmgwdfbrylmwvlsgbf6qmscpfvn01n6w9s37"
+   "commit": "bd5418635f3483930d267bcb44cd3744db4ea3ac",
+   "sha256": "0z6kdzgpri5qqxdpxdl8qb4rgv32557rc4wac8mrh5a0jf682p42"
   },
   "stable": {
    "version": [
     2,
     1,
-    4
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f9feada5c09fa8245f0230696557f7e7ffa266f1",
-   "sha256": "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9"
+   "commit": "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640",
+   "sha256": "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70"
   }
  },
  {
@@ -130654,11 +131736,11 @@
   "repo": "bbatsov/zenburn-emacs",
   "unstable": {
    "version": [
-    20240331,
-    1350
+    20240612,
+    1258
    ],
-   "commit": "14dda0596a7cd0750fc6566eacc203a126f136c2",
-   "sha256": "1cyspxwjjhflafkyb2mkcfc1227i8kzmxgz3yvrj3ykdsim9pjwy"
+   "commit": "15f48bfc6b52d112f3c3fd98e533bda9138ffdd2",
+   "sha256": "1nzqj55nc9klvgxhd20z1n1c06v453hjxf7s70gspa4v1pwgvjaz"
   },
   "stable": {
    "version": [
@@ -130779,26 +131861,58 @@
   "url": "https://gitlab.emacsos.com/sylecn/zero-el",
   "unstable": {
    "version": [
-    20200405,
-    1220
+    20240527,
+    728
    ],
    "deps": [
     "s"
    ],
-   "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da",
-   "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04"
+   "commit": "e87bbf24c1475a784ad9d1ba8447e038824d796b",
+   "sha256": "1p9mfmaq54jy0g1nwma46kq8562i3a5d6gfw5w3r53i9xd4vq0w3"
   },
   "stable": {
    "version": [
     2,
-    8,
-    0
+    10,
+    3
    ],
    "deps": [
     "s"
    ],
-   "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da",
-   "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04"
+   "commit": "e87bbf24c1475a784ad9d1ba8447e038824d796b",
+   "sha256": "1p9mfmaq54jy0g1nwma46kq8562i3a5d6gfw5w3r53i9xd4vq0w3"
+  }
+ },
+ {
+  "ename": "zero-input-panel-posframe",
+  "commit": "a5ac1339f742f8ccc36eaf9fde5085bbc2ab42a0",
+  "sha256": "104ccz5s49m6y5si4k8qs7vv4w7a1zahy0isvr104jwihjsdnvix",
+  "fetcher": "git",
+  "url": "https://gitlab.emacsos.com/sylecn/zero-input-panel-posframe.git",
+  "unstable": {
+   "version": [
+    20240526,
+    1604
+   ],
+   "deps": [
+    "posframe",
+    "zero-input"
+   ],
+   "commit": "714102090ba87b75a06b87792df696f6f48c2ea8",
+   "sha256": "0ffq6xi0spsy4rbksrbm5j2ny90szsklf3qymdxygp5kmc0ghia7"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    1
+   ],
+   "deps": [
+    "posframe",
+    "zero-input"
+   ],
+   "commit": "01d5a8f94b7936152ae719e25ffc19574f7b0cc5",
+   "sha256": "12rgfmcbikip97nqwmbj4wsjcb8yb9yh7iiqab4vbpm4la4j63ip"
   }
  },
  {
@@ -131106,8 +132220,8 @@
   "repo": "WillForan/zim-wiki-mode",
   "unstable": {
    "version": [
-    20230927,
-    1410
+    20240613,
+    8
    ],
    "deps": [
     "dokuwiki-mode",
@@ -131116,8 +132230,8 @@
     "link-hint",
     "pretty-hydra"
    ],
-   "commit": "7c62e0304750654709b4173bcc1e2681cf1fbe49",
-   "sha256": "1vfc48vz0ajcqcdx89wrwd3ksncwjlvi1via681d88y9in9bpbv4"
+   "commit": "11e077afbe21f2dd33fe7eae39c2a8345bb0b806",
+   "sha256": "0lc1rikrd5rhjy8p7ar649kxdv5slnkmkra6f7j00sbjwhw7bc89"
   }
  },
  {
@@ -131146,11 +132260,11 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240102,
-    1405
+    20240704,
+    910
    ],
-   "commit": "82f636c1edda416794c7115757ecded64f22afbf",
-   "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i"
+   "commit": "225d2628025195283170908e81341e3a8d49b022",
+   "sha256": "0x0cc42r56mfwi9cbyaxlnjpjv7hpkhcvn4whx545hzyr51hr53v"
   },
   "stable": {
    "version": [
@@ -131200,14 +132314,14 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240102,
-    1405
+    20240704,
+    1102
    ],
    "deps": [
     "zk"
    ],
-   "commit": "82f636c1edda416794c7115757ecded64f22afbf",
-   "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i"
+   "commit": "9a2ece35d2ecec20cc11e2888413a86d03beb40b",
+   "sha256": "14lxs2r8awp92k5ijsvw1fwiz95vc3p5md913cqka4l7hvw9x2cv"
   },
   "stable": {
    "version": [
@@ -131743,11 +132857,11 @@
   "repo": "pesterhazy/zprint-mode.el",
   "unstable": {
    "version": [
-    20240311,
-    941
+    20240619,
+    1639
    ],
-   "commit": "cd7ae7400177b3c233a77c2a46de818c72375362",
-   "sha256": "0dygbbasz8mxbz6n6zcsd1xj1n3ab35yxiabjwgi7zlikxigjipw"
+   "commit": "ac3b25e250c83aedc49d1eab508142e3060e3833",
+   "sha256": "19aan4a2vidlr2ahsjyrlx318zqd7yyblxsw34a2hzj2pjx45l59"
   }
  },
  {
@@ -131770,10 +132884,10 @@
  },
  {
   "ename": "zweilight-theme",
-  "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
-  "sha256": "1j8skn9hz1zkpdg7q0njv5b50cbvrixjjmkp43p58gx98q02p0kq",
+  "commit": "0dccf5900100571b3a17003dd471991463137c38",
+  "sha256": "1caqjq1ijjbnpa1jjs5am1vp9kpcfg17dbyswdfw64q698c50j3x",
   "fetcher": "github",
-  "repo": "philiparvidsson/Zweilight-Theme-for-Emacs",
+  "repo": "vexx9/Zweilight-Theme-for-Emacs",
   "unstable": {
    "version": [
     20170113,

From 8773aced5ed944d43a286be2db3ed4863fc61d32 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 13 Jul 2024 19:11:32 -0300
Subject: [PATCH 248/319] nongnu-packages: updated 2024-07-13 (from overlay)

---
 .../emacs/elisp-packages/nongnu-generated.nix | 192 +++++++++++++-----
 1 file changed, 136 insertions(+), 56 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 762359a47e27..b5d9a11e764f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -139,10 +139,10 @@
       elpaBuild {
         pname = "arduino-mode";
         ename = "arduino-mode";
-        version = "1.3.0";
+        version = "1.3.1";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar";
-          sha256 = "167b35s34x51qnlx59sawaz4wzlnk2kf9130ylz2b1bj7jy5n27a";
+          url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar";
+          sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y";
         };
         packageRequires = [ emacs spinner ];
         meta = {
@@ -212,6 +212,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    beancount = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "beancount";
+        ename = "beancount";
+        version = "0.9";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/beancount-0.9.tar";
+          sha256 = "1s0w17mq8kilkrd33pan78px6mz5z96d7gvdmy2shg3hvj1jbq09";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/beancount.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "better-jumper";
@@ -376,10 +391,10 @@
       elpaBuild {
         pname = "cider";
         ename = "cider";
-        version = "1.13.1";
+        version = "1.15.1";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cider-1.13.1.tar";
-          sha256 = "0df5z57schfszlp1vkb6fiiadx12qlpk5qzfw61g664a2i654fsg";
+          url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar";
+          sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6";
         };
         packageRequires = [
           clojure-mode
@@ -400,10 +415,10 @@
       elpaBuild {
         pname = "clojure-mode";
         ename = "clojure-mode";
-        version = "5.18.1";
+        version = "5.19.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.1.tar";
-          sha256 = "1p9nh4p3skjxbsnyj2in3m8jdyrrj8iw0malfcz0ppc4d7zm6klx";
+          url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
+          sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -518,6 +533,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    csv2ledger = callPackage ({ csv-mode, elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "csv2ledger";
+        ename = "csv2ledger";
+        version = "1.5.4";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar";
+          sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls";
+        };
+        packageRequires = [ csv-mode emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/csv2ledger.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     cyberpunk-theme = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "cyberpunk-theme";
@@ -702,6 +732,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    dslide = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dslide";
+        ename = "dslide";
+        version = "0.5.3";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
+          sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dslide.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     eat = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "eat";
@@ -766,10 +811,10 @@
       elpaBuild {
         pname = "elpher";
         ename = "elpher";
-        version = "3.6.0";
+        version = "3.6.2";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar";
-          sha256 = "1xf3kl09inswx4w03fxj35n1ypvlin39z493fw4ksnpf79ccfk4x";
+          url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
+          sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1218,10 +1263,10 @@
       elpaBuild {
         pname = "geiser";
         ename = "geiser";
-        version = "0.30";
+        version = "0.31";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-0.30.tar";
-          sha256 = "0h63skslmc23rjlsrqmcnqf2s431ml0wmkbza38j44kzxnsz0x5g";
+          url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
+          sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
         };
         packageRequires = [ emacs project ];
         meta = {
@@ -1409,10 +1454,10 @@
       elpaBuild {
         pname = "git-modes";
         ename = "git-modes";
-        version = "1.4.2";
+        version = "1.4.3";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar";
-          sha256 = "0hdy4wpnyrn3a8i9yxk5gvsggnpgpg6r0wip0zmhcl9nxi4h6kb3";
+          url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar";
+          sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -1529,10 +1574,10 @@
       elpaBuild {
         pname = "gptel";
         ename = "gptel";
-        version = "0.8.6";
+        version = "0.9.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gptel-0.8.6.tar";
-          sha256 = "1ds0i32bdmdi5w68cjxm9xlg0m9n29yr4hl6sqi8gn3kgswfx1sb";
+          url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar";
+          sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4";
         };
         packageRequires = [ compat emacs transient ];
         meta = {
@@ -1645,16 +1690,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup, wfnames }:
+    helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, wfnames }:
       elpaBuild {
         pname = "helm";
         ename = "helm";
-        version = "3.9.8";
+        version = "3.9.9";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/helm-3.9.8.tar";
-          sha256 = "1vcz3vj6drp5v66s3nsrai39rcwp1q3l2qdd1qxw7n58m4fgrkm6";
+          url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar";
+          sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0";
         };
-        packageRequires = [ helm-core popup wfnames ];
+        packageRequires = [ helm-core wfnames ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/helm.html";
           license = lib.licenses.free;
@@ -1664,10 +1709,10 @@
       elpaBuild {
         pname = "helm-core";
         ename = "helm-core";
-        version = "3.9.8";
+        version = "3.9.9";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.8.tar";
-          sha256 = "03l5sva3qhfmjdpys1k2pbcja58fsdxljvmffjx70j7wyclb3v03";
+          url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
+          sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
         };
         packageRequires = [ async emacs ];
         meta = {
@@ -1675,6 +1720,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    hideshowvis = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "hideshowvis";
+        ename = "hideshowvis";
+        version = "0.8";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar";
+          sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/hideshowvis.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-parentheses = callPackage ({ elpaBuild
                                          , emacs
                                          , fetchurl
@@ -1888,10 +1948,10 @@
       elpaBuild {
         pname = "j-mode";
         ename = "j-mode";
-        version = "1.1.1";
+        version = "2.0.1";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar";
-          sha256 = "056af7l7rn116nygln41rsq2val5s3y0pz1pj2736mqsx3lcyiy2";
+          url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar";
+          sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3";
         };
         packageRequires = [];
         meta = {
@@ -1948,10 +2008,10 @@
       elpaBuild {
         pname = "keycast";
         ename = "keycast";
-        version = "1.3.3";
+        version = "1.4.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/keycast-1.3.3.tar";
-          sha256 = "048j5q4hpr8y89lrcqwbcqjazj52rak8jv8nl6fs4sqjik10zcji";
+          url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar";
+          sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -2092,10 +2152,10 @@
       elpaBuild {
         pname = "mastodon";
         ename = "mastodon";
-        version = "1.0.21";
+        version = "1.0.24";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.21.tar";
-          sha256 = "1qlpkg28q4iyvjjzv8b40b8q7ni7rc94lj5akgzxbzw4avpp1217";
+          url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar";
+          sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023";
         };
         packageRequires = [ emacs persist request ];
         meta = {
@@ -2427,6 +2487,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-transclusion-http = callPackage ({ elpaBuild
+                                         , emacs
+                                         , fetchurl
+                                         , lib
+                                         , org-transclusion
+                                         , plz }:
+      elpaBuild {
+        pname = "org-transclusion-http";
+        ename = "org-transclusion-http";
+        version = "0.4";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/org-transclusion-http-0.4.tar";
+          sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr";
+        };
+        packageRequires = [ emacs org-transclusion plz ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/org-transclusion-http.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-tree-slide = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "org-tree-slide";
@@ -2715,10 +2795,10 @@
       elpaBuild {
         pname = "racket-mode";
         ename = "racket-mode";
-        version = "1.0.20240514.112412";
+        version = "1.0.20240621.124732";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240514.112412.tar";
-          sha256 = "1ysjq9jvkm8qibj0z6j4q90sx19xyz9z9qzdlci9mw872r21ak9h";
+          url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar";
+          sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2865,10 +2945,10 @@
       elpaBuild {
         pname = "scad-mode";
         ename = "scad-mode";
-        version = "93.3";
+        version = "94.0";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/scad-mode-93.3.tar";
-          sha256 = "1d3mv50n3d0qg1sxvp11a4i15vc75j9gpzlqcxnc0l1lqhn64rwh";
+          url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar";
+          sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -3090,10 +3170,10 @@
       elpaBuild {
         pname = "subed";
         ename = "subed";
-        version = "1.2.11";
+        version = "1.2.14";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/subed-1.2.11.tar";
-          sha256 = "0grzlxibv57qds3dml6yjpw9hag86hbkrb1f66k7qn5hxaadmvpw";
+          url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
+          sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3366,10 +3446,10 @@
       elpaBuild {
         pname = "undo-fu-session";
         ename = "undo-fu-session";
-        version = "0.6";
+        version = "0.7";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.6.tar";
-          sha256 = "057izvr86har50z1sfk4s6r88w2ga57afwm2w9p5v14lq31vj7cp";
+          url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar";
+          sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3506,10 +3586,10 @@
       elpaBuild {
         pname = "with-editor";
         ename = "with-editor";
-        version = "3.3.2";
+        version = "3.3.4";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.2.tar";
-          sha256 = "1yjx1w54qdjpmq5f7l3y19d4bayyk01rgd82c56swsaxsf4j5fpv";
+          url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar";
+          sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc";
         };
         packageRequires = [ compat emacs ];
         meta = {
@@ -3589,10 +3669,10 @@
       elpaBuild {
         pname = "xah-fly-keys";
         ename = "xah-fly-keys";
-        version = "25.6.20240521220424";
+        version = "25.9.20240703220947";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.6.20240521220424.tar";
-          sha256 = "029hy3qmf6nvibbq9w2b964gzbw99lja595h4g1y5zzyrgzqrhrn";
+          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar";
+          sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya";
         };
         packageRequires = [ emacs ];
         meta = {

From 79f5f9bf1b805412634f2688e6c2068723d0ea35 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Wed, 3 Jul 2024 20:03:37 -0400
Subject: [PATCH 249/319] ghc: update Darwin bintools references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Unconditionally get `install_name_tool` from cc.bintools.bintools since it is no longer wrapped; and
- Use the `strip` wrapper on both Darwin architectures. It’s the default one, and it’s the same between both.
---
 pkgs/development/compilers/ghc/8.10.7.nix      | 18 ++++++++----------
 .../compilers/ghc/common-hadrian.nix           | 18 ++++++++----------
 .../ghc/common-make-native-bignum.nix          | 18 ++++++++----------
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
index c8669a2761f8..c8a56c219740 100644
--- a/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -152,18 +152,16 @@ let
 
         otool = cc.bintools.bintools;
 
-        # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
-        # part of the bintools wrapper (due to codesigning requirements), but not on
-        # x86_64-darwin. We decide based on target platform to have consistent tools
-        # across all GHC stages.
-        install_name_tool =
-          if stdenv.targetPlatform.isAarch64
-          then cc.bintools
-          else cc.bintools.bintools;
-        # Same goes for strip.
+        # GHC needs install_name_tool on all darwin platforms. The same one can
+        # be used on both platforms. It is safe to use with linker-generated
+        # signatures because it will update the signatures automatically after
+        # modifying the target binary.
+        install_name_tool = cc.bintools.bintools;
+
+        # strip on darwin is wrapped to enable deterministic mode.
         strip =
           # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-          if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+          if stdenv.targetPlatform.isDarwin
           then cc.bintools
           else cc.bintools.bintools;
       }.${name};
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index b5fef30332f7..c06c46fe9674 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -288,18 +288,16 @@ let
 
         otool = cc.bintools.bintools;
 
-        # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
-        # part of the bintools wrapper (due to codesigning requirements), but not on
-        # x86_64-darwin. We decide based on target platform to have consistent tools
-        # across all GHC stages.
-        install_name_tool =
-          if stdenv.targetPlatform.isAarch64
-          then cc.bintools
-          else cc.bintools.bintools;
-        # Same goes for strip.
+        # GHC needs install_name_tool on all darwin platforms. The same one can
+        # be used on both platforms. It is safe to use with linker-generated
+        # signatures because it will update the signatures automatically after
+        # modifying the target binary.
+        install_name_tool = cc.bintools.bintools;
+
+        # strip on darwin is wrapped to enable deterministic mode.
         strip =
           # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-          if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+          if stdenv.targetPlatform.isDarwin
           then cc.bintools
           else cc.bintools.bintools;
       }.${name};
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 79fced444f56..2b23cd75a0ed 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -157,18 +157,16 @@ let
 
         otool = cc.bintools.bintools;
 
-        # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
-        # part of the bintools wrapper (due to codesigning requirements), but not on
-        # x86_64-darwin. We decide based on target platform to have consistent tools
-        # across all GHC stages.
-        install_name_tool =
-          if stdenv.targetPlatform.isAarch64
-          then cc.bintools
-          else cc.bintools.bintools;
-        # Same goes for strip.
+        # GHC needs install_name_tool on all darwin platforms. The same one can
+        # be used on both platforms. It is safe to use with linker-generated
+        # signatures because it will update the signatures automatically after
+        # modifying the target binary.
+        install_name_tool = cc.bintools.bintools;
+
+        # strip on darwin is wrapped to enable deterministic mode.
         strip =
           # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-          if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+          if stdenv.targetPlatform.isDarwin
           then cc.bintools
           else cc.bintools.bintools;
       }.${name};

From 76e12091eb3131a9638315808343a2ae1f6bb329 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 18:34:27 -0400
Subject: [PATCH 250/319] darwin.{cctools,libtapi}: drop old source

---
 pkgs/os-specific/darwin/cctools/apple.nix     | 122 -----------
 ...tools-add-missing-vtool-libstuff-dep.patch |  11 -
 .../darwin/cctools/darwin-memstream.patch     |  17 --
 .../darwin/cctools/ld-ignore-rpath-link.patch |  16 --
 .../darwin/cctools/ld-rpath-nonfinal.patch    |  29 ---
 pkgs/os-specific/darwin/cctools/llvm.nix      | 113 ----------
 pkgs/os-specific/darwin/cctools/port.nix      | 198 ------------------
 pkgs/os-specific/darwin/libtapi/default.nix   |  75 -------
 .../darwin/libtapi/disable-rpath.patch        |  14 --
 .../darwin/libtapi/native-clang-tblgen.patch  |  21 --
 10 files changed, 616 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/cctools/apple.nix
 delete mode 100644 pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch
 delete mode 100644 pkgs/os-specific/darwin/cctools/darwin-memstream.patch
 delete mode 100644 pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
 delete mode 100644 pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
 delete mode 100644 pkgs/os-specific/darwin/cctools/llvm.nix
 delete mode 100644 pkgs/os-specific/darwin/cctools/port.nix
 delete mode 100644 pkgs/os-specific/darwin/libtapi/default.nix
 delete mode 100644 pkgs/os-specific/darwin/libtapi/disable-rpath.patch
 delete mode 100644 pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch

diff --git a/pkgs/os-specific/darwin/cctools/apple.nix b/pkgs/os-specific/darwin/cctools/apple.nix
deleted file mode 100644
index dee4e2006256..000000000000
--- a/pkgs/os-specific/darwin/cctools/apple.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, symlinkJoin, xcbuildHook, tcsh, libobjc, libtapi, libunwind, llvm, memstreamHook, xar }:
-
-let
-
-cctools = stdenv.mkDerivation rec {
-  pname = "cctools";
-  version = "973.0.1";
-
-  src = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "cctools";
-    rev = "${pname}-${version}";
-    hash = "sha256-0NlDqy3zeg4D0MbDipx0sMYDfzYa63Jxfsckzz/928o=";
-  };
-
-  patches = [
-    ./cctools-add-missing-vtool-libstuff-dep.patch
-  ];
-
-  postPatch = ''
-    for file in libstuff/writeout.c misc/libtool.c misc/lipo.c; do
-      substituteInPlace "$file" \
-        --replace '__builtin_available(macOS 10.12, *)' '0'
-    done
-    substituteInPlace libmacho/swap.c \
-      --replace '#ifndef RLD' '#if 1'
-  '';
-
-  nativeBuildInputs = [ xcbuildHook memstreamHook ];
-  buildInputs = [ libobjc llvm ];
-
-  xcbuildFlags = [
-    "MACOSX_DEPLOYMENT_TARGET=10.12"
-  ];
-
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-
-    Products/Release/libstuff_test
-    rm Products/Release/libstuff_test
-
-    runHook postCheck
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    rm -rf "$out/usr"
-    mkdir -p "$out/bin"
-    find Products/Release -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \;
-    cp -r include "$out/"
-
-    ln -s ./nm-classic "$out"/bin/nm
-    ln -s ./otool-classic "$out"/bin/otool
-
-    runHook postInstall
-  '';
-};
-
-ld64 = stdenv.mkDerivation rec {
-  pname = "ld64";
-  version = "609";
-
-  src = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "ld64";
-    rev = "${pname}-${version}";
-    hash = "sha256-WAaphem6NS4eCHL/pISlDXnO1CDYTgSrVGzcothh4/Q=";
-  };
-
-  postPatch = ''
-    substituteInPlace ld64.xcodeproj/project.pbxproj \
-      --replace "/bin/csh" "${tcsh}/bin/tcsh" \
-      --replace 'F9E8D4BE07FCAF2A00FD5801 /* PBXBuildRule */,' "" \
-      --replace 'F9E8D4BD07FCAF2000FD5801 /* PBXBuildRule */,' ""
-
-    sed -i src/ld/Options.cpp -e '1iconst char ldVersionString[] = "${version}";'
-  '';
-
-  nativeBuildInputs = [ xcbuildHook ];
-  buildInputs = [
-    libtapi
-    libunwind
-    llvm
-    xar
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/bin"
-    find Products/Release-assert -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \;
-
-    runHook postInstall
-  '';
-};
-
-in
-
-symlinkJoin rec {
-  name = "cctools-${version}";
-  version = "${cctools.version}-${ld64.version}";
-
-  paths = [
-    cctools
-    ld64
-  ];
-
-  # workaround for the fetch-tarballs script
-  passthru = {
-    inherit (cctools) src;
-    ld64_src = ld64.src;
-  };
-
-  meta = with lib; {
-    description = "MacOS Compiler Tools";
-    homepage = "http://www.opensource.apple.com/source/cctools/";
-    license = licenses.apple-psl20;
-    platforms = platforms.darwin;
-  };
-}
diff --git a/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch b/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch
deleted file mode 100644
index 1cd65ec6bcf1..000000000000
--- a/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/cctools.xcodeproj/project.pbxproj b/cctools.xcodeproj/project.pbxproj
---- a/cctools.xcodeproj/project.pbxproj	2021-02-24 20:30:55.000000000 -0500
-+++ b/cctools.xcodeproj/project.pbxproj	2022-01-31 20:01:09.000000000 -0500
-@@ -2558,6 +2558,7 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-+				DE97E92421F3B86100C7947D /* libstuff.a in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
diff --git a/pkgs/os-specific/darwin/cctools/darwin-memstream.patch b/pkgs/os-specific/darwin/cctools/darwin-memstream.patch
deleted file mode 100644
index 3e0d0a43ba8d..000000000000
--- a/pkgs/os-specific/darwin/cctools/darwin-memstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/cctools/include/stuff/diagnostics.h
-+++ b/cctools/include/stuff/diagnostics.h
-@@ -60,13 +60,6 @@ void diagnostics_log_msg(enum diagnostic_level level, const char* message);
-  */
- void diagnostics_write(void);
- 
--#if defined(__APPLE__ ) && defined(__has_builtin)
--#  if __has_builtin(__builtin_available)
--#    define HAVE_OPENMEMSTREAM_RUNTIME __builtin_available(macOS 10.13, *)
--#  endif
--#endif
--#ifndef HAVE_OPENMEMSTREAM_RUNTIME
--#  define HAVE_OPENMEMSTREAM_RUNTIME 1
--#endif
-+#define HAVE_OPENMEMSTREAM_RUNTIME 1
- 
- #endif /* diagnostics_h */
diff --git a/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch b/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
deleted file mode 100644
index fc87f69ac32d..000000000000
--- a/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
-index 2565518..9250016 100644
---- a/cctools/ld64/src/ld/Options.cpp
-+++ b/cctools/ld64/src/ld/Options.cpp
-@@ -2522,6 +2522,11 @@ void Options::parse(int argc, const char* argv[])
- 					throw "missing argument to -rpath";
- 				fRPaths.push_back(path);
- 			}
-+			else if ( strcmp(arg, "-rpath-link") == 0 ) {
-+				const char* path = argv[++i];
-+				if ( path == NULL )
-+					throw "missing argument to -rpath-link";
-+			}
- 			else if ( strcmp(arg, "-read_only_stubs") == 0 ) {
- 				fReadOnlyx86Stubs = true;
- 			}
diff --git a/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch b/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
deleted file mode 100644
index 17ad9053f3bd..000000000000
--- a/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
-index e4b37ec..4189ebc 100644
---- a/cctools/ld64/src/ld/Options.cpp
-+++ b/cctools/ld64/src/ld/Options.cpp
-@@ -5800,24 +5800,6 @@ void Options::checkIllegalOptionCombinations()
- 	if ( fDeadStrip && (fOutputKind == Options::kObjectFile) )
- 		throw "-r and -dead_strip cannot be used together";
- 
--	// can't use -rpath unless targeting 10.5 or later
--	if ( fRPaths.size() > 0 ) {
--		if ( !platforms().minOS(ld::version2008) )
--			throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
--		switch ( fOutputKind ) {
--			case Options::kDynamicExecutable:
--			case Options::kDynamicLibrary:
--			case Options::kDynamicBundle:
--				break;
--			case Options::kStaticExecutable:
--			case Options::kObjectFile:
--			case Options::kDyld:
--			case Options::kPreload:
--			case Options::kKextBundle:
--				throw "-rpath can only be used when creating a dynamic final linked image";
--		}
--	}
--	
- 	if ( fPositionIndependentExecutable ) {
- 		switch ( fOutputKind ) {
- 			case Options::kDynamicExecutable:
diff --git a/pkgs/os-specific/darwin/cctools/llvm.nix b/pkgs/os-specific/darwin/cctools/llvm.nix
deleted file mode 100644
index f2986bf872f7..000000000000
--- a/pkgs/os-specific/darwin/cctools/llvm.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-# Create a cctools-compatible bintools that uses equivalent tools from LLVM in place of the ones
-# from cctools when possible.
-
-{ lib, stdenv, makeWrapper, cctools-port, llvmPackages, enableManpages ? stdenv.targetPlatform == stdenv.hostPlatform }:
-
-let
-  inherit (stdenv) targetPlatform hostPlatform;
-
-  cctoolsVersion = lib.getVersion cctools-port;
-  llvmVersion = llvmPackages.release_version;
-
-  # `bitcode_strip` is not available until LLVM 12.
-  useLLVMBitcodeStrip = lib.versionAtLeast llvmVersion "12";
-
-  # A compatible implementation of `otool` was not added until LLVM 13.
-  useLLVMOtool = lib.versionAtLeast llvmVersion "13";
-
-  # Older versions of `strip` cause problems for the version of `codesign_allocate` available in
-  # the version of cctools in nixpkgs. The version of `codesign_allocate` in cctools-1005.2 does
-  # not appear to have issues, but the source is not available yet (as of June 2023).
-  useLLVMStrip = lib.versionAtLeast llvmVersion "15" || lib.versionAtLeast cctoolsVersion "1005.2";
-
-  # Clang 11 performs an optimization on x86_64 that is sensitive to the presence of debug info.
-  # This causes GCC to fail to bootstrap due to object file differences between stages 2 and 3.
-  useClangAssembler = lib.versionAtLeast llvmVersion "12" || !stdenv.isx86_64;
-
-  llvm_bins = [
-    "dwarfdump"
-    "nm"
-    "objdump"
-    "size"
-    "strings"
-  ]
-  ++ lib.optional useLLVMBitcodeStrip "bitcode-strip"
-  ++ lib.optional useLLVMOtool "otool"
-  ++ lib.optional useLLVMStrip "strip";
-
-  # Only include the tools that LLVM doesn’t provide and that are present normally on Darwin.
-  # The only exceptions are the following tools, which should be reevaluated when LLVM is bumped.
-  # - install_name_tool (llvm-objcopy): unrecognized linker commands when building open source CF;
-  # - libtool (llvm-libtool-darwin): not fully compatible when used with xcbuild; and
-  # - lipo (llvm-lipo): crashes when running the LLVM test suite.
-  cctools_bins = [
-    "cmpdylib"
-    "codesign_allocate"
-    "ctf_insert"
-    "install_name_tool"
-    "ld"
-    "libtool"
-    "lipo"
-    "nmedit"
-    "pagestuff"
-    "ranlib"
-    "segedit"
-    "vtool"
-  ]
-  ++ lib.optional (!useLLVMBitcodeStrip) "bitcode_strip"
-  ++ lib.optional (!useLLVMOtool) "otool"
-  ++ lib.optional (!useLLVMStrip) "strip"
-  ++ lib.optional (!useClangAssembler) "as";
-
-  targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
-
-  linkManPages = pkg: source: target: lib.optionalString enableManpages ''
-    sourcePath=${pkg}/share/man/man1/${source}.1.gz
-    targetPath=$man/share/man/man1/${target}.1.gz
-
-    if [ -f "$sourcePath" ]; then
-      mkdir -p "$(dirname "$targetPath")"
-      ln -s "$sourcePath" "$targetPath"
-    fi
-  '';
-in
-stdenv.mkDerivation {
-  pname = "cctools-llvm";
-  version = "${llvmVersion}-${cctoolsVersion}";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  # The `man` output has to be included unconditionally because darwin.binutils expects it.
-  outputs = [ "out" "dev" "man" ];
-
-  buildCommand = ''
-    mkdir -p "$out/bin" "$man"
-    ln -s ${lib.getDev cctools-port} "$dev"
-
-  '' + lib.optionalString useClangAssembler ''
-    # Use the clang-integrated assembler instead of using `as` from cctools.
-    makeWrapper "${lib.getBin llvmPackages.clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
-      --add-flags "-x assembler -integrated-as -c"
-
-  '' + ''
-    ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/${targetPrefix}llvm-ar" "$out/bin/${targetPrefix}ar"
-    ${linkManPages llvmPackages.llvm-manpages "llvm-ar" "ar"}
-
-    for tool in ${toString llvm_bins}; do
-      cctoolsTool=''${tool/-/_}
-      ln -s "${lib.getBin llvmPackages.llvm}/bin/llvm-$tool" "$out/bin/${targetPrefix}$cctoolsTool"
-      ${linkManPages llvmPackages.llvm-manpages "llvm-$tool" "$cctoolsTool"}
-    done
-
-    for tool in ${toString cctools_bins}; do
-      ln -s "${lib.getBin cctools-port}/bin/${targetPrefix}$tool" "$out/bin/${targetPrefix}$tool"
-      ${linkManPages (lib.getMan cctools-port) "$tool" "$tool"}
-    done
-
-    ${linkManPages (lib.getMan cctools-port) "ld64" "ld64"}
-    ${lib.optionalString (!useLLVMOtool)  # The actual man page for otool in cctools is llvm-otool
-      (linkManPages (lib.getMan cctools-port) "llvm-otool" "llvm-otool")}
-  '';
-
-  passthru = { inherit targetPrefix; };
-}
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
deleted file mode 100644
index cc162d870a2e..000000000000
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ /dev/null
@@ -1,198 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook, memstreamHook
-, installShellFiles
-, libuuid
-, libobjc ? null, maloader ? null
-, enableTapiSupport ? true, libtapi
-, fetchpatch
-}:
-
-let
-
-  # The targetPrefix prepended to binary names to allow multiple binuntils on the
-  # PATH to both be usable.
-  targetPrefix = lib.optionalString
-    (stdenv.targetPlatform != stdenv.hostPlatform)
-    "${stdenv.targetPlatform.config}-";
-in
-
-# Non-Darwin alternatives
-assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
-
-stdenv.mkDerivation {
-  pname = "${targetPrefix}cctools-port";
-  version = "973.0.1";
-
-  src = fetchFromGitHub {
-    owner  = "tpoechtrager";
-    repo   = "cctools-port";
-    # This is the commit before: https://github.com/tpoechtrager/cctools-port/pull/114
-    # That specific change causes trouble for us (see the PR discussion), but
-    # is also currently the last commit on master at the time of writing, so we
-    # can just go back one step.
-    rev    = "457dc6ddf5244ebf94f28e924e3a971f1566bd66";
-    sha256 = "0ns12q7vg9yand4dmdsps1917cavfbw67yl5q7bm6kb4ia5kkx13";
-  };
-
-  outputs = [ "out" "dev" "gas" "man" ];
-
-  nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]
-    ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ];
-  buildInputs = [ libuuid ]
-    ++ lib.optionals stdenv.isDarwin [ libobjc ]
-    ++ lib.optional enableTapiSupport libtapi;
-
-  patches = [
-    ./ld-ignore-rpath-link.patch
-    ./ld-rpath-nonfinal.patch
-    (fetchpatch {
-      url = "https://github.com/tpoechtrager/cctools-port/commit/4a734070cd2838e49658464003de5b92271d8b9e.patch";
-      hash = "sha256-72KaJyu7CHXxJJ1GNq/fz+kW1RslO3UaKI91LhBtiXA=";
-    })
-    (fetchpatch {
-      url = "https://github.com/MercuryTechnologies/cctools-port/commit/025899b7b3593dedb0c681e689e57c0e7bbd9b80.patch";
-      hash = "sha256-SWVUzFaJHH2fu9y8RcU3Nx/QKx60hPE5zFx0odYDeQs=";
-    })
-    # Always use `open_memstream`. This is provided by memstream via hook on x86_64-darwin.
-    ./darwin-memstream.patch
-  ];
-
-  __propagatedImpureHostDeps = [
-    # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
-    "/usr/lib/libobjc.A.dylib"
-    "/usr/lib/libobjc.dylib"
-  ];
-
-  enableParallelBuilding = true;
-
-  # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
-  configureFlags = [ "--disable-clang-as" ]
-    ++ lib.optionals enableTapiSupport [
-      "--enable-tapi-support"
-      "--with-libtapi=${libtapi}"
-    ];
-
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace cctools/Makefile.am --replace libobjc2 ""
-  '' + ''
-    sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
-
-    # FIXME: there are far more absolute path references that I don't want to fix right now
-    substituteInPlace cctools/configure.ac \
-      --replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
-      --replace "-L/usr/local/lib" "" \
-
-    # Appears to use new libdispatch API not available in macOS SDK 10.12.
-    substituteInPlace cctools/ld64/src/ld/libcodedirectory.c \
-      --replace "#define LIBCD_PARALLEL 1" ""
-
-    patchShebangs tools
-    sed -i -e 's/which/type -P/' tools/*.sh
-
-    cd cctools
-  '';
-
-  preInstall = ''
-    installManPage ar/ar.{1,5}
-
-    # The makefile rules for installing headers are missing in 973.0.1.
-    # The below is derived from 949.0.1.
-    mkdir -p $dev/include/mach-o/i386
-    mkdir -p $dev/include/mach-o/ppc
-    mkdir -p $dev/include/mach-o/x86_64
-    mkdir -p $dev/include/mach-o/arm
-    mkdir -p $dev/include/mach-o/arm64
-    mkdir -p $dev/include/mach-o/m68k
-    mkdir -p $dev/include/mach-o/sparc
-    mkdir -p $dev/include/mach-o/hppa
-    mkdir -p $dev/include/mach-o/i860
-    mkdir -p $dev/include/mach-o/m88k
-    mkdir -p $dev/include/dyld
-    mkdir -p $dev/include/cbt
-
-    pushd include/mach-o
-    install -c -m 444  arch.h ldsyms.h reloc.h \
-      stab.h loader.h fat.h swap.h getsect.h nlist.h \
-      ranlib.h $dev/include/mach-o
-    popd
-
-    pushd include/mach-o/i386
-    install -c -m 444  swap.h \
-      $dev/include/mach-o/i386
-    popd
-
-    pushd include/mach-o/ppc
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/ppc
-    popd
-
-    pushd include/mach-o/x86_64
-    install -c -m 444  reloc.h \
-      $dev/include/mach-o/x86_64
-    popd
-
-    pushd include/mach-o/arm
-    install -c -m 444  reloc.h \
-      $dev/include/mach-o/arm
-    popd
-
-    pushd include/mach-o/arm64
-    install -c -m 444  reloc.h \
-      $dev/include/mach-o/arm64
-    popd
-
-    pushd include/mach-o/m68k
-    install -c -m 444  swap.h \
-      $dev/include/mach-o/m68k
-    popd
-
-    pushd include/mach-o/sparc
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/sparc
-    popd
-
-    pushd include/mach-o/hppa
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/hppa
-    popd
-
-    pushd include/mach-o/i860
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/i860
-    popd
-
-    pushd include/mach-o/m88k
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/m88k
-    popd
-
-    pushd include/stuff
-    install -c -m 444  bool.h \
-      $dev/include/dyld
-    popd
-
-    pushd include/cbt
-    install -c -m 444  libsyminfo.h \
-      $dev/include/cbt
-    popd
-  '';
-
-  postInstall = ''
-    # Move GNU as to its own output to prevent it from being used accidentally.
-    moveToOutput bin/gas "$gas"
-    moveToOutput libexec "$gas"
-  '';
-
-  passthru = {
-    inherit targetPrefix;
-  };
-
-  meta = {
-    broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
-    homepage = "http://www.opensource.apple.com/source/cctools/";
-    description = "MacOS Compiler Tools (cross-platform port)";
-    license = lib.licenses.apple-psl20;
-    maintainers = with lib.maintainers; [ matthewbauer ];
-  };
-}
diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix
deleted file mode 100644
index cb6b3cf4b739..000000000000
--- a/pkgs/os-specific/darwin/libtapi/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libtapi";
-  version = "1100.0.11"; # determined by looking at VERSION.txt
-
-  src = fetchFromGitHub {
-    owner = "tpoechtrager";
-    repo = "apple-libtapi";
-    rev = "664b8414f89612f2dfd35a9b679c345aa5389026";
-    sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/src/llvm";
-
-  # Backported from newer llvm, fixes configure error when cross compiling.
-  # Also means we don't have to manually fix the result with install_name_tool.
-  patches = [
-    ./disable-rpath.patch
-  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    # TODO: make unconditional and rebuild the world
-    # TODO: send upstream
-    ./native-clang-tblgen.patch
-  ];
-
-  nativeBuildInputs = [ cmake python3 ];
-
-  # ncurses is required here to avoid a reference to bootstrap-tools, which is
-  # not allowed for the stdenv.
-  buildInputs = [ ncurses ];
-
-  cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-DCMAKE_CROSSCOMPILING=True"
-      # This package could probably have a llvm_6 llvm-tblgen and clang-tblgen
-      # provided to reduce some building. This package seems intended to
-      # include all of its dependencies, including enough of LLVM to build the
-      # required tablegens.
-      (
-        let
-          nativeCC = pkgsBuildBuild.stdenv.cc;
-          nativeBintools = nativeCC.bintools.bintools;
-          nativeToolchainFlags = [
-            "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc"
-            "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++"
-            "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar"
-            "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip"
-            "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib"
-          ];
-        in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}"
-      )
-    ];
-
-  # fixes: fatal error: 'clang/Basic/Diagnostic.h' file not found
-  # adapted from upstream
-  # https://github.com/tpoechtrager/apple-libtapi/blob/3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48/build.sh#L58-L60
-  preConfigure = ''
-    INCLUDE_FIX="-I $PWD/projects/clang/include"
-    INCLUDE_FIX+=" -I $PWD/build/projects/clang/include"
-
-    cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="$INCLUDE_FIX")
-  '';
-
-  buildFlags = [ "clangBasic" "libtapi" "tapi" ];
-
-  installTargets = [ "install-libtapi" "install-tapi-headers" "install-tapi" ];
-
-  meta = with lib; {
-    description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size";
-    mainProgram = "tapi";
-    homepage = "https://github.com/tpoechtrager/apple-libtapi";
-    license = licenses.ncsa;
-    maintainers = with maintainers; [ matthewbauer ];
-  };
-})
diff --git a/pkgs/os-specific/darwin/libtapi/disable-rpath.patch b/pkgs/os-specific/darwin/libtapi/disable-rpath.patch
deleted file mode 100644
index 87c0cf3330de..000000000000
--- a/pkgs/os-specific/darwin/libtapi/disable-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/llvm/cmake/modules/AddLLVM.cmake b/src/llvm/cmake/modules/AddLLVM.cmake
-index a53016eb0..b65e608a4 100644
---- a/cmake/modules/AddLLVM.cmake
-+++ b/cmake/modules/AddLLVM.cmake
-@@ -1683,8 +1683,7 @@ function(llvm_setup_rpath name)
-   endif()
- 
-   if (APPLE)
--    set(_install_name_dir INSTALL_NAME_DIR "@rpath")
--    set(_install_rpath "@loader_path/../lib" ${extra_libdir})
-+    set(_install_name_dir)
-   elseif(UNIX)
-     set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
-     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
diff --git a/pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch b/pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch
deleted file mode 100644
index 9b715766a122..000000000000
--- a/pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diffprojects/libtapi/CMakeLists.txt b/src/llvm/projects/libtapi/CMakeLists.txt
-index 8ee6d8138..8277be147 100644
---- a/projects/libtapi/CMakeLists.txt
-+++ b/projects/libtapi/CMakeLists.txt
-@@ -193,7 +193,15 @@ if (NOT DEFINED CLANG_VERSION)
-   set(CLANG_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
- endif ()
- if (NOT DEFINED CLANG_TABLEGEN_EXE)
--  set(CLANG_TABLEGEN_EXE "${LLVM_TOOLS_BINARY_DIR}/clang-tblgen")
-+  if(LLVM_USE_HOST_TOOLS)
-+    if (NOT CMAKE_CONFIGURATION_TYPES)
-+      set(CLANG_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/bin/clang-tblgen")
-+    else()
-+      set(CLANG_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/Release/bin/clang-tblgen")
-+    endif()
-+  else()
-+    set(CLANG_TABLEGEN_EXE "${LLVM_TOOLS_BINARY_DIR}/clang-tblgen")
-+  endif ()
- endif ()
- 
- # Include must go first.

From 9641ac5251847c2f8f299b1d8a91f3c038ea06cb Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 1 Jul 2024 18:34:40 -0400
Subject: [PATCH 251/319] darwin.cctools-{apple,llvm}: add to
 darwin-aliases.nix

---
 pkgs/top-level/darwin-aliases.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index c9799351f4e6..36cb82c0833d 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -51,6 +51,10 @@ mapAliases ({
 
   builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06
 
+  ### C ###
+  cctools-apple = pkgs.cctools; # added 2024-07-01
+  cctools-llvm = pkgs.cctools; # added 2024-07-01
+
   ### I ###
 
   insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04

From c6d7e859960316a79515779b509ad3306a4e5697 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Sat, 13 Jul 2024 15:32:53 -0500
Subject: [PATCH 252/319] ffmpeg: add lcms2 option

FFmpeg 5.1 introduced optional support for ICC profiles using lcms2[^1].
Enable it by default in ffmpeg-full.

[^1]: https://github.com/FFmpeg/FFmpeg/commit/b9a25963f7232433c9370ac369fb668ac0d5cb53
---
 pkgs/development/libraries/ffmpeg/generic.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index e74bb1c2348e..372fc50494be 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -72,6 +72,7 @@
 , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
 , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
 , withLadspa ? withFullDeps # LADSPA audio filtering
+, withLcms2 ? withFullDeps # ICC profile support via lcms2
 , withLzma ? withHeadlessDeps # xz-utils
 , withMetal ? false # Unfree and requires manual downloading of files
 , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
@@ -236,6 +237,7 @@
 , intel-media-sdk
 , ladspaH
 , lame
+, lcms2
 , libaom
 , libaribcaption
 , libass
@@ -654,6 +656,9 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withJxl "libjxl")
   ] ++ [
     (enableFeature withLadspa "ladspa")
+  ] ++ optionals (versionAtLeast version "5.1") [
+    (enableFeature withLcms2 "lcms2")
+  ] ++ [
     (enableFeature withLzma "lzma")
   ] ++ optionals (versionAtLeast version "5.0") [
     (enableFeature withMetal "metal")
@@ -801,6 +806,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withJack [ libjack2 ]
   ++ optionals withJxl [ libjxl ]
   ++ optionals withLadspa [ ladspaH ]
+  ++ optionals withLcms2 [ lcms2 ]
   ++ optionals withLzma [ xz ]
   ++ optionals withMfx [ intel-media-sdk ]
   ++ optionals withModplug [ libmodplug ]

From 4eb1a24ea253964db9aeda82720abcc4bffd3426 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 13 Jul 2024 21:46:12 +0100
Subject: [PATCH 253/319] librsvg: 2.58.1 -> 2.58.2

Changes: https://gitlab.gnome.org/GNOME/librsvg/-/releases/2.58.2
---
 pkgs/development/libraries/librsvg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index e9a9eb977db3..e8426b97cec5 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librsvg";
-  version = "2.58.1";
+  version = "2.58.2";
 
   outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [
     "devdoc"
@@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NyhZYpCoV20wXQbsiv30c1Fv7unf8i4DI16sQz1Wgk4=";
+    hash = "sha256-GOnXDAjPJfUNYQ1tWvVxVh1nz0F5+WLgQmZHXfbi4iQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) src;
     name = "librsvg-deps-${finalAttrs.version}";
-    hash = "sha256-FIW92Cr83YkGTOe/xjyZGZvHYSrG70GBpHc9l0sMjLg=";
+    hash = "sha256-E0bXSxWI0MkJmNvl8gxklXHgy4zlkiee59+s0h4Gw5s=";
     # TODO: move this to fetchCargoTarball
     dontConfigure = true;
   };

From 33c52f27d678854317e57e527c941758c54b1ae4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 12:41:55 +0100
Subject: [PATCH 254/319] tenacity: unpin ffmpeg_5

This builds fine with the current FFmpeg for me.
---
 pkgs/applications/audio/tenacity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix
index c5606677fd45..160a032fd648 100644
--- a/pkgs/applications/audio/tenacity/default.nix
+++ b/pkgs/applications/audio/tenacity/default.nix
@@ -29,7 +29,7 @@
 , expat
 , libid3tag
 , libopus
-, ffmpeg_5
+, ffmpeg
 , soundtouch
 , pcre
 , portaudio
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     expat
-    ffmpeg_5
+    ffmpeg
     file
     flac
     glib

From e3d715eed9de68ccf88bdfd12e853a740f692a41 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 13:13:58 +0100
Subject: [PATCH 255/319] unpaper: unpin ffmpeg_5

This builds fine with the current FFmpeg for me.
---
 pkgs/tools/graphics/unpaper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix
index 0b84d61274d9..dc38c55397a2 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/pkgs/tools/graphics/unpaper/default.nix
@@ -12,7 +12,7 @@
 
 # runtime
 , buildPackages
-, ffmpeg_5-headless
+, ffmpeg-headless
 
 # tests
 , nixosTests
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    ffmpeg_5-headless
+    ffmpeg-headless
   ];
 
   passthru.tests = {

From b801dc281320413584dd7b9d167e176a49914899 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 13:18:56 +0100
Subject: [PATCH 256/319] nixos/frigate: unpin ffmpeg_5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It just uses the command‐line tool, and the test passes.
---
 nixos/modules/services/video/frigate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index c3ec4a3c76c3..5fa67b5ca264 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -403,7 +403,7 @@ in
       path = with pkgs; [
         # unfree:
         # config.boot.kernelPackages.nvidiaPackages.latest.bin
-        ffmpeg_5-headless
+        ffmpeg-headless
         libva-utils
         procps
         radeontop

From aef28c78342df54cf064b10dc95b2902df0420f2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 13:29:09 +0100
Subject: [PATCH 257/319] nixos/akkoma: unpin ffmpeg_5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Their Dockerfile uses Alpine’s ffmpeg package, which is already
on 6. They just invoke the command‐line tool and nothing they do
looks particularly version‐sensitive.
---
 nixos/modules/services/web-apps/akkoma.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index 8ba3c7eaa1e6..17c221778d89 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -452,9 +452,9 @@ in {
 
       extraPackages = mkOption {
         type = with types; listOf package;
-        default = with pkgs; [ exiftool ffmpeg_5-headless graphicsmagick-imagemagick-compat ];
-        defaultText = literalExpression "with pkgs; [ exiftool graphicsmagick-imagemagick-compat ffmpeg_5-headless ]";
-        example = literalExpression "with pkgs; [ exiftool imagemagick ffmpeg_5-full ]";
+        default = with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ];
+        defaultText = literalExpression "with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]";
+        example = literalExpression "with pkgs; [ exiftool ffmpeg-full imagemagick ]";
         description = ''
           List of extra packages to include in the executable search path of the service unit.
           These are needed by various configurable components such as:

From ca258d2d393eb240fd4eddf9a40093e422c33116 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 13:45:27 +0100
Subject: [PATCH 258/319] python3Packages.av: 11.0.0 -> 12.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pin FFmpeg to 6.x as upstream doesn’t even support 5.x any
more. Unfortunately 7.x support is not yet there; I might have to
handle it myself when we drop 6.
---
 pkgs/development/python-modules/av/default.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index c126a8ab1fc4..bc5989284ce4 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -4,8 +4,7 @@
   buildPythonPackage,
   cython,
   fetchFromGitHub,
-  fetchpatch,
-  ffmpeg_5-headless,
+  ffmpeg_6-headless,
   numpy,
   pillow,
   pkg-config,
@@ -16,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "11.0.0";
+  version = "12.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,25 +24,16 @@ buildPythonPackage rec {
     owner = "mikeboers";
     repo = "PyAV";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pCKP+4ZmZCJcG7/Qy9H6aS4svQdgaRA9S1QVNWFYhSQ=";
+    hash = "sha256-yPVAtL71pL/ok3bli+r/IruCrmmhNyv98pr7z3m8sbo=";
   };
 
-  patches = [
-    # merged upstream PR: https://github.com/PyAV-Org/PyAV/pull/1387
-    (fetchpatch {
-      name = "use-pkg-config-env-var-fix-cross.patch";
-      url = "https://github.com/PyAV-Org/PyAV/commit/ba7a2c9f716af506838d399e6ed27ed6d64d2435.patch";
-      sha256 = "sha256-oH+g8sVoVCQe6DimRN38VT2GdziriwHYRAhldNxz9/E=";
-    })
-  ];
-
   nativeBuildInputs = [
     cython
     pkg-config
     setuptools
   ];
 
-  buildInputs = [ ffmpeg_5-headless ];
+  buildInputs = [ ffmpeg_6-headless ];
 
   preCheck = ''
     # ensure we import the built version

From bc16039841add3a6cb02e7bcdf61c950f20830b8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 13:37:01 +0100
Subject: [PATCH 259/319] python3Packages.torchaudio-bin: drop ffmpeg_{4,5}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These don’t seem necessary.
---
 pkgs/development/python-modules/torchaudio/bin.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 903e1641056b..44205578a38d 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -6,8 +6,6 @@
   buildPythonPackage,
   cudaPackages,
   fetchurl,
-  ffmpeg_4,
-  ffmpeg_5,
   ffmpeg_6,
   sox,
   pythonAtLeast,
@@ -33,9 +31,7 @@ buildPythonPackage rec {
 
   buildInputs =
     [
-      # We need to patch the lib/_torchaudio_ffmpeg[4-6]
-      ffmpeg_4.dev
-      ffmpeg_5.dev
+      # We need to patch lib/torio/_torio_ffmpeg6
       ffmpeg_6.dev
       sox
     ]
@@ -63,6 +59,12 @@ buildPythonPackage rec {
     addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
   '';
 
+  preFixup = ''
+    # TorchAudio loads the newest FFmpeg that works, so get rid of the
+    # old ones.
+    rm $out/${python.sitePackages}/torio/lib/{lib,_}torio_ffmpeg{4,5}.*
+  '';
+
   # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
   dontStrip = true;
 

From fa8873cad09c310e4f5ff2f69a28f16f212f443b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 14:07:21 +0100
Subject: [PATCH 260/319] wl-screenrec: pin ffmpeg_6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From <https://github.com/russelltg/wl-screenrec/blob/v0.1.3/README.md#from-source-using-cargo>:

> Install ffmpeg 6 or later, which is a required dependency. ffmpeg
> 5 may work, but is untested (open an issue or PR if you test with
> ffmpeg 5 so I can update these docs on if it works or not)

I guess it worked…

7.x will need a bump to the ffmpeg-sys-next crate, but see
<https://github.com/russelltg/wl-screenrec/issues/77>.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 858b353c2c8d..5df3cdaa8d49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4666,7 +4666,7 @@ with pkgs;
   wl-mirror = callPackage ../tools/wayland/wl-mirror { };
 
   wl-screenrec = callPackage ../tools/wayland/wl-screenrec {
-    ffmpeg = ffmpeg_5;
+    ffmpeg = ffmpeg_6;
   };
 
   wleave = callPackage ../tools/wayland/wleave { };

From fb40c82929a35dfd55564e78ff94208eb8c30719 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 16:27:18 +0100
Subject: [PATCH 261/319] parsec-bin: pin ffmpeg_4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is an upstream version that supports FFmpeg >= 6, but it’s
not available in their distributed package yet. Downgrade the FFmpeg
for now until it can be bumped later.
---
 pkgs/applications/misc/parsec/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix
index 436822aa2b88..3bd2734597a3 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/applications/misc/parsec/bin.nix
@@ -16,7 +16,7 @@
 , libXfixes
 , libpulseaudio
 , libva
-, ffmpeg_5
+, ffmpeg_4
 , libpng
 , libjpeg8
 , curl
@@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation {
     alsa-lib
     libpulseaudio
     libva
-    ffmpeg_5
+    ffmpeg_4
     libpng
     libjpeg8
     curl

From d25171fc8e662f9df9626878948ab5897a1dea56 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 16:43:12 +0100
Subject: [PATCH 262/319] dim: bump nightfall for FFmpeg >= 6 support

I have no idea if this works.
---
 pkgs/by-name/di/dim/Cargo.lock           | 43 +++++++++++----------
 pkgs/by-name/di/dim/bump-nightfall.patch | 48 ++++++++++++++++++++++++
 pkgs/by-name/di/dim/package.nix          | 14 +++++--
 3 files changed, 80 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/by-name/di/dim/bump-nightfall.patch

diff --git a/pkgs/by-name/di/dim/Cargo.lock b/pkgs/by-name/di/dim/Cargo.lock
index adb78aa7a929..d0d35c8ac7cc 100644
--- a/pkgs/by-name/di/dim/Cargo.lock
+++ b/pkgs/by-name/di/dim/Cargo.lock
@@ -979,7 +979,7 @@ dependencies = [
  "tracing-appender",
  "tracing-subscriber",
  "url",
- "uuid 1.5.0",
+ "uuid 1.10.0",
  "xmlwriter",
  "xtra",
  "zip",
@@ -1079,7 +1079,7 @@ dependencies = [
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
- "uuid 1.5.0",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -2049,14 +2049,14 @@ dependencies = [
 [[package]]
 name = "nightfall"
 version = "0.3.12-rc4"
-source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c"
+source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7"
 dependencies = [
  "async-trait",
  "cfg-if",
  "err-derive",
  "lazy_static",
  "mp4",
- "nix 0.20.0",
+ "nix 0.27.1",
  "ntapi",
  "once_cell",
  "psutil",
@@ -2067,24 +2067,12 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
- "uuid 0.8.2",
+ "uuid 1.10.0",
  "winapi",
  "xtra",
  "xtra_proc",
 ]
 
-[[package]]
-name = "nix"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.23.2"
@@ -2098,6 +2086,17 @@ dependencies = [
  "memoffset 0.6.5",
 ]
 
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.1",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "no-std-compat"
 version = "0.4.1"
@@ -2140,9 +2139,9 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
 dependencies = [
  "winapi",
 ]
@@ -3505,7 +3504,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "uuid 1.5.0",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -3747,9 +3746,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.5.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
 ]
diff --git a/pkgs/by-name/di/dim/bump-nightfall.patch b/pkgs/by-name/di/dim/bump-nightfall.patch
new file mode 100644
index 000000000000..37979efd5f78
--- /dev/null
+++ b/pkgs/by-name/di/dim/bump-nightfall.patch
@@ -0,0 +1,48 @@
+diff --git a/dim/Cargo.toml b/dim/Cargo.toml
+index b7c8106493...38518ba29d 100644
+--- a/dim/Cargo.toml
++++ b/dim/Cargo.toml
+@@ -15,7 +15,7 @@
+ fdlimit = "0.2.1"
+ 
+ # git dependencies
+-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
+     "cuda",
+     "ssa_transmux",
+ ] }
+diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml
+index b311b7c7af...ffc5d85dbb 100644
+--- a/dim-core/Cargo.toml
++++ b/dim-core/Cargo.toml
+@@ -11,7 +11,7 @@
+ 
+ [dependencies]
+ # git dependencies
+-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
+     "cuda",
+     "ssa_transmux",
+ ] }
+@@ -72,7 +72,7 @@
+     "json",
+ ] }
+ url = "2.2.2"
+-uuid = { version = "1.2.2", features = ["v4"] }
++uuid = { version = "1.6.1", features = ["v4"] }
+ xmlwriter = "0.1.0"
+ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
+ 
+diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml
+index 2da5764d50...4c7574c0b4 100644
+--- a/dim-web/Cargo.toml
++++ b/dim-web/Cargo.toml
+@@ -14,7 +14,7 @@
+ dim-events = { path = "../dim-events" }
+ dim-core = { path = "../dim-core" }
+ 
+-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
+     "cuda",
+     "ssa_transmux",
+ ] }
diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix
index fba2c5e11f0c..f7fe86ab9a98 100644
--- a/pkgs/by-name/di/dim/package.nix
+++ b/pkgs/by-name/di/dim/package.nix
@@ -6,7 +6,7 @@
   buildNpmPackage,
   darwin,
   makeWrapper,
-  ffmpeg_5,
+  ffmpeg,
   git,
   pkg-config,
   sqlite,
@@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec {
     # the working dir and PATH instead.
     ./relative-paths.diff
 
+    # Bump the first‐party nightfall dependency to the latest Git
+    # revision for FFmpeg >= 6 support.
+    ./bump-nightfall.patch
+
     # Upstream has some unused imports that prevent things from compiling...
     # Remove for next release.
     (fetchpatch {
@@ -57,6 +61,10 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
+  postPatch = ''
+    ln -sf ${./Cargo.lock} Cargo.lock
+  '';
+
   postConfigure = ''
     ln -ns $frontend ui/build
   '';
@@ -82,7 +90,7 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno=";
-      "nightfall-0.3.12-rc4" = "sha256-DtSXdIDg7XBgzEYzHdzjrHdM1ESKTQdgByeerH5TWwU=";
+      "nightfall-0.3.12-rc4" = "sha256-AbSuLe3ySOla3NB+mlfHRHqHuMqQbrThAaUZ747GErE=";
     };
   };
 
@@ -101,7 +109,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/dim \
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg_5 ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
   '';
 
   meta = {

From 58c4f3cfc89e6486b5460a1b4bb30fc359a3796f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 17:54:28 +0100
Subject: [PATCH 263/319] gifski: pin ffmpeg_6

Officially supported upstream. 7.x might be a bit tricky because it
uses a fork of the ffmpeg-sys-next crate.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5df3cdaa8d49..9c19920dad9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8207,7 +8207,7 @@ with pkgs;
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
   gifski = callPackage ../tools/graphics/gifski {
-    ffmpeg = ffmpeg_5;
+    ffmpeg = ffmpeg_6;
   };
 
   github-backup = callPackage ../tools/misc/github-backup { };

From f9eee6b0a730590f936a1d72f2d391ed7b8bb151 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 12 Jul 2024 14:04:08 +0100
Subject: [PATCH 264/319] ffmpeg_5: drop

---
 .../manual/release-notes/rl-2411.section.md   |  3 ++
 nixos/modules/config/no-x-libs.nix            |  1 -
 .../ffmpeg/5.1.4-CVE-2023-49502.patch         | 26 -----------
 pkgs/development/libraries/ffmpeg/default.nix |  9 ----
 pkgs/development/libraries/ffmpeg/generic.nix | 43 -------------------
 pkgs/top-level/aliases.nix                    |  3 ++
 pkgs/top-level/all-packages.nix               |  3 --
 7 files changed, 6 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index dbce033ab17b..ecf7bfb5c63f 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -202,6 +202,9 @@
 - The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer.
   Consequently the package `pkgs.ma1sd` has also been removed.
 
+- `ffmpeg_5` has been removed. Please use the unversioned `ffmpeg`,
+  pin a newer version, or if necessary pin `ffmpeg_4` for compatibility.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 930e57dbde5b..2448d08a2399 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -33,7 +33,6 @@ with lib;
       fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; };
       ffmpeg = super.ffmpeg.override { ffmpegVariant = "headless"; };
       ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; };
-      ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; };
       ffmpeg_6 = super.ffmpeg_6.override { ffmpegVariant = "headless"; };
       ffmpeg_7 = super.ffmpeg_7.override { ffmpegVariant = "headless"; };
       # dep of graphviz, libXpm is optional for Xpm support
diff --git a/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch b/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch
deleted file mode 100644
index ca8b8b4d15bd..000000000000
--- a/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Based on upstream 737ede405b11a37fdd61d19cf25df296a0cb0b75, with cuda and
-vulkan implementations removed, bwdif adjusted to apply to 5.1.4
-
-diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c
-index 65c617ebb3..35c864f71e 100644
---- a/libavfilter/vf_bwdif.c
-+++ b/libavfilter/vf_bwdif.c
-@@ -333,13 +333,14 @@ static int config_props(AVFilterLink *link)
-     if(yadif->mode&1)
-         link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1});
- 
--    if (link->w < 3 || link->h < 4) {
--        av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n");
-+    yadif->csp = av_pix_fmt_desc_get(link->format);
-+    yadif->filter = filter;
-+
-+    if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) {
-+        av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n");
-         return AVERROR(EINVAL);
-     }
- 
--    yadif->csp = av_pix_fmt_desc_get(link->format);
--    yadif->filter = filter;
-     if (yadif->csp->comp[0].depth > 8) {
-         s->filter_intra = filter_intra_16bit;
-         s->filter_line  = filter_line_c_16bit;
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 88b5564ecba4..a4869184bdc6 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -22,11 +22,6 @@ let
     hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA=";
   };
 
-  v5 = {
-    version = "5.1.4";
-    hash = "sha256-2jUL1/xGUf7aMooST2DW41KE7bC+BtgChXmj0sAJZ90=";
-  };
-
   v6 = {
     version = "6.1.1";
     hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo=";
@@ -43,10 +38,6 @@ rec {
   ffmpeg_4-headless = mkFFmpeg v4 "headless";
   ffmpeg_4-full = mkFFmpeg v4 "full";
 
-  ffmpeg_5 = mkFFmpeg v5 "small";
-  ffmpeg_5-headless = mkFFmpeg v5 "headless";
-  ffmpeg_5-full = mkFFmpeg v5 "full";
-
   ffmpeg_6 = mkFFmpeg v6 "small";
   ffmpeg_6-headless = mkFFmpeg v6 "headless";
   ffmpeg_6-full = mkFFmpeg v6 "full";
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index e74bb1c2348e..9ce6a6b7a486 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -430,49 +430,6 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28=";
       })
     ]
-    ++ optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [
-      (fetchpatch2 {
-        name = "fix_build_failure_due_to_libjxl_version_to_new";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2";
-        hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU=";
-      })
-      (fetchpatch2 {
-        name = "5.x-CVE-2024-31585.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8711cea3841fc385cccb1e7255176479e865cd4d";
-        hash = "sha256-WT+ly/l04yM/tRVbhkESA3sDDjwvtd/Cg2y8tQo4ApI=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2024-31582.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
-        hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2024-31578.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
-        hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
-      })
-      ./5.1.4-CVE-2023-49502.patch
-      (fetchpatch2 {
-        name = "CVE-2023-50008.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
-        hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-51793.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8b8b4bdef311f88c0075a06a25320187aff00bf2";
-        hash = "sha256-e7oGyOfUXuA8XK3vfygNtFlHpHl92O2KSLAo50sNJ5o=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-51796.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e01a55c5283b82667dad347331816a5e20869ce9";
-        hash = "sha256-m4rq+UFG3nXdgOJ3S6XcruMZ+CPw+twmy2HFv3cnvJc=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-51794.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/50f0f8c53c818f73fe2d752708e2fa9d2a2d8a07";
-        hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28=";
-      })
-    ]
     ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [
       (fetchpatch2 { # this can be removed post 6.1
         name = "fix_build_failure_due_to_PropertyKey_EncoderID";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2cea9e2a92e8..146617cab706 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -430,6 +430,9 @@ mapAliases ({
   fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
   inherit (luaPackages) fennel; # Added 2022-09-24
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
+  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use a newer version or ffmpeg_4 for compatibility"; # Added 2024-07-12
+  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use a newer version or ffmpeg_4-headless for compatibility"; # Added 2024-07-12
+  ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use a newer version or ffmpeg_4-full for compatibility"; # Added 2024-07-12
   FIL-plugins = fil-plugins; # Added 2024-06-12
   findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10
   finger_bsd = bsd-finger;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c19920dad9a..1049020231e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20381,9 +20381,6 @@ with pkgs;
     ffmpeg_4
     ffmpeg_4-headless
     ffmpeg_4-full
-    ffmpeg_5
-    ffmpeg_5-headless
-    ffmpeg_5-full
     ffmpeg_6
     ffmpeg_6-headless
     ffmpeg_6-full

From 47f435dbbf023caa27bbd5b955d3286fb700c32a Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Sun, 14 Jul 2024 15:06:18 +0200
Subject: [PATCH 265/319] mercurial: add setuptools' distutils to test env

The distutils module is required for the test suite to run.

Upstream issue: https://bz.mercurial-scm.org/show_bug.cgi?id=6887
---
 .../version-management/mercurial/default.nix        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index feb7a77a6af9..7cdacd4c6f4f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -17,7 +17,7 @@
 }:
 
 let
-  inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
+  inherit (python3Packages) docutils python fb-re2 pygit2 pygments setuptools;
 
   self = python3Packages.buildPythonApplication rec {
     pname = "mercurial${lib.optionalString fullBuild "-full"}";
@@ -43,7 +43,7 @@ let
     propagatedBuildInputs = lib.optional re2Support fb-re2
       ++ lib.optional gitSupport pygit2
       ++ lib.optional highlightSupport pygments;
-    nativeBuildInputs = [ makeWrapper gettext installShellFiles python3Packages.setuptools ]
+    nativeBuildInputs = [ makeWrapper gettext installShellFiles setuptools ]
       ++ lib.optionals rustSupport [
            rustPlatform.cargoSetupHook
            cargo
@@ -112,6 +112,9 @@ let
       gnupg
     ];
 
+    # https://bz.mercurial-scm.org/show_bug.cgi?id=6887
+    propagatedBuildInputs = [ setuptools ];
+
     postPatch = ''
       patchShebangs .
 
@@ -125,6 +128,12 @@ let
           --replace '*/hg:' '*/*hg*:' \${/* paths emitted by our wrapped hg look like ..hg-wrapped-wrapped */""}
           --replace '"$PYTHON" "$BINDIR"/hg' '"$BINDIR"/hg' ${/* 'hg' is a wrapper; don't run using python directly */""}
       done
+
+      # https://bz.mercurial-scm.org/show_bug.cgi?id=6887
+      # Adding setuptools to the python path is not enough for the distutils
+      # module to be found, so we patch usage directly:
+      substituteInPlace tests/hghave.py \
+        --replace-fail "distutils" "setuptools._distutils"
     '';
 
     # This runs Mercurial _a lot_ of times.

From 57a38b02f96d6e72040b5c54e745e528622eec22 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 14 Jul 2024 13:20:00 +0100
Subject: [PATCH 266/319] llvm: make hardeningDisable of trivialautovarinit
 common across all llvms

its omission from llvm 17 was probably an oversight arising
from llvm 17's release leap-frogging the trivialautovarinit
PR
---
 pkgs/development/compilers/llvm/common/llvm/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index f780c87d0e4b..a59c704ebbcb 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -102,6 +102,10 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "lib" "dev" "python" ];
 
+  hardeningDisable = [
+    "trivialautovarinit"
+  ];
+
   nativeBuildInputs = [ cmake ]
     ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
     ++ [ python ]
@@ -535,6 +539,4 @@ stdenv.mkDerivation (rec {
     check_version minor ${minor}
     check_version patch ${patch}
   '';
-} // lib.optionalAttrs (lib.versionOlder release_version "17" || lib.versionAtLeast release_version "18") {
-  hardeningDisable = [ "trivialautovarinit" ];
 })

From c65cf1b9c5a2bf258135fcccc302a6cc100fb32c Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 15 Jul 2024 00:17:55 +0800
Subject: [PATCH 267/319] pkgs/stdenv/generic/setup.sh: fix unbound variables
 and pass ShellCheck checks (#298831)

* pkgs/stdenv/generic/setup.sh: supress ShellCheck error about Bash array indexing syntax

* pkgs/stdenv/generic/setup.sh: loop by per-line read

* pkgs/stdenv/generic/setup.sh: fix variable quoting

* pkgs/stdenv/generic/setup.sh: separate declaration and assignment
---
 pkgs/stdenv/generic/setup.sh | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 2a6d38ddbeb9..40bf6554183c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -355,8 +355,10 @@ _accumFlagsArray() {
             local -n nameref="$name"
             case "$name" in
                 *Array)
+                    # shellcheck disable=SC2206
                     flagsArray+=( ${nameref+"${nameref[@]}"} ) ;;
                 *)
+                    # shellcheck disable=SC2206
                     flagsArray+=( ${nameref-} ) ;;
             esac
         done
@@ -576,7 +578,9 @@ findInputs() {
     # Sanity check
     (( hostOffset <= targetOffset )) || exit 1
 
+    # shellcheck disable=SC1087
     local varVar="${pkgAccumVarVars[hostOffset + 1]}"
+    # shellcheck disable=SC1087
     local varRef="$varVar[$((targetOffset - hostOffset))]"
     local var="${!varRef}"
     unset -v varVar varRef
@@ -585,6 +589,7 @@ findInputs() {
     # nix-shell doesn't use impure bash. This should replace the O(n)
     # case with an O(1) hash map lookup, assuming bash is implemented
     # well :D.
+    # shellcheck disable=SC1087
     local varSlice="$var[*]"
     # ${..-} to hack around old bash empty array problem
     case "${!varSlice-}" in
@@ -999,12 +1004,12 @@ _allFlags() {
     # so some substitutions such as name don't have to be in the env attrset
     # when __structuredAttrs is enabled
     export system pname name version
-    for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do
+    while IFS='' read -r varName; do
         if (( "${NIX_DEBUG:-0}" >= 1 )); then
             printf "@%s@ -> %q\n" "${varName}" "${!varName}" >&2
         fi
         args+=("--subst-var" "$varName")
-    done
+    done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }')
 }
 
 substituteAllStream() {
@@ -1175,6 +1180,7 @@ unpackPhase() {
     if [ -n "$__structuredAttrs" ]; then
         srcsArray=( "${srcs[@]}" )
     else
+        # shellcheck disable=SC2206
         srcsArray=( $srcs )
     fi
 
@@ -1242,8 +1248,10 @@ patchPhase() {
 
     local -a patchesArray
     if [ -n "$__structuredAttrs" ]; then
+        # shellcheck disable=SC2206
         patchesArray=( ${patches:+"${patches[@]}"} )
     else
+        # shellcheck disable=SC2206
         patchesArray=( ${patches:-} )
     fi
 
@@ -1269,7 +1277,7 @@ patchPhase() {
         if [ -n "$__structuredAttrs" ]; then
             flagsArray=( "${patchFlags[@]:--p1}" )
         else
-            # shellcheck disable=SC2086
+            # shellcheck disable=SC2086,SC2206
             flagsArray=( ${patchFlags:--p1} )
         fi
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
@@ -1382,7 +1390,7 @@ buildPhase() {
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
-            SHELL=$SHELL
+            SHELL="$SHELL"
         )
         _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
@@ -1407,9 +1415,9 @@ checkPhase() {
     if [[ -z "${checkTarget:-}" ]]; then
         #TODO(@oxij): should flagsArray influence make -n?
         if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
-            checkTarget=check
+            checkTarget="check"
         elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
-            checkTarget=test
+            checkTarget="test"
         fi
     fi
 
@@ -1420,16 +1428,18 @@ checkPhase() {
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            SHELL=$SHELL
+            SHELL="$SHELL"
         )
 
         _accumFlagsArray makeFlags makeFlagsArray
         if [ -n "$__structuredAttrs" ]; then
             flagsArray+=( "${checkFlags[@]:-VERBOSE=y}" )
         else
+            # shellcheck disable=SC2206
             flagsArray+=( ${checkFlags:-VERBOSE=y} )
         fi
         _accumFlagsArray checkFlagsArray
+        # shellcheck disable=SC2206
         flagsArray+=( ${checkTarget} )
 
         echoCmd 'check flags' "${flagsArray[@]}"
@@ -1461,12 +1471,13 @@ installPhase() {
     # shellcheck disable=SC2086
     local flagsArray=(
         ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
-        SHELL=$SHELL
+        SHELL="$SHELL"
     )
     _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray
     if [ -n "$__structuredAttrs" ]; then
         flagsArray+=( "${installTargets[@]:-install}" )
     else
+        # shellcheck disable=SC2206
         flagsArray+=( ${installTargets:-install} )
     fi
 
@@ -1548,11 +1559,12 @@ installCheckPhase() {
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            SHELL=$SHELL
+            SHELL="$SHELL"
         )
 
         _accumFlagsArray makeFlags makeFlagsArray \
           installCheckFlags installCheckFlagsArray
+        # shellcheck disable=SC2206
         flagsArray+=( ${installCheckTarget:-installcheck} )
 
         echoCmd 'installcheck flags' "${flagsArray[@]}"
@@ -1569,6 +1581,7 @@ distPhase() {
 
     local flagsArray=()
     _accumFlagsArray distFlags distFlagsArray
+    # shellcheck disable=SC2206
     flagsArray+=( ${distTarget:-dist} )
 
     echo 'dist flags: %q' "${flagsArray[@]}"
@@ -1627,13 +1640,14 @@ runPhase() {
     showPhaseHeader "$curPhase"
     dumpVars
 
-    local startTime=$(date +"%s")
+    local startTime endTime
+    startTime=$(date +"%s")
 
     # Evaluate the variable named $curPhase if it exists, otherwise the
     # function named $curPhase.
     eval "${!curPhase:-$curPhase}"
 
-    local endTime=$(date +"%s")
+    endTime=$(date +"%s")
 
     showPhaseFooter "$curPhase" "$startTime" "$endTime"
 

From 5e4e8abae28b49a64cd97ddd8f7eb88a9e2eac77 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:21:58 -0400
Subject: [PATCH 268/319] maturin: 1.6.0 -> 1.7.0

Changelog: https://github.com/PyO3/maturin/releases/tag/v1.7.0
Diff: https://github.com/PyO3/maturin/compare/v1.6.0...v1.7.0
---
 pkgs/by-name/ma/maturin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 64f5639dc851..0a1087421c41 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-cKX5fDPQElNLAur2PF6J5050QnMNrazMTCVtGmjwmxQ=";
+    hash = "sha256-SjINeNtCbyMp3U+Op7ey+8lV7FYxLVpmO5g1a01ouBs=";
   };
 
-  cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0=";
+  cargoHash = "sha256-xJafCgpCeihyORj3gIVUus74vu9h3N1xuyKvkxSqYK4=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security

From f0e0fd63f2c68b0a32ebb15ffc40af8a8b576ccc Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 16 Jul 2024 01:55:09 +0800
Subject: [PATCH 269/319] emacs.pkgs.org: remove old patches

Org is newer than 9.7.5 in the staging branch, so this patch is not
needed any more.
---
 .../elisp-packages/elpa-devel-packages.nix    | 20 -------------------
 .../emacs/elisp-packages/elpa-packages.nix    | 20 -------------------
 2 files changed, 40 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
index f02b98e5f22d..d9373db18935 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
@@ -64,26 +64,6 @@ self: let
         '';
       });
 
-      org = super.org.overrideAttrs (old: {
-        dontUnpack = false;
-        patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
-          # security fix backported from 9.7.5
-          (pkgs.fetchpatch {
-            url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
-            hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
-            stripLen = 1;
-          })
-        ];
-        postPatch = old.postPatch or "" + "\n" + ''
-          pushd ..
-          local content_directory=${old.ename}-${old.version}
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
-          popd
-        '';
-        dontBuild = true;
-      });
-
       pq = super.pq.overrideAttrs (old: {
         buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
       });
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index 4f3bdc44eb61..22b71e5c03e4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -141,26 +141,6 @@ self: let
         };
       });
 
-      org = super.org.overrideAttrs (old: {
-        dontUnpack = false;
-        patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
-          # security fix backported from 9.7.5
-          (pkgs.fetchpatch {
-            url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
-            hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
-            stripLen = 1;
-          })
-        ];
-        postPatch = old.postPatch or "" + "\n" + ''
-          pushd ..
-          local content_directory=${old.ename}-${old.version}
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
-          popd
-        '';
-        dontBuild = true;
-      });
-
       plz = super.plz.overrideAttrs (
         old: {
           dontUnpack = false;

From 186e0e75ed098f94ac03661ea0c6456d0cf88c8e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 11 Jul 2024 17:50:17 -0400
Subject: [PATCH 270/319] qpdf: split outputs

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

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index d2d739cb7a7c..942285148ea6 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s=";
   };
 
+  outputs = [
+    "bin"
+    "doc"
+    "lib"
+    "man"
+    "out"
+  ];
+
   nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [ zlib libjpeg ];

From a2fc17f77befefc545386e2a44d5434956e5705a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 11 Jul 2024 17:52:39 -0400
Subject: [PATCH 271/319] qpdf: add pkg-config & version tests

---
 pkgs/development/libraries/qpdf/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 942285148ea6..d5a5ed0ccd23 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -11,16 +11,18 @@
 , pdfmixtool
 , pdfslicer
 , python3
+, testers
+, versionCheckHook
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qpdf";
   version = "11.9.1";
 
   src = fetchFromGitHub {
     owner = "qpdf";
     repo = "qpdf";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s=";
   };
 
@@ -36,6 +38,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib libjpeg ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   preConfigure = ''
     patchShebangs qtest/bin/qtest-driver
     patchShebangs run-qtest
@@ -46,6 +51,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru.tests = {
+    pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     inherit (python3.pkgs) pikepdf;
     inherit
       cups-filters
@@ -61,6 +67,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ abbradar ];
     mainProgram = "qpdf";
     platforms = platforms.all;
-    changelog = "https://github.com/qpdf/qpdf/blob/v${version}/ChangeLog";
+    changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog";
+    pkgConfigModules = [ "libqpdf" ];
   };
-}
+})

From f9330b606583879b5b4cda6b3f79d734718f7a57 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 11 Jul 2024 17:53:13 -0400
Subject: [PATCH 272/319] qpdf: don't overuse `with lib;`

https://github.com/NixOS/nixpkgs/issues/208242
---
 pkgs/development/libraries/qpdf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index d5a5ed0ccd23..4a9e520f2a97 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -60,13 +60,13 @@ stdenv.mkDerivation (finalAttrs: {
     ;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://qpdf.sourceforge.io/";
     description = "C++ library and set of programs that inspect and manipulate the structure of PDF files";
-    license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2
+    maintainers = with lib.maintainers; [ abbradar ];
     mainProgram = "qpdf";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog";
     pkgConfigModules = [ "libqpdf" ];
   };

From 5ce49c845ebf19407c52c114948b0669bd0f10b0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 15 Jul 2024 22:15:44 +0100
Subject: [PATCH 273/319] cracklib: 2.9.11 -> 2.10.0

Changes: https://github.com/cracklib/cracklib/releases/tag/v2.10.0
---
 pkgs/development/libraries/cracklib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 44c615b38abc..c45ca2b36eb3 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,8 +1,8 @@
-let version = "2.9.11"; in
+let version = "2.10.0"; in
 { stdenv, lib, buildPackages, fetchurl, zlib, gettext
 , lists ? [ (fetchurl {
   url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz";
-  hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo=";
+  hash = "sha256-JDLo/bSLIijC2DUl+8Q704i2zgw5cxL6t68wvuivPpY=";
 }) ]
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-yosEmjwtOyIloejRXWE3mOvHSOOVA4jtomlN5Qe6YCA=";
+    hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y=";
   };
 
   nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib;

From a01e0a2617246944f44ed55d527630c99f57846d Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@pacien.net>
Date: Tue, 16 Jul 2024 11:37:16 +0200
Subject: [PATCH 274/319] mercurial: skip some tests broken with python 3.12

---
 .../version-management/mercurial/default.nix      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 7cdacd4c6f4f..f60813a7eea6 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -163,6 +163,21 @@ let
     # Python 3.10-3.12 deprecation warning: asyncore
     # https://bz.mercurial-scm.org/show_bug.cgi?id=6727
     test-patchbomb-tls.t
+
+    # Python 3.12 _lsprof module change, breaking profile test
+    # https://bz.mercurial-scm.org/show_bug.cgi?id=6846
+    test-profile.t
+
+    # Python 3.12 deprecation warning: multi-threaded fork in worker.py
+    # https://bz.mercurial-scm.org/show_bug.cgi?id=6892
+    test-clone-stream.t
+    test-clonebundles.t
+    test-fix-topology.t
+    test-fix.t
+    test-persistent-nodemap.t
+    test-profile.t
+    test-simple-update.t
+
     EOF
 
     export HGTEST_REAL_HG="${mercurial}/bin/hg"

From e577b966bde8d34298829043220e44885a619d57 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Jul 2024 10:16:39 +0100
Subject: [PATCH 275/319] python3Packages.av: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Many of the tests depend on sample files fetched over HTTP and they
keep adding more. Since they support a caching mechanism, use it to
pre‐fetch all the used samples instead.

It might be nice to have a package for the full FATE suite, but it’s
over 1 GiB in size so I just did this for now.

Fixes: ca258d2d393eb240fd4eddf9a40093e422c33116
---
 .../development/python-modules/av/default.nix | 78 +++++--------------
 .../python-modules/av/test-samples.toml       | 17 ++++
 .../av/update-test-samples.bash               | 44 +++++++++++
 3 files changed, 81 insertions(+), 58 deletions(-)
 create mode 100644 pkgs/development/python-modules/av/test-samples.toml
 create mode 100755 pkgs/development/python-modules/av/update-test-samples.bash

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index bc5989284ce4..8471970980fe 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -4,6 +4,8 @@
   buildPythonPackage,
   cython,
   fetchFromGitHub,
+  fetchurl,
+  linkFarm,
   ffmpeg_6-headless,
   numpy,
   pillow,
@@ -35,10 +37,18 @@ buildPythonPackage rec {
 
   buildInputs = [ ffmpeg_6-headless ];
 
-  preCheck = ''
-    # ensure we import the built version
-    rm -r av
-  '';
+  preCheck =
+    let
+      # Update with `./update-test-samples.bash` if necessary.
+      testSamples = linkFarm "pyav-test-samples" (
+        lib.mapAttrs (_: fetchurl) (lib.importTOML ./test-samples.toml)
+      );
+    in
+    ''
+      # ensure we import the built version
+      rm -r av
+      ln -s ${testSamples} tests/assets
+    '';
 
   nativeCheckInputs = [
     numpy
@@ -46,61 +56,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # urlopen fails during DNS resolution
-      "test_writing_to_custom_io"
-      "test_decode_close_then_use"
-      # Tests that want to download FATE data, https://github.com/PyAV-Org/PyAV/issues/955
-      "test_vobsub"
-      "test_transcode"
-      "test_stream_tuples"
-      "test_stream_seek"
-      "test_stream_probing"
-      "test_seek_start"
-      "test_seek_middle"
-      "test_seek_int64"
-      "test_seek_float"
-      "test_seek_end"
-      "test_roundtrip"
-      "test_reading_from_write_readonl"
-      "test_reading_from_pipe_readonly"
-      "test_reading_from_file"
-      "test_reading_from_buffer"
-      "test_reading_from_buffer_no_see"
-      "test_parse"
-      "test_movtext"
-      "test_encoding_xvid"
-      "test_encoding_tiff"
-      "test_encoding_png"
-      "test_encoding_pcm_s24le"
-      "test_encoding_mpeg4"
-      "test_encoding_mpeg1video"
-      "test_encoding_mp2"
-      "test_encoding_mjpeg"
-      "test_encoding_h264"
-      "test_encoding_dvvideo"
-      "test_encoding_dnxhd"
-      "test_encoding_aac"
-      "test_decoded_video_frame_count"
-      "test_decoded_time_base"
-      "test_decoded_motion_vectors"
-      "test_decode_half"
-      "test_decode_audio_sample_count"
-      "test_data"
-      "test_container_probing"
-      "test_codec_tag"
-      "test_selection"
-    ]
-    ++ lib.optionals (stdenv.isDarwin) [
-      # Segmentation Faults
-      "test_encoding_with_pts"
-      "test_bayer_write"
-    ];
+  disabledTests = [
+    # av.error.InvalidDataError: [Errno 1094995529] Invalid data found when processing input: 'custom_io_output.mpd'
+    "test_writing_to_custom_io_dash"
+  ];
 
-  disabledTestPaths = [
-    # urlopen fails during DNS resolution
-    "tests/test_doctests.py"
+  # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why.
+  disabledTestPaths = lib.optionals stdenv.isDarwin [
     "tests/test_timeout.py"
   ];
 
diff --git a/pkgs/development/python-modules/av/test-samples.toml b/pkgs/development/python-modules/av/test-samples.toml
new file mode 100644
index 000000000000..cdc1d93362f1
--- /dev/null
+++ b/pkgs/development/python-modules/av/test-samples.toml
@@ -0,0 +1,17 @@
+"fate-suite/aac/latm_stereo_to_51.ts" = { url = "http://fate.ffmpeg.org/fate-suite/aac/latm_stereo_to_51.ts", hash = "sha256-lVz0iby2IEUVdwKYamv4HVm8EUGHJS/cWY+QFBMaCBY=" }
+"fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv" = { url = "http://fate.ffmpeg.org/fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv", hash = "sha256-O9YMj0+0bM4YyZNGgkZJL8E2aG+Y3lq8/c+DVht0McI=" }
+"fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav" = { url = "http://fate.ffmpeg.org/fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav", hash = "sha256-KodB5hQkBFtfkI+L7hnkSonPM+IuOCNrTV3Vsy1bvhs=" }
+"fate-suite/h264/interlaced_crop.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/h264/interlaced_crop.mp4", hash = "sha256-SVWWaOcfOp718dvgkpgOWCYoV9Ylomv8MBYzbRqvbBE=" }
+"fate-suite/hap/HAPQA_NoSnappy_127x1.mov" = { url = "http://fate.ffmpeg.org/fate-suite/hap/HAPQA_NoSnappy_127x1.mov", hash = "sha256-WMUqg9o84ki2AIIsGhY8P10KBc3qgCsmljqJXXRHbs8=" }
+"fate-suite/mkv/codec_delay_opus.mkv" = { url = "http://fate.ffmpeg.org/fate-suite/mkv/codec_delay_opus.mkv", hash = "sha256-GanpfRyGKN36NLAa7pZehcM1F2VDCW3g6hhO26vFg1I=" }
+"fate-suite/mov/displaymatrix.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/displaymatrix.mov", hash = "sha256-Aq0/zcKKHI2dgThIKfYMXCjNI6WoVwy7VtD5Bke6krQ=" }
+"fate-suite/mov/mov-1elist-ends-last-bframe.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/mov-1elist-ends-last-bframe.mov", hash = "sha256-1g488WPvvzzeHXoQg7xZnrVCoGCz7sOUSpzZj6qWnhI=" }
+"fate-suite/mov/white_zombie_scrunch-part.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/white_zombie_scrunch-part.mov", hash = "sha256-apoPuBxsjqkjCaSdtgTJhpYFXMp5LbtZQz+lo3o9jx8=" }
+"fate-suite/mpeg2/mpeg2_field_encoding.ts" = { url = "http://fate.ffmpeg.org/fate-suite/mpeg2/mpeg2_field_encoding.ts", hash = "sha256-logzOhRbniwhObnKts1JZqzRl4j9YgtLMdtcKJFUfLg=" }
+"fate-suite/mxf/track_01_v02.mxf" = { url = "http://fate.ffmpeg.org/fate-suite/mxf/track_01_v02.mxf", hash = "sha256-AQ+UxFVfBgQwbEtoMautd02BL5kC6pAbsXD3SVRd9xE=" }
+"fate-suite/png1/55c99e750a5fd6_50314226.png" = { url = "http://fate.ffmpeg.org/fate-suite/png1/55c99e750a5fd6_50314226.png", hash = "sha256-yADmkBgeMB5wv140gwnaDMjvErRTXZhXdBz02HZSMBc=" }
+"fate-suite/qtrle/aletrek-rle.mov" = { url = "http://fate.ffmpeg.org/fate-suite/qtrle/aletrek-rle.mov", hash = "sha256-uXUvVkwuPbfs/rzT896ty3RZfvGoSPj3su+sjLPU09g=" }
+"fate-suite/sub/MovText_capability_tester.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/sub/MovText_capability_tester.mp4", hash = "sha256-Y2uhvfGrZaPebD6ZsJemzpOk+XHX6ukBceVauEit9h8=" }
+"fate-suite/sub/vobsub.sub" = { url = "http://fate.ffmpeg.org/fate-suite/sub/vobsub.sub", hash = "sha256-X2rEMyTlo1xuUlqgx2uvqd2WWhfOCID9fraeGbaFPIs=" }
+"pyav-curated/pexels/time-lapse-video-of-night-sky-857195.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-night-sky-857195.mp4", hash = "sha256-6307VwepfoVNKeGm8WEMZtfowJZ27Hv2fwgp6J/Q0oE=" }
+"pyav-curated/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4", hash = "sha256-2RWphhz5KWPSnJh8ARrC7aPjBa77DJO1Fv0/I4kWxYg=" }
diff --git a/pkgs/development/python-modules/av/update-test-samples.bash b/pkgs/development/python-modules/av/update-test-samples.bash
new file mode 100755
index 000000000000..5b0b1966d43b
--- /dev/null
+++ b/pkgs/development/python-modules/av/update-test-samples.bash
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+
+if test "$#" != 1; then
+  printf >&2 'usage: update-test-samples.bash /path/to/PyAV/source\n'
+  exit 2
+fi
+
+pyav_source=$1
+
+exec > "$(dirname "$(readlink -f "$0")")/test-samples.toml"
+
+fetch() {
+  path=$1
+  url=$2
+  prefetch_json=$(nix store prefetch-file --json "${url}")
+  sri_hash=$(jq -r .hash <<< "${prefetch_json}")
+  printf '"%s" = { url = "%s", hash = "%s" }\n' "${path}" "${url}" "${sri_hash}"
+}
+
+fetch_all() {
+  function=$1
+  base_path=$2
+  base_url=$3
+
+  samples=$(
+    rg \
+      --only-matching \
+      --no-filename \
+      "\\b${function}\\([\"']([^\"']+)[\"']\\)" \
+      --replace '$1' \
+      "${pyav_source}"
+  )
+  unique_samples=$(sort -u <<< "${samples}")
+
+  while IFS= read -r sample; do
+    fetch "${base_path}/${sample}" "${base_url}/${sample}"
+  done <<< "${unique_samples}"
+}
+
+fetch_all fate_suite fate-suite "http://fate.ffmpeg.org/fate-suite"
+fetch_all curated pyav-curated "https://pyav.org/datasets"

From c2d8eb6b4b36bec5cf5da7760f303c7e3f2d54fd Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 26 Jun 2024 21:50:20 -0400
Subject: [PATCH 276/319] python3Packages.debugpy: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 92f42bd90d64..1226d85f1769 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.8.1";
+  version = "1.8.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2TkieSQYxnlUroSD9wNKNaHUTLRksFWL/6XmSNGTCA4=";
+    hash = "sha256-J63izrJX7/el36kMHv+IyqDQ1C13CKb40HLOVgOzHEw=";
   };
 
   patches =

From afe278a98d4d72ce6cd2a658701e520165f881d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 02:24:27 +0000
Subject: [PATCH 277/319] libheif: 1.17.6 -> 1.18.0

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

diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index cdff03fc09ae..1b40510ff1ff 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libheif";
-  version = "1.17.6";
+  version = "1.18.0";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "strukturag";
     repo = "libheif";
     rev = "v${version}";
-    sha256 = "sha256-pp+PjV/pfExLqzFE61mxliOtVAYOePh1+i1pwZxDLAM=";
+    sha256 = "sha256-3au6xCJd1kP6qJI6TBeWJ2ittCqE0QvmSYxWYcgPOcw=";
   };
 
   nativeBuildInputs = [

From 17f76e2661b87a718dc9b23265fcf64aa19af8b5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Jul 2024 20:20:21 +0100
Subject: [PATCH 278/319] home-assistant: use PyAV directly

---
 pkgs/servers/home-assistant/component-packages.nix       | 6 +++---
 pkgs/servers/home-assistant/update-component-packages.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 0b0ab903e34e..3c3974547665 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -768,6 +768,7 @@
       aiodhcpwatcher
       aiodiscover
       async-upnp-client
+      av
       bleak
       bleak-retry-connector
       bluetooth-adapters
@@ -776,7 +777,6 @@
       cached-ipaddress
       dbus-fast
       fnv-hash-fast
-      ha-av
       ha-ffmpeg
       habluetooth
       hass-nabucasa
@@ -1481,7 +1481,7 @@
       aio-georss-gdacs
     ];
     "generic" = ps: with ps; [
-      ha-av
+      av
       pillow
     ];
     "generic_hygrostat" = ps: with ps; [
@@ -4295,7 +4295,7 @@
     "stookwijzer" = ps: with ps; [
     ]; # missing inputs: stookwijzer
     "stream" = ps: with ps; [
-      ha-av
+      av
       numpy_1
       pyturbojpeg
     ];
diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py
index e46f29717431..1889aff36148 100755
--- a/pkgs/servers/home-assistant/update-component-packages.py
+++ b/pkgs/servers/home-assistant/update-component-packages.py
@@ -41,6 +41,7 @@ PKG_SET = "home-assistant.python.pkgs"
 PKG_PREFERENCES = {
     "fiblary3": "fiblary3-fork",  # https://github.com/home-assistant/core/issues/66466
     "HAP-python": "hap-python",
+    "ha-av": "av",
     "numpy": "numpy_1",
     "ollama-hass": "ollama",
     "paho-mqtt": "paho-mqtt_1",

From d7f917fc14c1f863990e43e3ec20f726e45ac1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 16 Jul 2024 14:02:32 -0700
Subject: [PATCH 279/319] python312Packages.pytest-asyncio: 0.23.6 -> 0.23.7

Diff: https://github.com/pytest-dev/pytest-asyncio/compare/refs/tags/v0.23.6...v0.23.7

Changelog: https://github.com/pytest-dev/pytest-asyncio/blob/v0.23.7/docs/source/reference/changelog.rst
---
 pkgs/development/python-modules/pytest-asyncio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index ef428705d758..d54b8ce66343 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.23.6"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  version = "0.23.7"; # N.B.: when updating, tests bleak and aioesphomeapi tests
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+kyKcVzW05kqtLeC81rk3fJpOtyW3xSYshgl5gqIddE=";
+    hash = "sha256-WmkZi3bBr3ExBWgA2aDvR+epGyWx63nWfhmI9APrjP0=";
   };
 
   outputs = [
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     "testout"
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
 

From 1b501500259e6bb60f80842dbd618459a92baa86 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 16 Jul 2024 22:29:55 +0100
Subject: [PATCH 280/319] libnftnl: 1.2.6 -> 1.2.7

While at it added a trivial updater and enabled parallel builds.
---
 pkgs/development/libraries/libnftnl/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index 3fb02abfb533..1da5bf5a6de5 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.6";
+  version = "1.2.7";
   pname = "libnftnl";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
-    hash = "sha256-zurqLNkhR9oZ8To1p/GkvCdn/4l+g45LR5z1S1nHd/Q=";
+    hash = "sha256-kSJ3T5aAk9XAus3dZ95IDzH6QHNAWn/AWKNLDzh67LM=";
   };
 
   configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version";
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
+  enableParallelBuilding = true;
+
+  passthru.updateScript = gitUpdater {
+    url = "https://git.netfilter.org/libnftnl";
+    rev-prefix = "libnftnl-";
+  };
+
   meta = with lib; {
     description = "Userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
     homepage = "https://netfilter.org/projects/libnftnl/";

From c97d0ff9cb1f730e0dafe694de421b9ea7e3ee29 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 17 Jul 2024 07:49:14 +0100
Subject: [PATCH 281/319] home-assistant: drop ha-av override

---
 pkgs/servers/home-assistant/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1f3cba59882b..4c4a9fc1f60d 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -150,16 +150,6 @@ let
         ];
       });
 
-      ha-av = super.av.overridePythonAttrs (oldAttrs: rec {
-        pname = "ha-av";
-        version = "10.1.1";
-
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-QaMFVvglipN0kG1+ZQNKk7WTydSyIPn2qa32UtvLidw=";
-        };
-      });
-
       intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec {
         version = "2.2.2";
         src = fetchFromGitHub {

From aba1b58d1fd2c32c1febc635031062823cd6f74c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 17 Jul 2024 12:33:29 +0200
Subject: [PATCH 282/319] python312: make portability backport unconditional

This avoids the maintenance headache associated with conditionally
applied patches, and fixes building for s390.
---
 pkgs/development/interpreters/python/cpython/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 5a1172786147..ac5d197ab3dd 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -367,10 +367,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     };
   in [
     "${mingw-patch}/*.patch"
-  ]) ++ optionals (pythonAtLeast "3.12" && (stdenv.hostPlatform != stdenv.buildPlatform) && (
-    stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV
-  )) [
-    # backport fix for various platforms; armv7l, riscv64
+  ]) ++ optionals (pythonAtLeast "3.12") [
+    # backport fix for various platforms; armv7l, riscv64, s390
     # https://github.com/python/cpython/pull/121178
     (
       if (pythonAtLeast "3.13") then

From 1017cdf9bcf44d6a49663d6f63107b1a4d5f61ac Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Mon, 15 Jul 2024 20:37:05 +0200
Subject: [PATCH 283/319] systemd: 255.6 -> 255.9

(cherry picked from commit 4a48f4cdf366720fe2ca837c0e29704d4b731d13)
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 11691f1563eb..c675392153d0 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -179,7 +179,7 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
   wantGcrypt = withResolved || withImportd;
-  version = "255.6";
+  version = "255.9";
 
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
@@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "systemd";
     repo = "systemd-stable";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ah0678iNfy0c5NhHhjn0roY6RoM8OE0hWyEt+qEGKRQ=";
+    hash = "sha256-fnMvBYyMRQrP2x//8ntGTSwoHOtFk2TQ4S5fwcsSLDU=";
   };
 
   # On major changes, or when otherwise required, you *must* :

From 07768c8c73b1fe0ca4cb1b30506165aa4b011941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 17 Jul 2024 08:47:13 -0700
Subject: [PATCH 284/319] asciidoc: 10.2.0 -> 10.2.1

Diff: https://github.com/asciidoc-py/asciidoc-py/compare/10.2.0...10.2.1

Changelog: https://github.com/asciidoc-py/asciidoc-py/blob/10.2.1/CHANGELOG.adoc
---
 pkgs/tools/typesetting/asciidoc/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 69b0ccff68bd..1a7fde588c75 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -121,13 +121,14 @@ in python3.pkgs.buildPythonApplication rec {
   pname = "asciidoc"
     + lib.optionalString enableStandardFeatures "-full"
     + lib.optionalString enableExtraPlugins "-with-plugins";
-  version = "10.2.0";
+  version = "10.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "asciidoc-py";
     repo = "asciidoc-py";
     rev = version;
-    hash = "sha256-TqC0x9xB6e2d6Wc9bgnlqgZVOmYHmUUKfE/CKAiEtag=";
+    hash = "sha256-td3C7xTWfSzdo9Bbz0dHW2oPaCQYmUE9H2sUFfg5HH0=";
   };
 
   nativeBuildInputs = [
@@ -250,6 +251,8 @@ in python3.pkgs.buildPythonApplication rec {
       --replace "python3 -m asciidoc.a2x" "${buildPackages.asciidoc}/bin/a2x"
   '';
 
+  build-system = with python3.pythonOnBuildForHost.pkgs; [ setuptools ];
+
   postBuild = ''
     make manpages
   '';

From 9dac499aecd438f51cef1162591f100fda0e38fc Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Wed, 17 Jul 2024 21:33:06 +0200
Subject: [PATCH 285/319] libgcrypt: add bin and lib outputs

In https://discourse.nixos.org/t/how-to-install-hmac256/49147 it was reported
that adding the libgcrypt package to your environment did not add the `hmac256`
binary to your $PATH.

This was due to the package's binaries being put into the $dev output which
isn't considered for linking envs.

This commit puts binaries in $bin/bin/ instead and, while we're at it, also puts
shared objects into $lib/lib/. All binaries except for the `libgcrypt-config`
script which would cause a reference cycle between the outputs and really is a
dev-specific thing (and you probably don't need it with Nix anyhow).
---
 pkgs/development/libraries/libgcrypt/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index ac8323ceb21e..988f706f09c8 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo=";
   };
 
-  outputs = [ "out" "dev" "info" ];
-  outputBin = "dev";
+  outputs = [ "bin" "lib" "dev" "info" "out" ];
 
   # The CPU Jitter random number generator must not be compiled with
   # optimizations and the optimize -O0 pragma only works for gcc.
@@ -58,15 +57,22 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postFixup = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
+  ''
+  # The `libgcrypt-config` script references $dev and in the $dev output, the
+  # stdenv automagically puts the $bin output into propagatedBuildInputs. This
+  # would cause a cycle. This is a weird tool anyways, so let's stuff it in $dev
+  # instead.
+  + ''
+    moveToOutput bin/libgcrypt-config $dev
   '' + lib.optionalString enableCapabilities ''
-    sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
+    sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $lib/lib/libgcrypt.la
   '';
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
   # random instead of every test
   preCheck = lib.optionalString stdenv.isDarwin ''
-    mkdir -p $out/lib
-    cp src/.libs/libgcrypt.20.dylib $out/lib
+    mkdir -p $lib/lib
+    cp src/.libs/libgcrypt.20.dylib $lib/lib
   '';
 
   doCheck = true;

From cca146900a886abf4245cbc6e474d91e02c1d387 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Jul 2024 22:45:26 +0300
Subject: [PATCH 286/319] mesa: 24.1.3 -> 24.1.4

Also move comment closer to where people will look
---
 pkgs/development/libraries/mesa/common.nix  | 8 ++++++--
 pkgs/development/libraries/mesa/default.nix | 3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 5f56aac26700..1a60c136be56 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -1,14 +1,18 @@
 { lib, fetchurl }:
+# When updating this package, please verify at least these build (assuming x86_64-linux):
+# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
+# Ideally also verify:
+# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "24.1.3";
+  version = "24.1.4";
 
   src = fetchurl {
     urls = [
       "https://archive.mesa3d.org/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    hash = "sha256-YyNkJrJadFumqi1tr4zXadXqAYh7B0WrcSTS7zOpAg0=";
+    hash = "sha256-fPfG9mUmOtASKInB1LB2ZUwe7ep6LzjGnIxRV5k3reE=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 43aa88034168..1c4e8f7ebb02 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -93,9 +93,6 @@
 , makeSetupHook
 }:
 
-# When updating this package, please verify at least these build (assuming x86_64-linux):
-# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
-
 let
   rustDeps = [
     {

From 68f49a06619380d9dc6b0271f3323da28517218c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 17 Jul 2024 21:53:07 +0100
Subject: [PATCH 287/319] iproute2: 6.9.0 -> 6.10.0

Changes: https://github.com/iproute2/iproute2/compare/v6.9.0...v6.10.0
---
 pkgs/os-specific/linux/iproute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 15b8987b8cc0..ab34f0f13a25 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.9.0";
+  version = "6.10.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-L2Q9CeoRpKKgQ8kuK0abX3MijL8kGugGdgKW7Q7EE9A=";
+    hash = "sha256-kaYvgnN7RJBaAPqAM2nER9VJ6RTpoqQBj911sdVOjc4=";
   };
 
   postPatch = ''

From 5ab032428a0306e7ac6b8972c42f5638d46672e5 Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Wed, 17 Jul 2024 15:09:28 -0700
Subject: [PATCH 288/319] python312Packages.cryptography: 42.0.5 -> 42.0.8

---
 pkgs/development/python-modules/cryptography/default.nix | 6 +++---
 pkgs/development/python-modules/cryptography/vectors.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 0d7cdb92a683..a440e7e480da 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -26,21 +26,21 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "42.0.5"; # Also update the hash in vectors.nix
+  version = "42.0.8"; # Also update the hash in vectors.nix
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b+B+7JXf1HfrlTCu9b6tNP7IGbOq9sW9bSBWXaYHv+E=";
+    hash = "sha256-jQnQVDnOe6qOnpWwfsW2yIb1SN634Pae8l9ks7zoQvI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-Pw3ftpcDMfZr/w6US5fnnyPVsFSB9+BuIKazDocYjTU=";
+    hash = "sha256-PgxPcFocEhnQyrsNtCN8YHiMptBmk1PUhEDQFdUR1nU=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 85476ca49281..8d1bb48d623a 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-UFzV47DLMtoVJvBwQrf8OKS2w1ZxDLc9K192sDejjtE=";
+    hash = "sha256-31ZXNnvAqQw3QwnLJhAJosU8rpGkWHgTOaD3JPgZpGo=";
   };
 
   nativeBuildInputs = [ flit-core ];

From f9b7f4ec09775333b0c28d2cca05dd96509442ab Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Wed, 17 Jul 2024 22:16:28 -0400
Subject: [PATCH 289/319] tree-wide: use top-level cctools

---
 .../blockchains/clightning/default.nix        |  5 +-
 .../networking/irc/thelounge/default.nix      |  4 +-
 .../node/build-npm-package/default.nix        |  4 +-
 pkgs/by-name/bi/bitwarden-cli/package.nix     |  4 +-
 pkgs/by-name/fr/frankenphp/package.nix        |  3 +-
 pkgs/by-name/li/live555/package.nix           |  4 +-
 pkgs/by-name/my/mysql84/package.nix           |  4 +-
 pkgs/by-name/pe/petsc/package.nix             |  4 +-
 pkgs/by-name/pr/protoc-gen-js/package.nix     |  4 +-
 pkgs/by-name/ri/ride/package.nix              |  4 +-
 pkgs/data/fonts/iosevka/default.nix           |  4 +-
 .../compilers/chez-racket/shared.nix          |  4 +-
 pkgs/development/compilers/dart/default.nix   |  3 +-
 pkgs/development/compilers/dotnet/sigtool.nix |  7 +--
 .../elm/packages/node/node-composition.nix    |  2 +-
 pkgs/development/compilers/gcc/default.nix    |  3 +-
 .../compilers/gcc/patches/default.nix         |  4 +-
 pkgs/development/compilers/ponyc/default.nix  |  3 +-
 pkgs/development/compilers/swift/default.nix  |  4 +-
 .../interpreters/cyclone/default.nix          |  6 +-
 .../libraries/catboost/default.nix            |  4 +-
 .../libraries/freeimage/default.nix           |  4 +-
 .../libraries/libmcrypt/default.nix           |  4 +-
 pkgs/development/libraries/nss/generic.nix    |  4 +-
 .../libraries/qt-5/5.15/default.nix           |  2 +-
 pkgs/development/libraries/qt-6/default.nix   |  2 +-
 .../libraries/science/math/mkl/default.nix    |  4 +-
 .../development/node-packages/composition.nix |  2 +-
 pkgs/development/r-modules/default.nix        |  2 +-
 .../build-managers/bazel/bazel_7/cpp-test.nix |  5 +-
 .../bazel/bazel_7/java-test.nix               |  6 +-
 .../bazel/bazel_7/protobuf-test.nix           |  5 +-
 .../tools/build-managers/bazel/cpp-test.nix   |  5 +-
 .../tools/build-managers/bazel/java-test.nix  |  6 +-
 .../build-managers/bazel/protobuf-test.nix    |  6 +-
 .../bazel/python-bin-path-test.nix            |  6 +-
 .../tools/build-managers/gn/generic.nix       |  2 +-
 pkgs/development/tools/nodehun/default.nix    |  3 +-
 pkgs/development/tools/xcbuild/toolchains.nix |  2 +-
 .../web/netlify-cli/composition.nix           |  2 +-
 .../web/playwright-test/default.nix           |  2 +-
 pkgs/misc/base16-builder/node-packages.nix    |  2 +-
 pkgs/os-specific/bsd/netbsd/default.nix       |  1 -
 .../bsd/netbsd/pkgs/compat/package.nix        |  4 +-
 .../Libsystem/default.nix                     |  2 +-
 .../mx-puppet-discord/node-composition.nix    |  2 +-
 pkgs/servers/sql/mariadb/default.nix          |  4 --
 pkgs/servers/sql/percona-server/default.nix   |  4 +-
 .../web-apps/ethercalc/node-packages.nix      |  2 +-
 pkgs/tools/admin/balena-cli/default.nix       |  3 +-
 pkgs/tools/audio/dl-librescore/default.nix    |  4 +-
 pkgs/tools/misc/hsd/default.nix               |  4 +-
 pkgs/tools/misc/moreutils/default.nix         |  4 +-
 .../networking/curl-impersonate/default.nix   |  4 +-
 pkgs/tools/security/onlykey/onlykey.nix       |  2 +-
 pkgs/top-level/all-packages.nix               | 55 +++++++------------
 pkgs/top-level/python-packages.nix            | 10 +---
 57 files changed, 123 insertions(+), 142 deletions(-)

diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix
index 2d1efc3e882e..ac9595ce4123 100644
--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, cctools
 , darwin
 , fetchurl
 , autoconf
@@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";
   };
 
-  # when building on darwin we need dawin.cctools to provide the correct libtool
+  # when building on darwin we need cctools to provide the correct libtool
   # as libwally-core detects the host as darwin and tries to add the -static
   # option to libtool, also we have to add the modified gsed package.
   nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ];
+    ++ lib.optionals stdenv.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ];
 
   buildInputs = [ gmp libsodium sqlite zlib jq ];
 
diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix
index 1078f515c69a..729afb831d57 100644
--- a/pkgs/applications/networking/irc/thelounge/default.nix
+++ b/pkgs/applications/networking/irc/thelounge/default.nix
@@ -7,7 +7,7 @@
 , fixup-yarn-lock
 , python3
 , npmHooks
-, darwin
+, cctools
 , sqlite
 , srcOnly
 , buildPackages
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0=";
   };
 
-  nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
+  nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools;
   buildInputs = [ sqlite ];
 
   configurePhase = ''
diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index 1c7bf63e8cd6..4bcbf3f14f2f 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -3,7 +3,7 @@
 , fetchNpmDeps
 , buildPackages
 , nodejs
-, darwin
+, cctools
 } @ topLevelArgs:
 
 { name ? "${args.pname}-${args.version}"
@@ -76,7 +76,7 @@ stdenv.mkDerivation (args // {
       (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook)
       nodejs.python
     ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
   buildInputs = buildInputs ++ [ nodejs ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 6e43db4962fe..39b41ec1d0f9 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -4,7 +4,7 @@
 , nodejs_20
 , fetchFromGitHub
 , python311
-, darwin
+, cctools
 , nixosTests
 , xcbuild
 }:
@@ -27,7 +27,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     python311
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
     xcbuild.xcrun
   ];
 
diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix
index da611ee21917..e96cbeb8aca3 100644
--- a/pkgs/by-name/fr/frankenphp/package.nix
+++ b/pkgs/by-name/fr/frankenphp/package.nix
@@ -6,6 +6,7 @@
 , brotli
 , testers
 , frankenphp
+, cctools
 , darwin
 , libiconv
 , pkg-config
@@ -44,7 +45,7 @@ in buildGoModule rec {
   vendorHash = "sha256-Ir1lwTu3JqIFp9jhJyhTAFm/+XlStkPuCoNAZneeKGc=";
 
   buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs;
-  nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ];
+  nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ];
 
   subPackages = [ "frankenphp" ];
 
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index 232780a52498..8e9574376b24 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  darwin,
+  cctools,
   fetchpatch,
   fetchurl,
   openssl,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index 908b3e00ae8c..550b434b317c 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, bison, cmake, pkg-config
 , icu, libedit, libevent, lz4, ncurses, openssl, protobuf_21, re2, readline, zlib, zstd, libfido2
-, darwin, numactl, libtirpc, rpcsvc-proto, curl
+, cctools, darwin, numactl, libtirpc, rpcsvc-proto, curl
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals stdenv.isLinux [
     numactl libtirpc
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools
+    cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools
   ];
 
   outputs = [ "out" "static" ];
diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 421ed4d5b8f1..a9cc4ace97a3 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  darwin,
+  cctools,
   gfortran,
   python3,
   blas,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace config/install.py \
-      --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
+      --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool
   '';
 
   # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):
diff --git a/pkgs/by-name/pr/protoc-gen-js/package.nix b/pkgs/by-name/pr/protoc-gen-js/package.nix
index 08fb3345fedc..78d03e9b2b7b 100644
--- a/pkgs/by-name/pr/protoc-gen-js/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-js/package.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildBazelPackage, bazel_6, fetchFromGitHub, darwin }:
+{ stdenv, lib, buildBazelPackage, bazel_6, fetchFromGitHub, cctools }:
 
 buildBazelPackage rec {
   pname = "protoc-gen-js";
@@ -17,7 +17,7 @@ buildBazelPackage rec {
   removeRulesCC = false;
   removeLocalConfigCC = false;
 
-  LIBTOOL = lib.optionalString stdenv.isDarwin "${darwin.cctools}/bin/libtool";
+  LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
 
   fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";
 
diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix
index 25d18248d5bb..0cce0041710a 100644
--- a/pkgs/by-name/ri/ride/package.nix
+++ b/pkgs/by-name/ri/ride/package.nix
@@ -12,7 +12,7 @@
   copyDesktopItems,
   makeDesktopItem,
   electron,
-  darwin,
+  cctools,
 }:
 
 let
@@ -92,7 +92,7 @@ buildNpmPackage rec {
       makeWrapper
     ]
     ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index b684843c34a2..47111faed2fb 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -2,7 +2,7 @@
 , lib
 , buildNpmPackage
 , fetchFromGitHub
-, darwin
+, cctools
 , remarshal
 , ttfautohint-nox
   # Custom font set options.
@@ -71,7 +71,7 @@ buildNpmPackage rec {
     ttfautohint-nox
   ] ++ lib.optionals stdenv.isDarwin [
     # libtool
-    darwin.cctools
+    cctools
   ];
 
   buildPlan =
diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/development/compilers/chez-racket/shared.nix
index 46f53204309b..b9368dd4ebea 100644
--- a/pkgs/development/compilers/chez-racket/shared.nix
+++ b/pkgs/development/compilers/chez-racket/shared.nix
@@ -1,5 +1,5 @@
 args:
-{ stdenv, lib, fetchFromGitHub, coreutils, darwin
+{ stdenv, lib, fetchFromGitHub, coreutils, cctools, darwin
 , ncurses, libiconv, libX11, zlib, lz4
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (args // {
     export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)"
   '';
 
-  nativeBuildInputs = lib.optionals stdenv.isDarwin (with darwin; [ cctools autoSignDarwinBinariesHook ]);
+  nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]);
   buildInputs = [ libiconv libX11 lz4 ncurses zlib ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix
index ee10acbdeb7c..0b21122b035e 100644
--- a/pkgs/development/compilers/dart/default.nix
+++ b/pkgs/development/compilers/dart/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , unzip
 , runCommand
+, cctools
 , darwin
 , sources ? import ./sources.nix {inherit fetchurl;}
 , version ? sources.versionUsed
@@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       testCompile = runCommand "dart-test-compile" {
         nativeBuildInputs = [ finalAttrs.finalPackage ]
-          ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.sigtool ];
+          ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ];
       } ''
         HELLO_MESSAGE="Hello, world!"
         echo "void main() => print('$HELLO_MESSAGE');" > hello.dart
diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix
index 658ee578ae98..fe5d1ebc6879 100644
--- a/pkgs/development/compilers/dotnet/sigtool.nix
+++ b/pkgs/development/compilers/dotnet/sigtool.nix
@@ -1,11 +1,10 @@
-{ darwin
+{ cctools
+, darwin
 , fetchFromGitHub
 , makeWrapper
 }:
-let
-  cctools = darwin.cctools;
 
-in darwin.sigtool.overrideAttrs (old: {
+darwin.sigtool.overrideAttrs (old: {
   # this is a fork of sigtool that supports -v and --remove-signature, which are
   # used by the dotnet sdk
   src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix
index 1f86de75e357..1580d1f43fdd 100644
--- a/pkgs/development/compilers/elm/packages/node/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../../node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 5eb92fd701da..2105fe752dd5 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -33,6 +33,7 @@
 , nukeReferences
 , callPackage
 , majorMinorVersion
+, cctools
 , darwin
 
 # only for gcc<=6.x
@@ -457,7 +458,7 @@ pipe ((callFile ./common/builder.nix {}) ({
 } // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) {
   # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools.
   preBuild = ''
-    makeFlagsArray+=('STRIP=${getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip')
+    makeFlagsArray+=('STRIP=${getBin cctools}/bin/${stdenv.cc.targetPrefix}strip')
   '';
 } // optionalAttrs (!atLeast8) {
   doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index b7da7eb925ee..c64e16753fc6 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -273,9 +273,9 @@ in
   ./6/gnat-glibc234.patch
 ]
 
-# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input.
+# The clang-based assembler used in darwin.binutils (LLVM >11) does not support piping input.
 # Fortunately, it does not exhibit the problem GCC has with the cctools assembler.
-# This patch can be dropped should darwin.cctools-llvm ever implement support.
+# This patch can be dropped should darwin.binutils ever implement support.
 ++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch
 
 # Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index c7008ec22a8a..740ff702acd3 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -13,6 +13,7 @@
 , substituteAll
 , which
 , z3
+, cctools
 , darwin
 }:
 
@@ -36,7 +37,7 @@ stdenv.mkDerivation (rec {
   };
 
   nativeBuildInputs = [ cmake makeWrapper which python3 ]
-    ++ lib.optionals (stdenv.isDarwin) [ darwin.cctools ];
+    ++ lib.optionals (stdenv.isDarwin) [ cctools ];
   buildInputs = [ libxml2 z3 ];
 
   # Sandbox disallows network access, so disabling problematic networking tests
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 2a56a03766b9..9de3a01c34e0 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -58,7 +58,7 @@ let
     xcbuild = xcodebuild;
 
     swift-unwrapped = callPackage ./compiler {
-      inherit (darwin) DarwinTools cctools sigtool;
+      inherit (darwin) DarwinTools sigtool;
       inherit (apple_sdk) MacOSX-SDK CLTools_Executables;
       inherit (apple_sdk.frameworks) CoreServices Foundation Combine;
     };
@@ -85,7 +85,7 @@ let
     };
 
     swiftpm = callPackage ./swiftpm {
-      inherit (darwin) DarwinTools cctools;
+      inherit (darwin) DarwinTools;
       inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication;
       swift = swiftNoSwiftDriver;
     };
diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix
index d5a31c7aeb76..643ee3a63216 100644
--- a/pkgs/development/interpreters/cyclone/default.nix
+++ b/pkgs/development/interpreters/cyclone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libck, darwin }:
+{ lib, stdenv, fetchFromGitHub, libck, cctools }:
 
 let
   version = "0.34.0";
@@ -15,7 +15,7 @@ let
 
     enableParallelBuilding = true;
 
-    nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ];
 
     buildInputs = [ libck ];
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ bootstrap ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   buildInputs = [ libck ];
 
diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/development/libraries/catboost/default.nix
index b4fa78a12526..3824cf046b95 100644
--- a/pkgs/development/libraries/catboost/default.nix
+++ b/pkgs/development/libraries/catboost/default.nix
@@ -2,7 +2,7 @@
 , config
 , fetchFromGitHub
 , cmake
-, darwin
+, cctools
 , libiconv
 , llvmPackages
 , ninja
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     ragel
     yasm
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.cctools
+    cctools
   ] ++ lib.optionals cudaSupport (with cudaPackages; [
     cuda_nvcc
   ]);
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 245ea93f63e4..4f5f42582c57 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, darwin, libtiff
+{ lib, stdenv, fetchsvn, cctools, libtiff
 , libpng, zlib, libwebp, libraw, openexr, openjpeg
 , libjpeg, jxrlib, pkg-config
 , fixDarwinDylibNames, autoSignDarwinBinariesHook }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
     fixDarwinDylibNames
   ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
     autoSignDarwinBinariesHook
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix
index 672ba730be12..6a4b0adfefb4 100644
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }:
+{ lib, stdenv, fetchurl, cctools, disablePosixThreads ? false }:
 
 stdenv.mkDerivation rec {
   pname = "libmcrypt";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
   };
 
-  buildInputs = lib.optional stdenv.isDarwin darwin.cctools;
+  buildInputs = lib.optional stdenv.isDarwin cctools;
 
   configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ]
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix
index 35e609521f0d..7ef488cca4c1 100644
--- a/pkgs/development/libraries/nss/generic.nix
+++ b/pkgs/development/libraries/nss/generic.nix
@@ -7,7 +7,7 @@
 , zlib
 , sqlite
 , ninja
-, darwin
+, cctools
 , fixDarwinDylibNames
 , buildPackages
 , useP11kit ? true
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames ];
 
   buildInputs = [ zlib sqlite ];
 
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 9073bcb6f9e5..1743c03409c9 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -314,7 +314,7 @@ let
           in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
         inherit (srcs.qtwebengine) version;
         python = python3;
-        inherit (darwin) cctools xnu;
+        inherit (darwin) xnu;
         inherit (darwin.apple_sdk_11_0) libpm libunwind;
         inherit (darwin.apple_sdk_11_0.libs) sandbox;
         inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index c724bd21d11f..83f9268624cc 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -152,7 +152,7 @@ let
       qtwayland = callPackage ./modules/qtwayland.nix { };
       qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
       qtwebengine = callPackage ./modules/qtwebengine.nix {
-        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds cctools xnu;
+        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;
         inherit (darwin.apple_sdk_11_0) libpm libunwind;
         inherit (darwin.apple_sdk_11_0.libs) sandbox;
         inherit (darwin.apple_sdk_11_0.frameworks)
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 90e6c05da77d..607b6c89e40d 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -5,7 +5,7 @@
 , fetchurl
 , rpmextract
 , _7zz
-, darwin
+, cctools
 , validatePkgConfig
 , enableStatic ? stdenv.hostPlatform.isStatic
 }:
@@ -72,7 +72,7 @@ in stdenvNoCC.mkDerivation ({
 
   nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
     then
-      [ _7zz darwin.cctools ]
+      [ _7zz cctools ]
     else
       [ rpmextract ]);
 
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index d9c0daef7834..2e54104d7dce 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index acd9e6b2d1a9..678604f04af2 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1256,7 +1256,7 @@ let
     pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: {
       postPatch = lib.optionalString stdenv.isDarwin ''
         for file in R/*.{r,r.in}; do
-            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
+            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.cctools}/bin/\1"#g' $file
         done
       '';
     });
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
index 8f5592b5e897..5722d26ea1ed 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
@@ -3,6 +3,7 @@
 , bazel-examples
 , bazelTest
 , callPackage
+, cctools
 , darwin
 , distDir
 , extraBazelArgs ? ""
@@ -37,8 +38,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
index 2b231dc52a6e..51fea3e32dc3 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
@@ -4,7 +4,7 @@
 , stdenv
 , symlinkJoin
 , callPackage
-, darwin
+, cctools
 , extraBazelArgs ? ""
 , lib
 , openjdk8
@@ -38,8 +38,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
index 4d188ed41454..ebe4f13346bc 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
@@ -2,6 +2,7 @@
 , Foundation
 , bazelTest
 , callPackage
+, cctools
 , darwin
 , distDir
 , extraBazelArgs ? ""
@@ -97,8 +98,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index 7b0e2a5d01bf..6759bf14de10 100644
--- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -3,6 +3,7 @@
 , bazelTest
 , bazel-examples
 , stdenv
+, cctools
 , darwin
 , extraBazelArgs ? ""
 , lib
@@ -20,8 +21,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
index ed4711f4027f..3890d45d2b94 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -2,7 +2,7 @@
 , bazelTest
 , bazel-examples
 , stdenv
-, darwin
+, cctools
 , extraBazelArgs ? ""
 , lib
 , openjdk8
@@ -20,8 +20,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index 963bad679c50..0466404ced96 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , fetchurl
 , stdenv
-, darwin
+, cctools
 , lib
 , openjdk8
 , jdk11_headless
@@ -134,8 +134,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index 2538a2ae074a..e0e59fb8891d 100644
--- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -2,7 +2,7 @@
   bazel
 , bazelTest
 , stdenv
-, darwin
+, cctools
 , extraBazelArgs ? ""
 , lib
 , runLocal
@@ -17,8 +17,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix
index c890caa5da9f..fe74486ccfaa 100644
--- a/pkgs/development/tools/build-managers/gn/generic.nix
+++ b/pkgs/development/tools/build-managers/gn/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, darwin, writeText
+{ stdenv, lib, fetchgit, cctools, darwin, writeText
 , ninja, python3
 , ...
 }:
diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/development/tools/nodehun/default.nix
index 5a49c90ad2e2..ec5587273db2 100644
--- a/pkgs/development/tools/nodehun/default.nix
+++ b/pkgs/development/tools/nodehun/default.nix
@@ -1,4 +1,5 @@
 { buildNpmPackage
+, cctools
 , darwin
 , fetchFromGitHub
 , lib
@@ -31,7 +32,7 @@ buildNpmPackage {
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
   nativeBuildInputs = [ nodePackages.node-gyp python3 ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   postInstall = ''
     # Only keep the necessary parts of build/Release to reduce closure size
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix
index e0abf90847fc..a5e8ed28ce1e 100644
--- a/pkgs/development/tools/xcbuild/toolchains.nix
+++ b/pkgs/development/tools/xcbuild/toolchains.nix
@@ -60,7 +60,7 @@ runCommand "Toolchains" {} (''
   ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent
   ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags
 '' + optionalString stdenv.isDarwin ''
-  for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do
+  for bin in ${getBin buildPackages.cctools}/bin/*; do
     if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
       ln -s $bin $toolchain/bin
     fi
diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix
index d9c0daef7834..2e54104d7dce 100644
--- a/pkgs/development/web/netlify-cli/composition.nix
+++ b/pkgs/development/web/netlify-cli/composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix
index d9c0daef7834..e59fd8a77f51 100644
--- a/pkgs/development/web/playwright-test/default.nix
+++ b/pkgs/development/web/playwright-test/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 2bf491c2e665..66550148c8be 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -12,7 +12,7 @@ let
   nodeEnv = import ../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index e288e6d21686..7dff70cc4f17 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -56,7 +56,6 @@ makeScopeWithSplicing' {
 
       compat = self.callPackage ./pkgs/compat/package.nix {
         inherit (buildPackages) coreutils;
-        inherit (buildPackages.darwin) cctools-port;
         inherit (buildNetbsd) makeMinimal;
         inherit (self) install;
       };
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
index 0f7483ce55ad..40113028bbf1 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
@@ -5,7 +5,7 @@
   zlib,
   defaultMakeFlags,
   coreutils,
-  cctools-port,
+  cctools,
   install,
   bsdSetupHook,
   netbsdSetupHook,
@@ -72,7 +72,7 @@ mkDerivation (
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # GNU objcopy produces broken .a libs which won't link into dependers.
         # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here.
-        "OBJCOPY=${cctools-port}/bin/strip"
+        "OBJCOPY=${cctools}/bin/strip"
       ];
     RENAME = "-D";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 960c7ab377a3..520f4a823671 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -61,7 +61,7 @@ appleDerivation' stdenv {
       (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include)
     done
 
-    (cd ${lib.getDev buildPackages.darwin.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
+    (cd ${lib.getDev buildPackages.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
 
     for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do
       ln -s "$out/include/pthread/$header" "$out/include/$header"
diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix
index bd96f550554b..c5d958bef2c4 100644
--- a/pkgs/servers/mx-puppet-discord/node-composition.nix
+++ b/pkgs/servers/mx-puppet-discord/node-composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index cab00249d3b6..dfa16d47968e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -247,21 +247,18 @@ in
       # TODO should be removed
       version = "10.5.25";
       hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_106 = self.callPackage generic {
       # Supported until 2026-07-06
       version = "10.6.18";
       hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_1011 = self.callPackage generic {
       # Supported until 2028-02-16
       version = "10.11.8";
       hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_110 = self.callPackage generic {
@@ -269,7 +266,6 @@ in
       # TODO should be removed
       version = "11.0.6";
       hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
   }
diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix
index 8cab6ec656a2..002765a04cd9 100644
--- a/pkgs/servers/sql/percona-server/default.nix
+++ b/pkgs/servers/sql/percona-server/default.nix
@@ -1,13 +1,13 @@
 pkgs: {
   percona-server_lts = pkgs.callPackage ./lts.nix {
-    inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
+    inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     boost = pkgs.boost177; # Configure checks for specific version.
     icu = pkgs.icu69;
     protobuf = pkgs.protobuf_21;
   };
   percona-server_innovation = pkgs.callPackage ./innovation.nix {
-    inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
+    inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix
index 22b4c99d08ae..e9c5ff0e4fee 100644
--- a/pkgs/servers/web-apps/ethercalc/node-packages.nix
+++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix
index 03cadd46a45f..20c52f114e76 100644
--- a/pkgs/tools/admin/balena-cli/default.nix
+++ b/pkgs/tools/admin/balena-cli/default.nix
@@ -8,6 +8,7 @@
 , nodePackages
 , python3
 , udev
+, cctools
 , darwin
 }:
 
@@ -38,7 +39,7 @@ in buildNpmPackage' rec {
     nodePackages.node-gyp
     python3
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   buildInputs = lib.optionals stdenv.isLinux [
diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix
index 913efd645a30..61025a6baadf 100644
--- a/pkgs/tools/audio/dl-librescore/default.nix
+++ b/pkgs/tools/audio/dl-librescore/default.nix
@@ -3,7 +3,7 @@
 , buildNpmPackage
 , fetchFromGitHub
 , python3
-, darwin
+, cctools
 }:
 
 buildNpmPackage rec {
@@ -31,7 +31,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     python3
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   meta = {
diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/tools/misc/hsd/default.nix
index a1e82076cca4..44100e15283c 100644
--- a/pkgs/tools/misc/hsd/default.nix
+++ b/pkgs/tools/misc/hsd/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , python3
 , unbound
-, darwin
+, cctools
 }:
 
 buildNpmPackage rec {
@@ -23,7 +23,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     python3
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   buildInputs = [
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 5d334cf0b855..694e9ac93ee1 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -8,7 +8,7 @@
 , perlPackages
 , makeWrapper
 , perl # for pod2man
-, darwin
+, cctools
 , gitUpdater
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     (perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ]))
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   makeFlags = [
diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix
index 431824163c0b..4b23e55028be 100644
--- a/pkgs/tools/networking/curl-impersonate/default.nix
+++ b/pkgs/tools/networking/curl-impersonate/default.nix
@@ -16,7 +16,7 @@
 , autoconf
 , automake
 , libtool
-, darwin
+, cctools
 , cacert
 , unzip
 , go
@@ -63,7 +63,7 @@ let
 
     nativeBuildInputs = lib.optionals stdenv.isDarwin [
       # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize'
-      darwin.cctools
+      cctools
     ] ++ [
       installShellFiles
       cmake
diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix
index 22e8b6260737..b154efb74712 100644
--- a/pkgs/tools/security/onlykey/onlykey.nix
+++ b/pkgs/tools/security/onlykey/onlykey.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f234d1b3375..56d26931c477 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1055,7 +1055,7 @@ with pkgs;
 
   inherit ({
     mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
-      inherit (darwin) cctools DarwinTools;
+      inherit (darwin) DarwinTools;
       inherit (darwin.apple_sdk.frameworks) CoreServices;
       antlr = antlr4_10;
       icu =  icu73;
@@ -1066,7 +1066,7 @@ with pkgs;
   ;
 
   mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
-    inherit (darwin) cctools DarwinTools;
+    inherit (darwin) DarwinTools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     antlr = antlr4_10;
     icu =  icu73;
@@ -3810,9 +3810,7 @@ with pkgs;
 
   glyr = callPackage ../tools/audio/glyr { };
 
-  google-amber = callPackage ../tools/graphics/amber {
-    inherit (darwin) cctools;
-  };
+  google-amber = callPackage ../tools/graphics/amber { };
 
   hakrawler = callPackage ../tools/security/hakrawler { };
 
@@ -5445,7 +5443,6 @@ with pkgs;
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   homepage-dashboard = callPackage ../servers/homepage-dashboard {
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
@@ -7912,7 +7909,7 @@ with pkgs;
   lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor {};
 
   lp_solve = callPackage ../applications/science/math/lp_solve {
-    inherit (darwin) cctools autoSignDarwinBinariesHook;
+    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
@@ -10324,7 +10321,7 @@ with pkgs;
   bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
 
   mailpit = callPackage ../servers/mail/mailpit {
-    libtool = if stdenv.isDarwin then darwin.cctools else libtool;
+    libtool = if stdenv.isDarwin then cctools else libtool;
   };
 
   mailsend = callPackage ../tools/networking/mailsend { };
@@ -12625,9 +12622,7 @@ with pkgs;
 
   selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
 
-  semantic-release = callPackage ../development/tools/semantic-release {
-    inherit (darwin) cctools;
-  };
+  semantic-release = callPackage ../development/tools/semantic-release { };
 
   semgrep = python3.pkgs.callPackage ../tools/security/semgrep { };
   semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { };
@@ -14236,7 +14231,6 @@ with pkgs;
 
   unicorn = callPackage ../development/libraries/unicorn {
     inherit (darwin.apple_sdk.frameworks) IOKit;
-    inherit (darwin) cctools;
   };
 
   unittest-cpp = callPackage ../development/libraries/unittest-cpp { };
@@ -15013,9 +15007,7 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  chez = callPackage ../development/compilers/chez {
-    inherit (darwin) cctools;
-  };
+  chez = callPackage ../development/compilers/chez { };
 
   chez-racket = callPackage ../development/compilers/chez-racket { };
 
@@ -17308,7 +17300,7 @@ with pkgs;
     inherit (darwin) libobjc;
   };
   defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
-    inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook;
+    inherit (darwin) DarwinTools autoSignDarwinBinariesHook;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
   bundix = callPackage ../development/ruby-modules/bundix { };
@@ -17804,7 +17796,7 @@ with pkgs;
   bazel = bazel_6;
 
   bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
-    inherit (darwin) cctools sigtool;
+    inherit (darwin) sigtool;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk11_headless;
     runJdk = jdk11_headless;
@@ -17815,7 +17807,7 @@ with pkgs;
   };
 
   bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
-    inherit (darwin) cctools sigtool;
+    inherit (darwin) sigtool;
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk11_headless;
     runJdk = jdk11_headless;
@@ -17827,7 +17819,7 @@ with pkgs;
   };
 
   bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
-    inherit (darwin) cctools sigtool;
+    inherit (darwin) sigtool;
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
     buildJdk = jdk17_headless;
     runJdk = jdk17_headless;
@@ -19547,7 +19539,7 @@ with pkgs;
   jhiccup = callPackage ../development/tools/java/jhiccup { };
 
   valgrind = callPackage ../development/tools/analysis/valgrind {
-    inherit (buildPackages.darwin) xnu bootstrap_cmds cctools;
+    inherit (buildPackages.darwin) xnu bootstrap_cmds;
   };
   valgrind-light = res.valgrind.override { gdb = null; };
 
@@ -20825,7 +20817,6 @@ with pkgs;
 
   gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection {
     nixStoreDir = config.nix.storeDir or builtins.storeDir;
-    inherit (darwin) cctools;
   };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };
@@ -20873,7 +20864,6 @@ with pkgs;
   };
 
   gpac = callPackage ../applications/video/gpac {
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
@@ -22867,7 +22857,7 @@ with pkgs;
   lirc = callPackage ../development/libraries/lirc { };
 
   liquid-dsp = callPackage ../development/libraries/liquid-dsp {
-    inherit (darwin) autoSignDarwinBinariesHook cctools;
+    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   liquidfun = callPackage ../development/libraries/liquidfun { };
@@ -25832,14 +25822,12 @@ with pkgs;
   mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix {
     sasl = cyrus_sasl;
     boost = boost179.override { enableShared = false; };
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
   mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
     sasl = cyrus_sasl;
     boost = boost178.override { enableShared = false; };
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
     stdenv = if stdenv.isDarwin then
       darwin.apple_sdk_11_0.stdenv.override (old: {
@@ -25863,7 +25851,7 @@ with pkgs;
   influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { };
 
   mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
-    inherit (darwin) cctools developer_cmds DarwinTools;
+    inherit (darwin) developer_cmds DarwinTools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     boost = boost177; # Configure checks for specific version.
     icu = icu69;
@@ -26146,7 +26134,7 @@ with pkgs;
 
   rethinkdb = callPackage ../servers/nosql/rethinkdb {
     stdenv = clangStdenv;
-    libtool = darwin.cctools;
+    libtool = cctools;
     protobuf = protobuf_21;
   };
 
@@ -28729,7 +28717,7 @@ with pkgs;
   session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { };
 
   shaderc = callPackage ../development/compilers/shaderc {
-    inherit (darwin) autoSignDarwinBinariesHook cctools;
+    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
@@ -32162,7 +32150,7 @@ with pkgs;
 
   mac = callPackage ../development/libraries/mac { };
 
-  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; };
+  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
 
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
 
@@ -34810,14 +34798,12 @@ with pkgs;
   openvscode-server = callPackage ../servers/openvscode-server {
     nodejs = nodejs_18;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
-    inherit (darwin) cctools;
     inherit (nodePackages) node-gyp;
   };
 
   code-server = callPackage ../servers/code-server {
     nodejs = nodejs_18;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
-    inherit (darwin) cctools;
     inherit (nodePackages) node-gyp;
   };
 
@@ -36207,9 +36193,7 @@ with pkgs;
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
 
-  gargoyle = callPackage ../games/gargoyle {
-    inherit (darwin) cctools;
-  };
+  gargoyle = callPackage ../games/gargoyle { };
 
   gav = callPackage ../games/gav { };
 
@@ -36675,7 +36659,6 @@ with pkgs;
   scid-vs-pc = callPackage ../games/scid-vs-pc { };
 
   scummvm = callPackage ../games/scummvm {
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit;
   };
 
@@ -40069,7 +40052,7 @@ with pkgs;
 
   check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { };
 
-  ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
+  ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { };
 
   vdr = callPackage ../applications/video/vdr { };
   vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { });
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac14fe5b7c56..7ebce8c805c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6159,7 +6159,6 @@ self: super: with self; {
   };
 
   jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
-    inherit (pkgs.darwin) cctools;
     # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
     inherit (pkgs.config) cudaSupport;
     IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
@@ -7660,9 +7659,7 @@ self: super: with self; {
 
   minio = callPackage ../development/python-modules/minio { };
 
-  miniupnpc = callPackage ../development/python-modules/miniupnpc {
-    inherit (pkgs.darwin) cctools;
-  };
+  miniupnpc = callPackage ../development/python-modules/miniupnpc { };
 
   mip = callPackage ../development/python-modules/mip { };
 
@@ -15208,7 +15205,6 @@ self: super: with self; {
     };
   in
   callPackage ../development/python-modules/tensorflow {
-    inherit (pkgs.darwin) cctools;
     inherit (pkgs.config) cudaSupport;
     inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
     flatbuffers-core = pkgs.flatbuffers;
@@ -15235,9 +15231,7 @@ self: super: with self; {
 
   tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { };
 
-  tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability {
-    inherit (pkgs.darwin) cctools;
-  };
+  tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
 
   tensorflow = self.tensorflow-build;
 

From 2f2e6554270fee9b070bc49e26cc989919bec81d Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Wed, 17 Jul 2024 22:17:05 -0400
Subject: [PATCH 290/319] darwin.cctools: add to darwin-aliases.nix

---
 pkgs/top-level/darwin-aliases.nix  | 2 ++
 pkgs/top-level/darwin-packages.nix | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 36cb82c0833d..e64bb256843d 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -52,8 +52,10 @@ mapAliases ({
   builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06
 
   ### C ###
+  cctools = pkgs.cctools; # added 2024-07-17
   cctools-apple = pkgs.cctools; # added 2024-07-01
   cctools-llvm = pkgs.cctools; # added 2024-07-01
+  cctools-port = pkgs.cctools; # added 2024-07-17
 
   ### I ###
 
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 3cbe0ec75fd1..9de9f56674d3 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -120,7 +120,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
     name = "${lib.getName self.binutils-unwrapped}-dualas-${lib.getVersion self.binutils-unwrapped}";
     paths = [
       self.binutils-unwrapped
-      (lib.getOutput "gas" self.cctools)
+      (lib.getOutput "gas" pkgs.cctools)
     ];
   };
 
@@ -133,10 +133,6 @@ impure-cmds // appleSourcePackages // chooseLibs // {
     bintools = self.binutils-unwrapped;
   };
 
-  cctools = self.cctools-port;
-
-  cctools-port = pkgs.cctools;
-
   # TODO(@connorbaker): See https://github.com/NixOS/nixpkgs/issues/229389.
   cf-private = self.apple_sdk.frameworks.CoreFoundation;
 

From 6ac037b1b54a7a44787f0596798d1aeaf335eae8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 10:20:14 +0000
Subject: [PATCH 291/319] vim: 9.1.0509 -> 9.1.0595

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

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 50de9c6bfb79..50857ed1592b 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.0509";
+  version = "9.1.0595";
 
   outputs = [ "out" "xxd" ];
 
@@ -8,7 +8,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4=";
+    hash = "sha256-v8xVP1WuvE9XdQl1LDIq3pjaKyqPWM0fsFKcpIwPbNA=";
   };
 
   enableParallelBuilding = true;

From 7fefa5a49d72cd3ad91d34a6d2dea84fc80e1d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 3 Jul 2024 07:33:05 -0700
Subject: [PATCH 292/319] python312Packages.jsonschema-path: 0.3.2 -> 0.3.3

Diff: https://github.com/p1c2u/jsonschema-path/compare/0.3.2...0.3.3

Changelog: https://github.com/p1c2u/jsonschema-path/releases/tag/0.3.3
---
 .../python-modules/jsonschema-path/default.nix      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix
index 153c584047a9..9add473d07cd 100644
--- a/pkgs/development/python-modules/jsonschema-path/default.nix
+++ b/pkgs/development/python-modules/jsonschema-path/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-path";
-  version = "0.3.2";
+  version = "0.3.3";
 
   disabled = pythonOlder "3.8";
 
@@ -22,19 +22,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "jsonschema-path";
-    rev = version;
-    hash = "sha256-HC0yfACKFIQEQoIa8/FUKyV8YS8TQ0BY7i3n9xCdKz8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4=";
   };
 
   postPatch = ''
     sed -i '/--cov/d' pyproject.toml
   '';
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  pythonRelaxDeps = [ "referencing" ];
+  build-system = [ poetry-core ];
 
   propagatedBuildInputs = [
     pathable
@@ -50,6 +46,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/p1c2u/jsonschema-path/releases/tag/${version}";
     description = "JSONSchema Spec with object-oriented paths";
     homepage = "https://github.com/p1c2u/jsonschema-path";
     license = lib.licenses.asl20;

From 2fbb8d3912ad09c8da5b49e8198e60e48d717d34 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 18 Jul 2024 15:43:37 +0200
Subject: [PATCH 293/319] python312Packages.orjson: 3.10.5 -> 3.10.6

https://github.com/ijl/orjson/blob/3.10.6/CHANGELOG.md
---
 pkgs/development/python-modules/orjson/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index c1d58c0a1c54..650d8a634d51 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "orjson";
-  version = "3.10.5";
+  version = "3.10.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,13 +40,13 @@ buildPythonPackage rec {
     owner = "ijl";
     repo = "orjson";
     rev = "refs/tags/${version}";
-    hash = "sha256-Q2zi3mNgCFrg7Ucana0+lmR9C9kkuUidEJj8GneR2W4=";
+    hash = "sha256-K3wCzwaGOsaiCm2LW4Oc4XOnp6agrdTxCxqEIMq0fuU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-yhLKw4BhdIHgcu4iVlXQlHk/8J+3NK6LlmSWbm/5y4Q=";
+    hash = "sha256-SNdwqb47dJ084TMNsm2Btks1UCDerjSmSrQQUiGbx50=";
   };
 
   maturinBuildFlags = [ "--interpreter ${python.executable}" ];

From 3d126112328fe692fa0963c555ea7ef1494bd791 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 7 Jul 2024 11:52:13 +0200
Subject: [PATCH 294/319] python312Packages.typer: include standard optional

Typer specifies the standard optional-dependencies package list, but then
due to internal tooling includes it by default in Require-Dist.

https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72

This is in line with changes that happened in typer 0.12.1

https://github.com/tiangolo/typer/releases/tag/0.12.1
---
 pkgs/applications/misc/dbx/default.nix                |  3 +--
 pkgs/applications/misc/shell-genie/default.nix        |  2 +-
 pkgs/by-name/au/audiness/package.nix                  |  3 +--
 pkgs/by-name/cu/cups-printers/package.nix             |  3 +--
 pkgs/by-name/kr/krr/package.nix                       |  2 +-
 pkgs/by-name/ro/route-graph/package.nix               |  2 +-
 pkgs/by-name/tr/trak/package.nix                      |  2 +-
 pkgs/development/python-modules/gradio/default.nix    |  2 +-
 .../development/python-modules/manifestoo/default.nix |  7 +------
 pkgs/development/python-modules/pymodbus/default.nix  |  2 +-
 .../python-modules/pyunifiprotect/default.nix         |  2 +-
 pkgs/development/python-modules/rstcheck/default.nix  |  2 +-
 pkgs/development/python-modules/torchio/default.nix   |  2 +-
 pkgs/development/python-modules/typer/default.nix     | 11 ++++++-----
 pkgs/tools/misc/markdown-anki-decks/default.nix       |  2 +-
 15 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix
index 95fd50b1e241..21f9e52ff84d 100644
--- a/pkgs/applications/misc/dbx/default.nix
+++ b/pkgs/applications/misc/dbx/default.nix
@@ -50,8 +50,7 @@ python.pkgs.buildPythonApplication rec {
       tenacity
       typer
       watchdog
-    ]
-    ++ typer.optional-dependencies.all;
+    ];
 
   passthru.optional-dependencies = with python3.pkgs; {
     aws = [ boto3 ];
diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix
index df4833199d8c..60b3ce9548ce 100644
--- a/pkgs/applications/misc/shell-genie/default.nix
+++ b/pkgs/applications/misc/shell-genie/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     rich
     shellingham
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   # No tests available
   doCheck = false;
diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix
index 8ad9d6397341..d7cff9d14e4b 100644
--- a/pkgs/by-name/au/audiness/package.nix
+++ b/pkgs/by-name/au/audiness/package.nix
@@ -30,8 +30,7 @@ python3.pkgs.buildPythonApplication rec {
       pytenable
       typer
       validators
-    ]
-    ++ typer.optional-dependencies.all;
+    ];
 
   pythonImportsCheck = [ "audiness" ];
 
diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix
index b6e124fef07d..7b0cf99298a8 100644
--- a/pkgs/by-name/cu/cups-printers/package.nix
+++ b/pkgs/by-name/cu/cups-printers/package.nix
@@ -30,8 +30,7 @@ python3.pkgs.buildPythonApplication rec {
       pycups
       typer
       validators
-    ]
-    ++ typer.optional-dependencies.all;
+    ];
 
   # Project has no tests
   doCheck = false;
diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix
index f919f8c0d226..eb76c1fe4a6d 100644
--- a/pkgs/by-name/kr/krr/package.nix
+++ b/pkgs/by-name/kr/krr/package.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonPackage rec {
     pydantic_1
     slack-sdk
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
diff --git a/pkgs/by-name/ro/route-graph/package.nix b/pkgs/by-name/ro/route-graph/package.nix
index 7e6e8d2bd6a6..8e1a4e183ce0 100644
--- a/pkgs/by-name/ro/route-graph/package.nix
+++ b/pkgs/by-name/ro/route-graph/package.nix
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     scapy
     typer
     typing-extensions
-  ] ++ typer.optional-dependencies.all);
+  ]);
 
   # Project has no tests
   doCheck = false;
diff --git a/pkgs/by-name/tr/trak/package.nix b/pkgs/by-name/tr/trak/package.nix
index 2129850159bd..46323b4b472e 100644
--- a/pkgs/by-name/tr/trak/package.nix
+++ b/pkgs/by-name/tr/trak/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   dependencies = with python3Packages; [
     questionary
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   build-system = [ python3Packages.poetry-core ];
 
diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index 5cc026cd3f2a..b59ba637d713 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -123,7 +123,7 @@ buildPythonPackage rec {
     uvicorn
     typer
     tomlkit
-  ] ++ typer.passthru.optional-dependencies.all;
+  ];
 
   passthru.optional-dependencies.oauth = [
     authlib
diff --git a/pkgs/development/python-modules/manifestoo/default.nix b/pkgs/development/python-modules/manifestoo/default.nix
index 140c78d26632..569f81607421 100644
--- a/pkgs/development/python-modules/manifestoo/default.nix
+++ b/pkgs/development/python-modules/manifestoo/default.nix
@@ -2,15 +2,12 @@
   buildPythonPackage,
   fetchPypi,
   hatch-vcs,
-  importlib-metadata,
   lib,
   manifestoo-core,
   nix-update-script,
   pytestCheckHook,
-  pythonOlder,
   textual,
   typer,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -32,9 +29,7 @@ buildPythonPackage rec {
       manifestoo-core
       textual
       typer
-    ]
-    ++ typer.passthru.optional-dependencies.all
-    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+    ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index 0b33812e6518..38411beca94b 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
       prompt-toolkit
       pygments
       click
-    ] ++ typer.optional-dependencies.all;
+    ];
     serial = [ pyserial ];
   };
 
diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix
index b33c6695bc0b..da08bf339be7 100644
--- a/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     pyjwt
     pytz
     typer
-  ] ++ typer.optional-dependencies.all ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   passthru.optional-dependencies = {
     shell = [
diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix
index 91f58f134710..259b460e9e09 100644
--- a/pkgs/development/python-modules/rstcheck/default.nix
+++ b/pkgs/development/python-modules/rstcheck/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     types-docutils
     pydantic
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index 79d245c926d2..c0aae74f178f 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     torch
     tqdm
     typer
-  ] ++ typer.passthru.optional-dependencies.all;
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 298db51c8f7b..2ef63fd1f97a 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -33,11 +33,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     click
     typing-extensions
-  ];
+  # Build includes the standard optional by default
+  # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72
+  ] ++ optional-dependencies.standard;
 
-  passthru.optional-dependencies = {
-    all = [
-      colorama
+  optional-dependencies = {
+    standard = [
       shellingham
       rich
     ];
@@ -48,7 +49,7 @@ buildPythonPackage rec {
     pytest-sugar
     pytest-xdist
     pytestCheckHook
-  ] ++ passthru.optional-dependencies.all;
+  ];
 
   preCheck = ''
     export HOME=$(mktemp -d);
diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix
index 3632bc2ff605..397533883014 100644
--- a/pkgs/tools/misc/markdown-anki-decks/default.nix
+++ b/pkgs/tools/misc/markdown-anki-decks/default.nix
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
     markdown
     python-frontmatter
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   # No tests available on Pypi and there is only a failing version assertion test in the repo.
   doCheck = false;

From 1e07a3b40b57bd61617d27d69e5a49730e7dc896 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 11 Jul 2024 08:04:58 +0200
Subject: [PATCH 295/319] ffmpeg_4: fix build issue introduced by texinfo 7.1
 update

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

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index e74bb1c2348e..0ba1977dfbcf 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, yasm
+{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm
 
   # You can fetch any upstream version using this derivation by specifying version and hash
   # NOTICE: Always use this argument to override the version. Do not use overrideAttrs.
@@ -761,7 +761,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config texinfo yasm ]
+  nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config yasm ]
+  # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
+  ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
   ++ optionals withCudaLLVM [ clang ];
 
   buildInputs = []

From d353fc8b74972da5f0b16fac07fc4b50612808bf Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 18 Jul 2024 22:19:39 +0200
Subject: [PATCH 296/319] gtk3: 3.24.42 -> 3.24.43

Fixes CVE-2024-6655

Changes:
https://gitlab.gnome.org/GNOME/gtk/-/blob/02cec9b8c97b52f90638b39496fb4c7fb630a1f5/NEWS
---
 pkgs/development/libraries/gtk/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index f194dee9c9ec..5473f02f35c6 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -64,7 +64,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk+3";
-  version = "3.24.42";
+  version = "3.24.43";
 
   outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
   outputBin = "dev";
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
   in fetchurl {
     url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "sha256-UPifYVCS1N0Bu9dZcZ+L04Dl8Un2/XipRyXi3hEjd+I=";
+    hash = "sha256-fgTwZIUVA0uAa3SuXXdNh8/7GiqWxGjLW+R21Rvy88c=";
   };
 
   patches = [

From 655c524d910f1b7dabaeeecbec70b2466bdf8589 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 18 Jul 2024 22:45:13 +0200
Subject: [PATCH 297/319] libxml2: Fix XInclude failure handling

This fixes colord api docs build with libxml2 2.13.
---
 pkgs/development/libraries/libxml2/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 92f45907397b..1d57ce51b7fb 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , pkg-config
 , autoreconfHook
 , libintl
@@ -35,6 +36,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM=";
   };
 
+  patches = [
+    # Fix XInclude failing too aggresively.
+    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/772
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/a0330b53c8034bb79220e403e8d4ad8c23ef088f.patch";
+      hash = "sha256-iVAgX8qNF0fw8GYUKsWduudjEuRMEOTAENAIFTjyRjU=";
+    })
+    # Fix error handling
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch";
+      hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [

From 8e510a059875cdfe17fa97fa47d7773f939e344f Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 18 Jul 2024 22:08:04 +0200
Subject: [PATCH 298/319] gtk2: apply patch fixing CVE-2024-6655

Upstream issue: https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
---
 pkgs/development/libraries/gtk/2.x.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix
index 9d9b855c9da8..ed0900ee1a92 100644
--- a/pkgs/development/libraries/gtk/2.x.nix
+++ b/pkgs/development/libraries/gtk/2.x.nix
@@ -2,6 +2,7 @@
 , lib
 , stdenv
 , fetchurl
+, fetchpatch
 , atk
 , buildPackages
 , cairo
@@ -63,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./patches/2.0-immodules.cache.patch
     ./patches/gtk2-theme-paths.patch
+    (fetchpatch {
+      # https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
+      name = "CVE-2024-6655.patch";
+      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch";
+      hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM=";
+    })
   ] ++ lib.optionals stdenv.isDarwin [
     ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
     ./patches/2.0-darwin-x11.patch

From 52b60b5c4eb9029ff1519de8fddacb3afb0d357a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 00:33:30 +0000
Subject: [PATCH 299/319] ncdc: 1.24 -> 1.24.1

---
 pkgs/by-name/nc/ncdc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nc/ncdc/package.nix b/pkgs/by-name/nc/ncdc/package.nix
index 0a6be6f40a12..912bd60b3b65 100644
--- a/pkgs/by-name/nc/ncdc/package.nix
+++ b/pkgs/by-name/nc/ncdc/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdc";
-  version = "1.24";
+  version = "1.24.1";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-IzUQ1TVfxy/a01eOvIqzXR2pWyHSd0mQ86E1a3ES2h4=";
+    hash = "sha256-Koq5rX1D8Bj8c7qLq9aJ36RKuozsU7iOR3AYXLl3ePc=";
   };
 
   nativeBuildInputs = [ perl pkg-config ];

From adcf839de2f2fd310211b49c9a896fc06a8a8404 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 01:01:46 +0000
Subject: [PATCH 300/319] orc: 0.4.38 -> 0.4.39

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

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 0b66e0d21a63..9f960cdf9549 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -18,11 +18,11 @@
   inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "orc";
-  version = "0.4.38";
+  version = "0.4.39";
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz";
-    sha256 = "sha256-pVqY1HclZ6o/rtj7hNVAw9t36roW0+LhCwRPvJIoZo0=";
+    sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA=";
   };
 
   postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''

From 0d7d9280d36ba0562cab76b60e2d750b2a1695a9 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 18 Jul 2024 00:31:46 -0400
Subject: [PATCH 301/319] python{311,312,313}: use system libmpdec again

Override the configure check not to do a universal build. Using the system libmpdec is required to enable LTO on Darwin.
---
 pkgs/development/interpreters/python/cpython/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index ac5d197ab3dd..9a155dd62b48 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -406,9 +406,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   configureFlags = [
     "--without-ensurepip"
     "--with-system-expat"
-  ] ++ optionals (!(stdenv.isDarwin && pythonAtLeast "3.12")) [
-    #  ./Modules/_decimal/_decimal.c:4673:6: error: "No valid combination of CONFIG_64, CONFIG_32 and _PyHASH_BITS"
-    # https://hydra.nixos.org/build/248410479/nixlog/2/tail
     "--with-system-libmpdec"
   ] ++ optionals (openssl != null) [
     "--with-openssl=${openssl.dev}"
@@ -480,6 +477,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"}
     # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
     sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
+  '' + optionalString (pythonAtLeast "3.11") ''
+    # Also override the auto-detection in `configure`.
+    substituteInPlace configure \
+      --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.isAarch64 then "uint128" else "x64"}'
   '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") ''
     export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
     export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"

From 5e496546441d15060a841b8e1e9e4435a9bd519f Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Wed, 10 Jul 2024 23:48:28 -0400
Subject: [PATCH 302/319] rav1e: work around build failure with Rust 1.79

---
 pkgs/by-name/ra/rav1e/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix
index b90dd2d56a61..2c8f99ef4cac 100644
--- a/pkgs/by-name/ra/rav1e/package.nix
+++ b/pkgs/by-name/ra/rav1e/package.nix
@@ -45,6 +45,8 @@ rustPlatform.buildRustPackage rec {
   # and linking it with cctools ld64.
   postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
     substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
+    # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
+    substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
   '';
 
   checkType = "debug";

From 3c99873695d79c1ce2723642a4679993c0add4de Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 19 Jul 2024 08:01:06 -0400
Subject: [PATCH 303/319] libgsf: fix build with libxml2 2.13

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

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index bd3ece423599..dcb460272d16 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -2,6 +2,7 @@
 , lib
 , stdenv
 , autoreconfHook
+, fetchpatch2
 , gtk-doc
 , pkg-config
 , intltool
@@ -31,6 +32,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-uSi2/pZiST07YutU8SHNoY2LifEQhohQeyaH9spyG2s=";
   };
 
+  patches = [
+    # Fixes building when nanohttp is not enabled in libxml2, which is the default since libxml2 2.13.
+    (fetchpatch2 {
+      url = "https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c.diff";
+      hash = "sha256-2TF1KDUxJtSMTDze2/dOJQRkW8S1GA9OyFpYzYeKpjQ=";
+    })
+  ];
+
   postPatch = ''
     # Fix cross-compilation
     substituteInPlace configure.ac \

From d5f637590ec6d9bac0d743cb0cbbc6821b73b6b8 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Wed, 17 Jul 2024 23:10:56 -0400
Subject: [PATCH 304/319] tree-wide: enable LTO on Darwin

---
 pkgs/applications/audio/dexed/default.nix         |  1 -
 pkgs/applications/audio/fire/default.nix          |  1 -
 pkgs/applications/audio/sonobus/default.nix       |  1 -
 .../blockchains/miniscript/default.nix            |  6 +-----
 .../emulators/firebird-emu/default.nix            |  3 ---
 .../computer-architecture/timeloop/default.nix    |  4 ----
 pkgs/applications/virtualization/rvvm/default.nix |  5 +----
 pkgs/by-name/tr/tracy/package.nix                 |  4 +---
 pkgs/development/compilers/ponyc/default.nix      |  2 +-
 pkgs/development/compilers/rgbds/default.nix      |  1 -
 .../interpreters/python/cpython/default.nix       |  5 ++---
 pkgs/development/libraries/liblc3/default.nix     |  3 ---
 pkgs/development/libraries/wolfssl/default.nix    |  2 +-
 .../development/python-modules/cocotb/default.nix |  5 -----
 .../python-modules/levenshtein/default.nix        |  6 ------
 .../python-modules/nuitka/darwin-lto.patch        | 15 ---------------
 .../development/python-modules/nuitka/default.nix |  3 ---
 .../python-modules/rapidfuzz/default.nix          |  6 ------
 .../ruby-modules/gem-config/default.nix           |  5 +----
 pkgs/games/eduke32/default.nix                    |  3 ---
 pkgs/games/stockfish/default.nix                  |  6 ------
 pkgs/tools/misc/remind/default.nix                |  3 ---
 pkgs/tools/package-management/lix/common.nix      |  1 -
 pkgs/tools/system/bfs/default.nix                 |  5 -----
 24 files changed, 8 insertions(+), 88 deletions(-)
 delete mode 100644 pkgs/development/python-modules/nuitka/darwin-lto.patch

diff --git a/pkgs/applications/audio/dexed/default.nix b/pkgs/applications/audio/dexed/default.nix
index 9bb3937cc03d..46cdb937f75e 100644
--- a/pkgs/applications/audio/dexed/default.nix
+++ b/pkgs/applications/audio/dexed/default.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     # needs special setup on Linux, dunno if it can work on Darwin
-    # https://github.com/NixOS/nixpkgs/issues/19098
     sed -i -e '/juce::juce_recommended_lto_flags/d' Source/CMakeLists.txt
   '';
 
diff --git a/pkgs/applications/audio/fire/default.nix b/pkgs/applications/audio/fire/default.nix
index 0d4691b9e4f1..5b71667a2af0 100644
--- a/pkgs/applications/audio/fire/default.nix
+++ b/pkgs/applications/audio/fire/default.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # 1. Remove hardcoded LTO flags: needs extra setup on Linux,
     #    possibly broken on Darwin
-    #    https://github.com/NixOS/nixpkgs/issues/19098
     # 2. Disable automatic copying of built plugins during buildPhase, it defaults
     #    into user home and we want to have building & installing separated.
     sed -i \
diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix
index 959c7a9d0623..fc0c5977360f 100644
--- a/pkgs/applications/audio/sonobus/default.nix
+++ b/pkgs/applications/audio/sonobus/default.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = lib.optionalString (stdenv.isLinux) ''
     # needs special setup on Linux, dunno if it can work on Darwin
-    # https://github.com/NixOS/nixpkgs/issues/19098
     # Also, I get issues with linking without that, not sure why
     sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt
     patchShebangs linux/install.sh
diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix
index 84b1b55f6618..8a842d507b0c 100644
--- a/pkgs/applications/blockchains/miniscript/default.nix
+++ b/pkgs/applications/blockchains/miniscript/default.nix
@@ -18,12 +18,8 @@ stdenv.mkDerivation rec {
     postPatch = lib.optionalString stdenv.isDarwin ''
     # Replace hardcoded g++ with c++ so clang can be used
     # on darwin
-    #
-    # lto must be disabled on darwin as well due to
-    # https://github.com/NixOS/nixpkgs/issues/19098
     substituteInPlace Makefile \
-        --replace-fail 'g++' 'c++' \
-        --replace-fail '-flto' ""
+        --replace-fail 'g++' 'c++'
   '';
 
   installPhase = ''
diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix
index 9fd990146161..48f364751427 100644
--- a/pkgs/applications/emulators/firebird-emu/default.nix
+++ b/pkgs/applications/emulators/firebird-emu/default.nix
@@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
   };
 
-  # work around https://github.com/NixOS/nixpkgs/issues/19098
-  env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto";
-
   nativeBuildInputs = [ wrapQtAppsHook qmake ];
 
   buildInputs = [ qtbase qtdeclarative qtquickcontrols ];
diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix
index ec8ec3ed8abc..7fc5da8dfa89 100644
--- a/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  #link-time optimization fails on darwin
-  #see https://github.com/NixOS/nixpkgs/issues/19098
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto";
-
   postPatch = ''
     # Fix gcc-13 build failure due to missing includes:
     sed -e '1i #include <cstdint>' -i \
diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix
index ce90b686bcb0..2d6b7d3da0c5 100644
--- a/pkgs/applications/virtualization/rvvm/default.nix
+++ b/pkgs/applications/virtualization/rvvm/default.nix
@@ -38,10 +38,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ]
     ++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1
-    ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0"
-
-    # work around https://github.com/NixOS/nixpkgs/issues/19098
-    ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";
+    ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0";
 
   meta = with lib; {
     homepage = "https://github.com/LekKit/RVVM";
diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index 82d4b9c285b8..4e462bae4a3b 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -56,9 +56,7 @@ stdenv.mkDerivation rec {
     # ../../../server/TracyView.cpp:649:34, preventing building.
     ++ lib.optional stdenv.isDarwin "-Wno-format-security"
     ++ lib.optional stdenv.isLinux "-ltbb"
-    ++ lib.optional stdenv.cc.isClang "-faligned-allocation"
-    # workaround issue #19098
-    ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto");
+    ++ lib.optional stdenv.cc.isClang "-faligned-allocation");
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 740ff702acd3..b10739ca3363 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -4,7 +4,7 @@
 , cmake
 , coreutils
 , libxml2
-, lto ? !stdenv.isDarwin
+, lto ? true
 , makeWrapper
 , openssl
 , pcre2
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 4f6f0df26222..872dcae2e132 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs --host src/bison.sh
   '';
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto";
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = with lib; {
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 9a155dd62b48..15c32eee3d44 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -70,8 +70,7 @@
 , enableNoSemanticInterposition ? true
 
 # enabling LTO on 32bit arch causes downstream packages to fail when linking
-# enabling LTO on *-darwin causes python3 to fail when linking.
-, enableLTO ? stdenv.is64bit && stdenv.isLinux
+, enableLTO ? stdenv.isDarwin || (stdenv.is64bit && stdenv.isLinux)
 
 # enable asserts to ensure the build remains reproducible
 , reproducibleBuild ? false
@@ -159,7 +158,7 @@ let
   ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     buildPackages.stdenv.cc
     pythonOnBuildForHost
-  ] ++ optionals (stdenv.cc.isClang && (!stdenv.hostPlatform.useAndroidPrebuilt or false) && (enableLTO || enableOptimizations)) [
+  ] ++ optionals (stdenv.cc.isClang && !stdenv.isDarwin && (!stdenv.hostPlatform.useAndroidPrebuilt or false) && (enableLTO || enableOptimizations)) [
     stdenv.cc.cc.libllvm.out
   ];
 
diff --git a/pkgs/development/libraries/liblc3/default.nix b/pkgs/development/libraries/liblc3/default.nix
index 3e1be4ba272e..ff04d23cb0c6 100644
--- a/pkgs/development/libraries/liblc3/default.nix
+++ b/pkgs/development/libraries/liblc3/default.nix
@@ -27,9 +27,6 @@ stdenv.mkDerivation {
     ninja
   ];
 
-  # LTO does not work on Darwin: https://github.com/NixOS/nixpkgs/issues/19098
-  mesonFlags = lib.optionals stdenv.isDarwin [ "-Db_lto=false" ];
-
   meta = with lib; {
     description = "LC3 (Low Complexity Communication Codec) is an efficient low latency audio codec";
     homepage = "https://github.com/google/liblc3";
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index affe693fe88f..c55ad0010d53 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -10,7 +10,7 @@
 # requiring to build a special variant for that software. Example: 'haproxy'
 , variant ? "all"
 , extraConfigureFlags ? []
-, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang)
+, enableLto ? !(stdenv.hostPlatform.isStatic || stdenv.cc.isClang)
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wolfssl-${variant}";
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index e7a322dad473..271ad52a9595 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -45,11 +45,6 @@ buildPythonPackage rec {
 
       # remove circular dependency cocotb-bus from setup.py
       substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
-    ''
-    + lib.optionalString stdenv.isDarwin ''
-      # disable lto on darwin
-      # https://github.com/NixOS/nixpkgs/issues/19098
-      substituteInPlace cocotb_build_libs.py --replace "-flto" ""
     '';
 
   patches = [
diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix
index a7913fd5b097..4f04a810bd5e 100644
--- a/pkgs/development/python-modules/levenshtein/default.nix
+++ b/pkgs/development/python-modules/levenshtein/default.nix
@@ -37,12 +37,6 @@ buildPythonPackage rec {
 
   buildInputs = [ rapidfuzz-cpp ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [
-      "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098
-    ]
-  );
-
   dependencies = [ rapidfuzz ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/nuitka/darwin-lto.patch b/pkgs/development/python-modules/nuitka/darwin-lto.patch
deleted file mode 100644
index bd3a65905498..000000000000
--- a/pkgs/development/python-modules/nuitka/darwin-lto.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/nuitka/build/SconsCompilerSettings.py b/nuitka/build/SconsCompilerSettings.py
-index 319b72c4e..89d40f2a2 100644
---- a/nuitka/build/SconsCompilerSettings.py
-+++ b/nuitka/build/SconsCompilerSettings.py
-@@ -173,8 +173,8 @@ def _enableLtoSettings(
-         lto_mode = False
-         reason = "known to be not supported (CondaCC)"
-     elif isMacOS() and env.gcc_mode and env.clang_mode:
--        lto_mode = True
--        reason = "known to be supported (macOS clang)"
-+        lto_mode = False
-+        reason = "known to not be supported (macOS nix clang)"
-     elif env.mingw_mode and env.clang_mode:
-         lto_mode = False
-         reason = "known to not be supported (new MinGW64 Clang)"
diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix
index fa0842267031..cce4467e73e5 100644
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -23,9 +23,6 @@ buildPythonPackage rec {
     hash = "sha256-nKdCMgA92v9VsSgfktXDbSh3DyKsGlcTjpn0Y7u4rxU=";
   };
 
-  # default lto off for darwin
-  patches = [ ./darwin-lto.patch ];
-
   build-system = [
     setuptools
     wheel
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 1d406e5d3508..4fe45a1dfa44 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -59,12 +59,6 @@ buildPythonPackage rec {
       export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB"
     '';
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [
-      "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098
-    ]
-  );
-
   passthru.optional-dependencies = {
     full = [ numpy ];
   };
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 2e59b8a99cc1..84d0bf21ce34 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -783,10 +783,7 @@ in
       substituteInPlace lib/sassc/native.rb \
         --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'
     '';
-  } // (lib.optionalAttrs stdenv.isDarwin {
-    # https://github.com/NixOS/nixpkgs/issues/19098
-    buildFlags = [ "--disable-lto" ];
-  });
+  };
 
   sass-embedded = attrs: {
     # Patch the Rakefile to use our dart-sass and not try to fetch anything.
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 5bb9966602d8..740d0bc47ea7 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -83,9 +83,6 @@ in stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "SDLCONFIG=${SDL2}/bin/sdl2-config"
-  ] ++ lib.optionals stdenv.isDarwin [
-    # broken, see: https://github.com/NixOS/nixpkgs/issues/19098
-    "LTO=0"
   ];
 
   buildFlags = [
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 74eff702add1..2e6d142b7148 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -30,12 +30,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ASy2vIP94lnSKgxixK1GoC84yAysaJpxeyuggV4MrP4=";
   };
 
-  # This addresses a linker issue with Darwin
-  # https://github.com/NixOS/nixpkgs/issues/19098
-  preBuild = lib.optionalString stdenv.isDarwin ''
-    sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile
-  '';
-
   postUnpack = ''
     sourceRoot+=/src
     echo ${nnue}
diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index 51448931dcfb..4b204d5a8764 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -30,9 +30,6 @@ tcl.mkTclDerivation rec {
   '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [
-    # Disable clang link time optimization until the following issue is resolved:
-    # https://github.com/NixOS/nixpkgs/issues/19098
-    "-fno-lto"
     # On Darwin setenv and unsetenv are defined in stdlib.h from libSystem
     "-DHAVE_SETENV"
     "-DHAVE_UNSETENV"
diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix
index b01b381d1491..f349e06f54fe 100644
--- a/pkgs/tools/package-management/lix/common.nix
+++ b/pkgs/tools/package-management/lix/common.nix
@@ -188,7 +188,6 @@ stdenv.mkDerivation {
   mesonFlags =
     [
       # LTO optimization
-      (lib.mesonBool "b_lto" (!stdenv.isDarwin))
       (lib.mesonEnable "gc" true)
       (lib.mesonBool "enable-tests" true)
       (lib.mesonBool "enable-docs" enableDocumentation)
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 3469060c74c5..2b714b56def5 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ];
 
-  # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
-  preConfigure = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace GNUMakefile --replace "-flto=auto" ""
-  '';
-
   makeFlags = [ "PREFIX=$(out)" ];
   buildFlags = [ "release" ]; # "release" enables compiler optimizations
 

From 5155e0c03b02a28f803b46544faeed30beb88918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 20 Jul 2024 09:40:30 +0200
Subject: [PATCH 305/319] cmake: refactor setup hook's find command

It became unnecessarily repetitive and complicated.
---
 pkgs/by-name/cm/cmake/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index b9abeea23222..29b72ddda435 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -5,7 +5,7 @@ addCMakeParams() {
 fixCmakeFiles() {
     # Replace occurences of /usr and /opt by /var/empty.
     echo "fixing cmake files..."
-    find "$1" \( -type f -name "*.cmake" -o -type f -name "*.cmake.in" -o -type f -name CMakeLists.txt \) -print |
+    find "$1" -type f \( -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print |
         while read fn; do
             sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp"
             mv "$fn.tmp" "$fn"

From fdd8f4d6ef742dc869a94e85e7a0a8bebb21056b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 18 Jul 2024 20:31:11 +0200
Subject: [PATCH 306/319] libcamera: fix cross-bits cross
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

e.g. from 64-bit to 32-bit.

pybind11 is a header-only library, so there was no linking failure —
the only reason this ended up mattering was that it had some sort of
size check in it.

Fixes: 8a45e936ac04 ("libcamera: 0.2.0 → 0.3.0")
---
 pkgs/by-name/li/libcamera/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix
index c6f470c78953..32eb20ce169c 100644
--- a/pkgs/by-name/li/libcamera/package.nix
+++ b/pkgs/by-name/li/libcamera/package.nix
@@ -68,6 +68,9 @@ stdenv.mkDerivation rec {
     # hotplugging
     systemd
 
+    # pycamera
+    python3Packages.pybind11
+
     # yamlparser
     libyaml
 
@@ -81,7 +84,6 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     python3Packages.jinja2
-    python3Packages.pybind11
     python3Packages.pyyaml
     python3Packages.ply
     python3Packages.sphinx

From 9526ee76277685f1c616fc7fd42b53a370ca05ff Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 15 Jul 2024 14:05:50 +0200
Subject: [PATCH 307/319] gst_all_1.gst-plugins-base: enable debug info

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

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 930cdd79b732..e03b223f126b 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "dev" ];
 
+  separateDebugInfo = true;
+
   src = let
     inherit (finalAttrs) pname version;
   in fetchurl {

From ed6effab258d0ad377f5640d8761df9dfafcddaa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 15 Jul 2024 12:54:04 +0200
Subject: [PATCH 308/319] gst_all_1.gstreamer: enable debug info

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

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index a6f0cee7d7db..40d40d742463 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  separateDebugInfo = true;
+
   src = let
     inherit (finalAttrs) pname version;
   in fetchurl {

From 743b4c8e7893be810c0502cd776e03ea994967db Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 14 Jul 2024 16:40:10 +0200
Subject: [PATCH 309/319] gss: fix build

---
 pkgs/development/libraries/gss/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 7dde1fc835c3..0845b871777b 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
     "--${if withShishi then "enable" else "disable"}-kerberos5"
   ];
 
-  doCheck = true;
+  # krb5context test uses certificates that expired on 2024-07-11.
+  # Reported to bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>.
+  doCheck = !withShishi;
 
   # Fixup .la files
   postInstall = lib.optionalString withShishi ''

From ab501e571628036e7d1d66009addd5368a30fc3c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 14 Jul 2024 16:05:32 +0200
Subject: [PATCH 310/319] shishi: enable debug info

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

diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 7bfa18a6e9bb..6f8f92e3ac99 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
   };
 
+  separateDebugInfo = true;
+
   # Fixes support for gcrypt 1.6+
   patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ];
 

From f03d6497cb9b93d850f8158184da54e4e6c55d1d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 11 Jul 2024 18:54:13 +0200
Subject: [PATCH 311/319] separateDebugInfo: tell rustc not to strip

There's no point generating debug info if the compiler immediately
strips it before we get a chance to do anything with it.

This is especially important since Cargo 1.77, which asks rustc to
strip by default.
---
 pkgs/build-support/setup-hooks/separate-debug-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh
index 197e8a920b70..ebc773a49218 100644
--- a/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -1,7 +1,7 @@
 export NIX_SET_BUILD_ID=1
 export NIX_LDFLAGS+=" --compress-debug-sections=zlib"
 export NIX_CFLAGS_COMPILE+=" -ggdb -Wa,--compress-debug-sections"
-export NIX_RUSTFLAGS+=" -g"
+export NIX_RUSTFLAGS+=" -g -C strip=none"
 
 fixupOutputHooks+=(_separateDebugInfo)
 

From 4956512268f6c67bc03fa0bdd7956c9f3a281573 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 9 Jun 2024 22:40:50 +0100
Subject: [PATCH 312/319] openh264: tighten platforms

---
 pkgs/by-name/op/openh264/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix
index c8eed276e103..ebd93572e29e 100644
--- a/pkgs/by-name/op/openh264/package.nix
+++ b/pkgs/by-name/op/openh264/package.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ bsd2 ];
     maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix ++ lib.platforms.windows;
+    # See meson.build
+    platforms = lib.platforms.windows ++ lib.intersectLists
+      (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64)
+      (lib.platforms.linux ++ lib.platforms.darwin);
   };
 })

From d9d95fb11b5dcb237b501ea363f81ea5b4578298 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 9 Jun 2024 22:41:09 +0100
Subject: [PATCH 313/319] gst_all_1.gst-plugins-bad: make openh264 optional

This fixes building gst-plugins-bad for RISC-V, where openh264 is
unavailable.
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index c5f7f5e0c0b1..03e7637944e5 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -59,6 +59,7 @@
 , neon
 , openal
 , openexr_3
+, openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264
 , openh264
 , libopenmpt
 , pango
@@ -175,7 +176,6 @@ stdenv.mkDerivation rec {
     neon
     openal
     openexr_3
-    openh264
     rtmpdump
     pango
     soundtouch
@@ -211,6 +211,8 @@ stdenv.mkDerivation rec {
     bluez
   ] ++ lib.optionals microdnsSupport [
     libmicrodns
+  ] ++ lib.optionals openh264Support [
+    openh264
   ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [
     libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
     wayland
@@ -300,6 +302,7 @@ stdenv.mkDerivation rec {
     "-Daja=disabled" # should pass libajantv2 via aja-sdk-dir instead
     "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}"
     "-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
+    (lib.mesonEnable "openh264" openh264Support)
     (lib.mesonEnable "doc" enableDocumentation)
   ]
   ++ lib.optionals (!stdenv.isLinux) [

From 92678902baf731274d03178ff19774a112da7808 Mon Sep 17 00:00:00 2001
From: Yureka <fork-nixpkgs-with@yuka.dev>
Date: Fri, 5 Jul 2024 17:50:50 +0200
Subject: [PATCH 314/319] openjdk17: backport musl 1.2.4 fixes

Signed-off-by: Yureka <fork-nixpkgs-with@yuka.dev>
---
 pkgs/development/compilers/openjdk/17.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 6716f443bdb1..d0c954d1b023 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -69,6 +69,14 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
+
+      # Backport fixes for musl 1.2.4 which are already applied in jdk21+
+      # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17
+      (fetchurl {
+        name = "lfs64.patch";
+        url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch";
+        hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4=";
+      })
     ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];

From 48b8f5f651f312fb0671a8e186478d55e8c091b7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 20 Jul 2024 11:42:34 +0200
Subject: [PATCH 315/319] mesa: backport upstream revert for ffmpeg compat

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1c4e8f7ebb02..2266716bd9da 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -6,6 +6,7 @@
 , expat
 , fetchCrate
 , fetchurl
+, fetchpatch
 , file
 , flex
 , glslang
@@ -137,6 +138,13 @@ in stdenv.mkDerivation {
 
   patches = [
     ./opencl.patch
+
+    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533
+    (fetchpatch {
+      name = "ffmpeg.patch";
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/241f70e5a13bb9c13a168282446ad074e16c3d74.patch";
+      hash = "sha256-Cx7OL8iXGAOuDbCQReCCxSrWYvfZVrGoP0txIKSLTvs=";
+    })
   ];
 
   postPatch = ''

From 322f1d100336d0e96825b20f69d14817d7cb4278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 20 Jul 2024 02:46:06 -0700
Subject: [PATCH 316/319] python312Packages.pytest-asyncio: 0.23.7 -> 0.23.8

Diff: https://github.com/pytest-dev/pytest-asyncio/compare/refs/tags/v0.23.7...v0.23.8

Changelog: https://github.com/pytest-dev/pytest-asyncio/blob/v0.23.8/docs/source/reference/changelog.rst
---
 pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index d54b8ce66343..78baca8da38a 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.23.7"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  version = "0.23.8"; # N.B.: when updating, tests bleak and aioesphomeapi tests
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WmkZi3bBr3ExBWgA2aDvR+epGyWx63nWfhmI9APrjP0=";
+    hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY=";
   };
 
   outputs = [

From 340180ba9143dad859aa8dd0078c55588453cf10 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 20 Jul 2024 12:32:06 +0200
Subject: [PATCH 317/319] ruby.rubygems: 3.5.15 -> 3.5.16

https://github.com/rubygems/rubygems/releases/tag/v3.5.16
---
 pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index b7b3f8814252..962fddf51b54 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
-  version = "3.5.15";
+  version = "3.5.16";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-0Ibhw2j9PL4Eyg8QhFnQFC0NV0E66eHS/0siDryOa4c=";
+    hash = "sha256-f9EN6eXpMzIbYrjxGUJWrmRwO6JUHKuR7DEkSgGNkBI=";
   };
 
   patches = [

From c18dca3b4fde15229b1b0e9943a8c47ec019fea8 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 20 Jul 2024 12:32:20 +0200
Subject: [PATCH 318/319] bundler: 2.5.15 -> 2.5.16

https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.16
---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index de08320066e6..c144149da290 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.5.15";
-  source.sha256 = "sha256-YUKA8DH/jZrewERrXK/aAQOiSGUg1Vb5/BTRh2LEhhM=";
+  version = "2.5.16";
+  source.sha256 = "sha256-h7oDOPQNWSinmxqwZ4Z6Ns3lgTXQi2MmfvY5eVuVmDo=";
   dontPatchShebangs = true;
 
   postFixup = ''

From 145c73b034793386cd93a7b2d6ef00b9484b4fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 20 Jul 2024 15:53:46 +0200
Subject: [PATCH 319/319] libxml2: pull yet another upstream patch

/cc PR #326637
---
 pkgs/development/libraries/libxml2/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 1d57ce51b7fb..60ac5e2ccbe9 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch";
       hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI=";
     })
+    # Fix more error handling
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/e30cb632e734394ddbd7bd62b57cee3586424352.patch";
+      hash = "sha256-C0ef17wTRC9rH0dKua/LJwwqTRI5W8sKWmvL7JxzT4o=";
+    })
   ];
 
   strictDeps = true;